Rename WebCore/editing/visible_units.* to VisibleUnits.*
https://bugs.webkit.org/show_bug.cgi?id=111426
Reviewed by Alexey Proskuryakov.
Source/WebCore:
No new tests. Just a refactoring.
* CMakeLists.txt:
* GNUmakefile.list.am:
* Target.pri:
* WebCore.gypi:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* accessibility/AccessibilityNodeObject.cpp:
* accessibility/AccessibilityObject.cpp:
* accessibility/AccessibilityRenderObject.cpp:
* accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
* accessibility/mac/WebAccessibilityObjectWrapperBase.mm:
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
* dom/Position.cpp:
* dom/Range.cpp:
* editing/AlternativeTextController.cpp:
* editing/ApplyBlockElementCommand.cpp:
* editing/ApplyStyleCommand.cpp:
* editing/CompositeEditCommand.cpp:
* editing/DeleteSelectionCommand.cpp:
* editing/EditingAllInOne.cpp:
* editing/EditingStyle.cpp:
* editing/Editor.cpp:
* editing/FormatBlockCommand.cpp:
* editing/FrameSelection.cpp:
* editing/IndentOutdentCommand.cpp:
* editing/InsertLineBreakCommand.cpp:
* editing/InsertListCommand.cpp:
* editing/InsertParagraphSeparatorCommand.cpp:
* editing/InsertTextCommand.cpp:
* editing/ReplaceSelectionCommand.cpp:
* editing/SurroundingText.cpp:
* editing/TextCheckingHelper.cpp:
* editing/TextIterator.cpp:
* editing/TypingCommand.cpp:
* editing/VisiblePosition.cpp:
* editing/VisibleSelection.cpp:
* editing/VisibleUnits.cpp: Copied from Source/WebCore/editing/visible_units.cpp.
* editing/VisibleUnits.h: Copied from Source/WebCore/editing/visible_units.h.
* editing/htmlediting.cpp:
* editing/markup.cpp:
* editing/visible_units.cpp: Removed.
* editing/visible_units.h: Removed.
* page/Frame.cpp:
* page/mac/FrameMac.mm:
* platform/win/EditorWin.cpp:
Source/WebKit/mac:
* WebView/WebFrame.mm:
Source/WebKit2:
* WebProcess/WebPage/mac/WebPageMac.mm:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@144911 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
index 1868e64..02882ae 100644
--- a/Source/WebCore/CMakeLists.txt
+++ b/Source/WebCore/CMakeLists.txt
@@ -1326,10 +1326,10 @@
editing/UnlinkCommand.cpp
editing/VisiblePosition.cpp
editing/VisibleSelection.cpp
+ editing/VisibleUnits.cpp
editing/WrapContentsInDummySpanCommand.cpp
editing/htmlediting.cpp
editing/markup.cpp
- editing/visible_units.cpp
fileapi/AsyncFileStream.cpp
fileapi/Blob.cpp
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index f854d4c..30c1229 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,60 @@
+2013-03-05 Kent Tamura <tkent@chromium.org>
+
+ Rename WebCore/editing/visible_units.* to VisibleUnits.*
+ https://bugs.webkit.org/show_bug.cgi?id=111426
+
+ Reviewed by Alexey Proskuryakov.
+
+ No new tests. Just a refactoring.
+
+ * CMakeLists.txt:
+ * GNUmakefile.list.am:
+ * Target.pri:
+ * WebCore.gypi:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * accessibility/AccessibilityNodeObject.cpp:
+ * accessibility/AccessibilityObject.cpp:
+ * accessibility/AccessibilityRenderObject.cpp:
+ * accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
+ * accessibility/mac/WebAccessibilityObjectWrapperBase.mm:
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ * dom/Position.cpp:
+ * dom/Range.cpp:
+ * editing/AlternativeTextController.cpp:
+ * editing/ApplyBlockElementCommand.cpp:
+ * editing/ApplyStyleCommand.cpp:
+ * editing/CompositeEditCommand.cpp:
+ * editing/DeleteSelectionCommand.cpp:
+ * editing/EditingAllInOne.cpp:
+ * editing/EditingStyle.cpp:
+ * editing/Editor.cpp:
+ * editing/FormatBlockCommand.cpp:
+ * editing/FrameSelection.cpp:
+ * editing/IndentOutdentCommand.cpp:
+ * editing/InsertLineBreakCommand.cpp:
+ * editing/InsertListCommand.cpp:
+ * editing/InsertParagraphSeparatorCommand.cpp:
+ * editing/InsertTextCommand.cpp:
+ * editing/ReplaceSelectionCommand.cpp:
+ * editing/SurroundingText.cpp:
+ * editing/TextCheckingHelper.cpp:
+ * editing/TextIterator.cpp:
+ * editing/TypingCommand.cpp:
+ * editing/VisiblePosition.cpp:
+ * editing/VisibleSelection.cpp:
+ * editing/VisibleUnits.cpp: Copied from Source/WebCore/editing/visible_units.cpp.
+ * editing/VisibleUnits.h: Copied from Source/WebCore/editing/visible_units.h.
+ * editing/htmlediting.cpp:
+ * editing/markup.cpp:
+ * editing/visible_units.cpp: Removed.
+ * editing/visible_units.h: Removed.
+ * page/Frame.cpp:
+ * page/mac/FrameMac.mm:
+ * platform/win/EditorWin.cpp:
+
2013-03-06 Alexis Menard <alexis@webkit.org>
Do not add CSSPropertyBorderImage shorthand part of the property list when parsing CSS border property
diff --git a/Source/WebCore/GNUmakefile.list.am b/Source/WebCore/GNUmakefile.list.am
index 9d0faf0..f859f0b 100644
--- a/Source/WebCore/GNUmakefile.list.am
+++ b/Source/WebCore/GNUmakefile.list.am
@@ -3202,8 +3202,8 @@
Source/WebCore/editing/VisiblePosition.h \
Source/WebCore/editing/VisibleSelection.cpp \
Source/WebCore/editing/VisibleSelection.h \
- Source/WebCore/editing/visible_units.cpp \
- Source/WebCore/editing/visible_units.h \
+ Source/WebCore/editing/VisibleUnits.cpp \
+ Source/WebCore/editing/VisibleUnits.h \
Source/WebCore/editing/WrapContentsInDummySpanCommand.cpp \
Source/WebCore/editing/WrapContentsInDummySpanCommand.h \
Source/WebCore/editing/WritingDirection.h \
diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri
index 5e046a0..41c0eb7 100644
--- a/Source/WebCore/Target.pri
+++ b/Source/WebCore/Target.pri
@@ -554,7 +554,7 @@
editing/UnlinkCommand.cpp \
editing/VisiblePosition.cpp \
editing/VisibleSelection.cpp \
- editing/visible_units.cpp \
+ editing/VisibleUnits.cpp \
editing/WrapContentsInDummySpanCommand.cpp \
fileapi/AsyncFileStream.cpp \
fileapi/AsyncFileStream.cpp \
@@ -1779,7 +1779,7 @@
editing/UnlinkCommand.h \
editing/VisiblePosition.h \
editing/VisibleSelection.h \
- editing/visible_units.h \
+ editing/VisibleUnits.h \
editing/WrapContentsInDummySpanCommand.h \
fileapi/Blob.h \
fileapi/BlobURL.h \
diff --git a/Source/WebCore/WebCore.gypi b/Source/WebCore/WebCore.gypi
index 4fd9db7..df4f0f5 100644
--- a/Source/WebCore/WebCore.gypi
+++ b/Source/WebCore/WebCore.gypi
@@ -1836,6 +1836,7 @@
'editing/UnlinkCommand.h',
'editing/VisiblePosition.cpp',
'editing/VisibleSelection.cpp',
+ 'editing/VisibleUnits.cpp',
'editing/WrapContentsInDummySpanCommand.cpp',
'editing/WrapContentsInDummySpanCommand.h',
'editing/atk/FrameSelectionAtk.cpp',
@@ -1845,7 +1846,6 @@
'editing/mac/EditorMac.mm',
'editing/mac/FrameSelectionMac.mm',
'editing/markup.cpp',
- 'editing/visible_units.cpp',
'fileapi/AsyncFileStream.cpp',
'fileapi/AsyncFileStream.h',
'fileapi/Blob.cpp',
diff --git a/Source/WebCore/WebCore.vcproj/WebCore.vcproj b/Source/WebCore/WebCore.vcproj/WebCore.vcproj
index f3a1bb6..8443f9e 100755
--- a/Source/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/Source/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -59803,62 +59803,6 @@
>
</File>
<File
- RelativePath="..\editing\visible_units.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo_CFLite|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo_CFLite|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Production|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\editing\visible_units.h"
- >
- </File>
- <File
RelativePath="..\editing\VisiblePosition.cpp"
>
<FileConfiguration
@@ -59971,6 +59915,62 @@
>
</File>
<File
+ RelativePath="..\editing\VisibleUnits.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Cairo_CFLite|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release_Cairo_CFLite|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_All|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Production|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\editing\VisibleUnits.h"
+ >
+ </File>
+ <File
RelativePath="..\editing\WrapContentsInDummySpanCommand.cpp"
>
<FileConfiguration
diff --git a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
index 15f9023..f7c69e84 100644
--- a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
+++ b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
@@ -6344,12 +6344,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\editing\visible_units.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
- </ClCompile>
<ClCompile Include="..\editing\VisiblePosition.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
@@ -6362,6 +6356,12 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\editing\VisibleUnits.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="..\editing\WrapContentsInDummySpanCommand.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
@@ -10194,9 +10194,9 @@
<ClInclude Include="..\editing\TypingCommand.h" />
<ClInclude Include="..\editing\UndoStep.h" />
<ClInclude Include="..\editing\UnlinkCommand.h" />
- <ClInclude Include="..\editing\visible_units.h" />
<ClInclude Include="..\editing\VisiblePosition.h" />
<ClInclude Include="..\editing\VisibleSelection.h" />
+ <ClInclude Include="..\editing\VisibleUnits.h" />
<ClInclude Include="..\editing\WrapContentsInDummySpanCommand.h" />
<ClInclude Include="..\fileapi\AsyncFileStream.h" />
<ClInclude Include="..\html\BaseButtonInputType.h" />
diff --git a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
index 8bb7bdc..7839c0c 100644
--- a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
+++ b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
@@ -5136,15 +5136,15 @@
<ClCompile Include="..\editing\UnlinkCommand.cpp">
<Filter>editing</Filter>
</ClCompile>
- <ClCompile Include="..\editing\visible_units.cpp">
- <Filter>editing</Filter>
- </ClCompile>
<ClCompile Include="..\editing\VisiblePosition.cpp">
<Filter>editing</Filter>
</ClCompile>
<ClCompile Include="..\editing\VisibleSelection.cpp">
<Filter>editing</Filter>
</ClCompile>
+ <ClCompile Include="..\editing\VisibleUnits.cpp">
+ <Filter>editing</Filter>
+ </ClCompile>
<ClCompile Include="..\editing\WrapContentsInDummySpanCommand.cpp">
<Filter>editing</Filter>
</ClCompile>
diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
index 763c47d..8d8fb0a 100644
--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -3293,8 +3293,8 @@
93309E1A099E64920056E581 /* TypingCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 93309DCB099E64910056E581 /* TypingCommand.h */; };
93309E1B099E64920056E581 /* TextIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93309DCC099E64910056E581 /* TextIterator.cpp */; };
93309E1C099E64920056E581 /* TextIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = 93309DCD099E64910056E581 /* TextIterator.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 93309E1D099E64920056E581 /* visible_units.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93309DCE099E64910056E581 /* visible_units.cpp */; };
- 93309E1E099E64920056E581 /* visible_units.h in Headers */ = {isa = PBXBuildFile; fileRef = 93309DCF099E64910056E581 /* visible_units.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 93309E1D099E64920056E581 /* VisibleUnits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93309DCE099E64910056E581 /* VisibleUnits.cpp */; };
+ 93309E1E099E64920056E581 /* VisibleUnits.h in Headers */ = {isa = PBXBuildFile; fileRef = 93309DCF099E64910056E581 /* VisibleUnits.h */; settings = {ATTRIBUTES = (Private, ); }; };
93309E1F099E64920056E581 /* VisiblePosition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93309DD0099E64910056E581 /* VisiblePosition.cpp */; };
93309E20099E64920056E581 /* VisiblePosition.h in Headers */ = {isa = PBXBuildFile; fileRef = 93309DD1099E64910056E581 /* VisiblePosition.h */; settings = {ATTRIBUTES = (Private, ); }; };
93309E23099E64920056E581 /* WrapContentsInDummySpanCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93309DD4099E64910056E581 /* WrapContentsInDummySpanCommand.cpp */; };
@@ -10760,8 +10760,8 @@
93309DCB099E64910056E581 /* TypingCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TypingCommand.h; sourceTree = "<group>"; };
93309DCC099E64910056E581 /* TextIterator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextIterator.cpp; sourceTree = "<group>"; };
93309DCD099E64910056E581 /* TextIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextIterator.h; sourceTree = "<group>"; };
- 93309DCE099E64910056E581 /* visible_units.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = visible_units.cpp; sourceTree = "<group>"; };
- 93309DCF099E64910056E581 /* visible_units.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = visible_units.h; sourceTree = "<group>"; };
+ 93309DCE099E64910056E581 /* VisibleUnits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VisibleUnits.cpp; sourceTree = "<group>"; };
+ 93309DCF099E64910056E581 /* VisibleUnits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VisibleUnits.h; sourceTree = "<group>"; };
93309DD0099E64910056E581 /* VisiblePosition.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VisiblePosition.cpp; sourceTree = "<group>"; };
93309DD1099E64910056E581 /* VisiblePosition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VisiblePosition.h; sourceTree = "<group>"; };
93309DD4099E64910056E581 /* WrapContentsInDummySpanCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WrapContentsInDummySpanCommand.cpp; sourceTree = "<group>"; };
@@ -17933,12 +17933,12 @@
9B2D8A7814997CCF00ECEF3E /* UndoStep.h */,
D086FE9709D53AAB005BC74D /* UnlinkCommand.cpp */,
D086FE9609D53AAB005BC74D /* UnlinkCommand.h */,
- 93309DCE099E64910056E581 /* visible_units.cpp */,
- 93309DCF099E64910056E581 /* visible_units.h */,
93309DD0099E64910056E581 /* VisiblePosition.cpp */,
93309DD1099E64910056E581 /* VisiblePosition.h */,
A883DF250F3D045D00F19BF6 /* VisibleSelection.cpp */,
A883DF260F3D045D00F19BF6 /* VisibleSelection.h */,
+ 93309DCE099E64910056E581 /* VisibleUnits.cpp */,
+ 93309DCF099E64910056E581 /* VisibleUnits.h */,
93309DD4099E64910056E581 /* WrapContentsInDummySpanCommand.cpp */,
93309DD5099E64910056E581 /* WrapContentsInDummySpanCommand.h */,
9BAF3B2312C1A39800014BF1 /* WritingDirection.h */,
@@ -26504,9 +26504,9 @@
BCA257151293C010007A263D /* VerticalPositionCache.h in Headers */,
CEF418CF1179678C009D112C /* ViewportArguments.h in Headers */,
3FFFF9AE159D9B060020BBD5 /* ViewportStyleResolver.h in Headers */,
- 93309E1E099E64920056E581 /* visible_units.h in Headers */,
93309E20099E64920056E581 /* VisiblePosition.h in Headers */,
A883DF280F3D045D00F19BF6 /* VisibleSelection.h in Headers */,
+ 93309E1E099E64920056E581 /* VisibleUnits.h in Headers */,
29A309B11561CAC400BBD8E5 /* VisitedLinks.h in Headers */,
419BC2DF1685329900D64D6D /* VisitedLinkState.h in Headers */,
515788C11207852C00A37C4A /* VisitedLinkStrategy.h in Headers */,
@@ -29723,9 +29723,9 @@
FD3160AE12B026F700C1A359 /* VectorMath.cpp in Sources */,
CEF418CE1179678C009D112C /* ViewportArguments.cpp in Sources */,
3FFFF9AD159D9B060020BBD5 /* ViewportStyleResolver.cpp in Sources */,
- 93309E1D099E64920056E581 /* visible_units.cpp in Sources */,
93309E1F099E64920056E581 /* VisiblePosition.cpp in Sources */,
A883DF270F3D045D00F19BF6 /* VisibleSelection.cpp in Sources */,
+ 93309E1D099E64920056E581 /* VisibleUnits.cpp in Sources */,
29A309B01561CAC400BBD8E5 /* VisitedLinks.cpp in Sources */,
419BC2DE1685329900D64D6D /* VisitedLinkState.cpp in Sources */,
FD7F299113D4C0CB00AD9535 /* WaveShaperDSPKernel.cpp in Sources */,
diff --git a/Source/WebCore/accessibility/AccessibilityNodeObject.cpp b/Source/WebCore/accessibility/AccessibilityNodeObject.cpp
index 85463bb..8e414d7 100644
--- a/Source/WebCore/accessibility/AccessibilityNodeObject.cpp
+++ b/Source/WebCore/accessibility/AccessibilityNodeObject.cpp
@@ -70,9 +70,9 @@
#include "TextControlInnerElements.h"
#include "TextIterator.h"
#include "UserGestureIndicator.h"
+#include "VisibleUnits.h"
#include "Widget.h"
#include "htmlediting.h"
-#include "visible_units.h"
#include <wtf/StdLibExtras.h>
#include <wtf/text/StringBuilder.h>
#include <wtf/unicode/CharacterNames.h>
diff --git a/Source/WebCore/accessibility/AccessibilityObject.cpp b/Source/WebCore/accessibility/AccessibilityObject.cpp
index 441cc3e..23625e3 100644
--- a/Source/WebCore/accessibility/AccessibilityObject.cpp
+++ b/Source/WebCore/accessibility/AccessibilityObject.cpp
@@ -57,8 +57,8 @@
#include "TextCheckingHelper.h"
#include "TextIterator.h"
#include "UserGestureIndicator.h"
+#include "VisibleUnits.h"
#include "htmlediting.h"
-#include "visible_units.h"
#include <wtf/StdLibExtras.h>
#include <wtf/text/StringBuilder.h>
#include <wtf/text/WTFString.h>
diff --git a/Source/WebCore/accessibility/AccessibilityRenderObject.cpp b/Source/WebCore/accessibility/AccessibilityRenderObject.cpp
index ea1311f..41e9ca1 100644
--- a/Source/WebCore/accessibility/AccessibilityRenderObject.cpp
+++ b/Source/WebCore/accessibility/AccessibilityRenderObject.cpp
@@ -90,8 +90,8 @@
#include "SVGSVGElement.h"
#include "Text.h"
#include "TextControlInnerElements.h"
+#include "VisibleUnits.h"
#include "htmlediting.h"
-#include "visible_units.h"
#include <wtf/StdLibExtras.h>
#include <wtf/text/StringBuilder.h>
#include <wtf/unicode/CharacterNames.h>
diff --git a/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp b/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp
index dd4702a..90add83 100644
--- a/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp
+++ b/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp
@@ -44,6 +44,7 @@
#include "RenderObject.h"
#include "Settings.h"
#include "TextIterator.h"
+#include "VisibleUnits.h"
#include "WebKitAccessibleHyperlink.h"
#include "WebKitAccessibleInterfaceAction.h"
#include "WebKitAccessibleInterfaceComponent.h"
@@ -58,7 +59,6 @@
#include "WebKitAccessibleInterfaceValue.h"
#include "WebKitAccessibleUtil.h"
#include "htmlediting.h"
-#include "visible_units.h"
#include <glib/gprintf.h>
#if PLATFORM(GTK)
diff --git a/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm b/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm
index 8b8623f..12c1d46 100644
--- a/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm
+++ b/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm
@@ -67,11 +67,11 @@
#import "TextCheckerClient.h"
#import "TextCheckingHelper.h"
#import "TextIterator.h"
+#import "VisibleUnits.h"
#import "WebCoreFrameView.h"
#import "WebCoreObjCExtras.h"
#import "WebCoreSystemInterface.h"
#import "htmlediting.h"
-#import "visible_units.h"
using namespace WebCore;
using namespace HTMLNames;
diff --git a/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm b/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
index 6c3b143..f4cb1f5 100644
--- a/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
+++ b/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
@@ -67,11 +67,11 @@
#import "TextCheckerClient.h"
#import "TextCheckingHelper.h"
#import "TextIterator.h"
+#import "VisibleUnits.h"
#import "WebCoreFrameView.h"
#import "WebCoreObjCExtras.h"
#import "WebCoreSystemInterface.h"
#import "htmlediting.h"
-#import "visible_units.h"
using namespace WebCore;
using namespace HTMLNames;
diff --git a/Source/WebCore/dom/Position.cpp b/Source/WebCore/dom/Position.cpp
index 55bc390..3ef9b55 100644
--- a/Source/WebCore/dom/Position.cpp
+++ b/Source/WebCore/dom/Position.cpp
@@ -39,8 +39,8 @@
#include "Text.h"
#include "TextIterator.h"
#include "VisiblePosition.h"
+#include "VisibleUnits.h"
#include "htmlediting.h"
-#include "visible_units.h"
#include <stdio.h>
#include <wtf/text/CString.h>
#include <wtf/unicode/CharacterNames.h>
diff --git a/Source/WebCore/dom/Range.cpp b/Source/WebCore/dom/Range.cpp
index 8bae22b..a389d8a 100644
--- a/Source/WebCore/dom/Range.cpp
+++ b/Source/WebCore/dom/Range.cpp
@@ -45,9 +45,9 @@
#include "Text.h"
#include "TextIterator.h"
#include "VisiblePosition.h"
+#include "VisibleUnits.h"
#include "htmlediting.h"
#include "markup.h"
-#include "visible_units.h"
#include <stdio.h>
#include <wtf/RefCountedLeakCounter.h>
#include <wtf/Vector.h>
diff --git a/Source/WebCore/editing/AlternativeTextController.cpp b/Source/WebCore/editing/AlternativeTextController.cpp
index be0ecb7..d7b4dca 100644
--- a/Source/WebCore/editing/AlternativeTextController.cpp
+++ b/Source/WebCore/editing/AlternativeTextController.cpp
@@ -44,9 +44,9 @@
#include "TextEvent.h"
#include "TextIterator.h"
#include "VisibleSelection.h"
+#include "VisibleUnits.h"
#include "htmlediting.h"
#include "markup.h"
-#include "visible_units.h"
namespace WebCore {
diff --git a/Source/WebCore/editing/ApplyBlockElementCommand.cpp b/Source/WebCore/editing/ApplyBlockElementCommand.cpp
index 901cd17..70096d9 100644
--- a/Source/WebCore/editing/ApplyBlockElementCommand.cpp
+++ b/Source/WebCore/editing/ApplyBlockElementCommand.cpp
@@ -34,8 +34,8 @@
#include "Text.h"
#include "TextIterator.h"
#include "VisiblePosition.h"
+#include "VisibleUnits.h"
#include "htmlediting.h"
-#include "visible_units.h"
namespace WebCore {
diff --git a/Source/WebCore/editing/ApplyStyleCommand.cpp b/Source/WebCore/editing/ApplyStyleCommand.cpp
index 5b6b12a..cf6848d 100644
--- a/Source/WebCore/editing/ApplyStyleCommand.cpp
+++ b/Source/WebCore/editing/ApplyStyleCommand.cpp
@@ -47,8 +47,8 @@
#include "StyleResolver.h"
#include "Text.h"
#include "TextIterator.h"
+#include "VisibleUnits.h"
#include "htmlediting.h"
-#include "visible_units.h"
#include <wtf/StdLibExtras.h>
#include <wtf/text/StringBuilder.h>
diff --git a/Source/WebCore/editing/CompositeEditCommand.cpp b/Source/WebCore/editing/CompositeEditCommand.cpp
index d7016a6..5b5af93 100644
--- a/Source/WebCore/editing/CompositeEditCommand.cpp
+++ b/Source/WebCore/editing/CompositeEditCommand.cpp
@@ -64,10 +64,10 @@
#include "SplitTextNodeContainingElementCommand.h"
#include "Text.h"
#include "TextIterator.h"
+#include "VisibleUnits.h"
#include "WrapContentsInDummySpanCommand.h"
#include "htmlediting.h"
#include "markup.h"
-#include "visible_units.h"
#include <wtf/unicode/CharacterNames.h>
using namespace std;
diff --git a/Source/WebCore/editing/DeleteSelectionCommand.cpp b/Source/WebCore/editing/DeleteSelectionCommand.cpp
index b0e4b321..6e7f44a 100644
--- a/Source/WebCore/editing/DeleteSelectionCommand.cpp
+++ b/Source/WebCore/editing/DeleteSelectionCommand.cpp
@@ -40,7 +40,7 @@
#include "NodeTraversal.h"
#include "RenderTableCell.h"
#include "Text.h"
-#include "visible_units.h"
+#include "VisibleUnits.h"
namespace WebCore {
diff --git a/Source/WebCore/editing/EditingAllInOne.cpp b/Source/WebCore/editing/EditingAllInOne.cpp
index 1275079..0e23796 100644
--- a/Source/WebCore/editing/EditingAllInOne.cpp
+++ b/Source/WebCore/editing/EditingAllInOne.cpp
@@ -82,7 +82,7 @@
#include <UnlinkCommand.cpp>
#include <VisiblePosition.cpp>
#include <VisibleSelection.cpp>
+#include <VisibleUnits.cpp>
#include <WrapContentsInDummySpanCommand.cpp>
#include <htmlediting.cpp>
#include <markup.cpp>
-#include <visible_units.cpp>
diff --git a/Source/WebCore/editing/EditingStyle.cpp b/Source/WebCore/editing/EditingStyle.cpp
index 3ba16a5..7cbd5fa 100644
--- a/Source/WebCore/editing/EditingStyle.cpp
+++ b/Source/WebCore/editing/EditingStyle.cpp
@@ -48,8 +48,8 @@
#include "StyleResolver.h"
#include "StyleRule.h"
#include "StyledElement.h"
+#include "VisibleUnits.h"
#include "htmlediting.h"
-#include "visible_units.h"
#include <wtf/HashSet.h>
namespace WebCore {
diff --git a/Source/WebCore/editing/Editor.cpp b/Source/WebCore/editing/Editor.cpp
index c2b7528..2b5dbd2 100644
--- a/Source/WebCore/editing/Editor.cpp
+++ b/Source/WebCore/editing/Editor.cpp
@@ -91,9 +91,9 @@
#include "TextIterator.h"
#include "TypingCommand.h"
#include "UserTypingGestureIndicator.h"
+#include "VisibleUnits.h"
#include "htmlediting.h"
#include "markup.h"
-#include "visible_units.h"
#include <wtf/UnusedParam.h>
#include <wtf/unicode/CharacterNames.h>
#include <wtf/unicode/Unicode.h>
diff --git a/Source/WebCore/editing/FormatBlockCommand.cpp b/Source/WebCore/editing/FormatBlockCommand.cpp
index f88c5c6..edf3aa5 100644
--- a/Source/WebCore/editing/FormatBlockCommand.cpp
+++ b/Source/WebCore/editing/FormatBlockCommand.cpp
@@ -32,7 +32,7 @@
#include "HTMLElement.h"
#include "HTMLNames.h"
#include "Range.h"
-#include "visible_units.h"
+#include "VisibleUnits.h"
namespace WebCore {
diff --git a/Source/WebCore/editing/FrameSelection.cpp b/Source/WebCore/editing/FrameSelection.cpp
index f44de00..18de1d8 100644
--- a/Source/WebCore/editing/FrameSelection.cpp
+++ b/Source/WebCore/editing/FrameSelection.cpp
@@ -63,8 +63,8 @@
#include "StylePropertySet.h"
#include "TextIterator.h"
#include "TypingCommand.h"
+#include "VisibleUnits.h"
#include "htmlediting.h"
-#include "visible_units.h"
#include <limits.h>
#include <stdio.h>
#include <wtf/text/CString.h>
diff --git a/Source/WebCore/editing/IndentOutdentCommand.cpp b/Source/WebCore/editing/IndentOutdentCommand.cpp
index 63034a8a..5eb1894 100644
--- a/Source/WebCore/editing/IndentOutdentCommand.cpp
+++ b/Source/WebCore/editing/IndentOutdentCommand.cpp
@@ -36,8 +36,8 @@
#include "SplitElementCommand.h"
#include "Text.h"
#include "TextIterator.h"
+#include "VisibleUnits.h"
#include "htmlediting.h"
-#include "visible_units.h"
#include <wtf/StdLibExtras.h>
namespace WebCore {
diff --git a/Source/WebCore/editing/InsertLineBreakCommand.cpp b/Source/WebCore/editing/InsertLineBreakCommand.cpp
index f647632..b8b14a6 100644
--- a/Source/WebCore/editing/InsertLineBreakCommand.cpp
+++ b/Source/WebCore/editing/InsertLineBreakCommand.cpp
@@ -34,8 +34,8 @@
#include "RenderObject.h"
#include "Text.h"
#include "VisiblePosition.h"
+#include "VisibleUnits.h"
#include "htmlediting.h"
-#include "visible_units.h"
namespace WebCore {
diff --git a/Source/WebCore/editing/InsertListCommand.cpp b/Source/WebCore/editing/InsertListCommand.cpp
index a9296c3..2a84d16 100644
--- a/Source/WebCore/editing/InsertListCommand.cpp
+++ b/Source/WebCore/editing/InsertListCommand.cpp
@@ -32,7 +32,7 @@
#include "HTMLElement.h"
#include "HTMLNames.h"
#include "TextIterator.h"
-#include "visible_units.h"
+#include "VisibleUnits.h"
namespace WebCore {
diff --git a/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp b/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp
index 1d384e2..609b5a0 100644
--- a/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp
+++ b/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp
@@ -35,8 +35,8 @@
#include "NodeTraversal.h"
#include "RenderObject.h"
#include "Text.h"
+#include "VisibleUnits.h"
#include "htmlediting.h"
-#include "visible_units.h"
namespace WebCore {
diff --git a/Source/WebCore/editing/InsertTextCommand.cpp b/Source/WebCore/editing/InsertTextCommand.cpp
index 2386307..944df88 100644
--- a/Source/WebCore/editing/InsertTextCommand.cpp
+++ b/Source/WebCore/editing/InsertTextCommand.cpp
@@ -32,8 +32,8 @@
#include "Frame.h"
#include "HTMLInterchange.h"
#include "Text.h"
+#include "VisibleUnits.h"
#include "htmlediting.h"
-#include "visible_units.h"
#include <wtf/unicode/CharacterNames.h>
namespace WebCore {
diff --git a/Source/WebCore/editing/ReplaceSelectionCommand.cpp b/Source/WebCore/editing/ReplaceSelectionCommand.cpp
index 76d677a..ad4bc75 100644
--- a/Source/WebCore/editing/ReplaceSelectionCommand.cpp
+++ b/Source/WebCore/editing/ReplaceSelectionCommand.cpp
@@ -55,9 +55,9 @@
#include "StylePropertySet.h"
#include "Text.h"
#include "TextIterator.h"
+#include "VisibleUnits.h"
#include "htmlediting.h"
#include "markup.h"
-#include "visible_units.h"
#include <wtf/StdLibExtras.h>
#include <wtf/Vector.h>
diff --git a/Source/WebCore/editing/SurroundingText.cpp b/Source/WebCore/editing/SurroundingText.cpp
index 4c8dae4..69a9d8e 100644
--- a/Source/WebCore/editing/SurroundingText.cpp
+++ b/Source/WebCore/editing/SurroundingText.cpp
@@ -36,7 +36,7 @@
#include "TextIterator.h"
#include "VisiblePosition.h"
#include "VisibleSelection.h"
-#include "visible_units.h"
+#include "VisibleUnits.h"
namespace WebCore {
diff --git a/Source/WebCore/editing/TextCheckingHelper.cpp b/Source/WebCore/editing/TextCheckingHelper.cpp
index 20a2fcb..09cc287 100644
--- a/Source/WebCore/editing/TextCheckingHelper.cpp
+++ b/Source/WebCore/editing/TextCheckingHelper.cpp
@@ -36,7 +36,7 @@
#include "TextCheckerClient.h"
#include "TextIterator.h"
#include "VisiblePosition.h"
-#include "visible_units.h"
+#include "VisibleUnits.h"
namespace WebCore {
diff --git a/Source/WebCore/editing/TextIterator.cpp b/Source/WebCore/editing/TextIterator.cpp
index e7216fc..344a22e 100644
--- a/Source/WebCore/editing/TextIterator.cpp
+++ b/Source/WebCore/editing/TextIterator.cpp
@@ -46,7 +46,7 @@
#include "TextBoundaries.h"
#include "TextBreakIterator.h"
#include "VisiblePosition.h"
-#include "visible_units.h"
+#include "VisibleUnits.h"
#include <wtf/text/CString.h>
#include <wtf/unicode/CharacterNames.h>
diff --git a/Source/WebCore/editing/TypingCommand.cpp b/Source/WebCore/editing/TypingCommand.cpp
index 1c0aa78..4ec50d4 100644
--- a/Source/WebCore/editing/TypingCommand.cpp
+++ b/Source/WebCore/editing/TypingCommand.cpp
@@ -40,8 +40,8 @@
#include "RenderObject.h"
#include "TextIterator.h"
#include "VisiblePosition.h"
+#include "VisibleUnits.h"
#include "htmlediting.h"
-#include "visible_units.h"
namespace WebCore {
diff --git a/Source/WebCore/editing/VisiblePosition.cpp b/Source/WebCore/editing/VisiblePosition.cpp
index 8d1757a..5ffed22 100644
--- a/Source/WebCore/editing/VisiblePosition.cpp
+++ b/Source/WebCore/editing/VisiblePosition.cpp
@@ -37,8 +37,8 @@
#include "RenderBlock.h"
#include "RootInlineBox.h"
#include "Text.h"
+#include "VisibleUnits.h"
#include "htmlediting.h"
-#include "visible_units.h"
#include <stdio.h>
#include <wtf/text/CString.h>
diff --git a/Source/WebCore/editing/VisibleSelection.cpp b/Source/WebCore/editing/VisibleSelection.cpp
index b849c9d..1c86004 100644
--- a/Source/WebCore/editing/VisibleSelection.cpp
+++ b/Source/WebCore/editing/VisibleSelection.cpp
@@ -28,11 +28,11 @@
#include "Document.h"
#include "Element.h"
-#include "htmlediting.h"
+#include "Range.h"
#include "TextIterator.h"
#include "VisiblePosition.h"
-#include "visible_units.h"
-#include "Range.h"
+#include "VisibleUnits.h"
+#include "htmlediting.h"
#include <stdio.h>
#include <wtf/Assertions.h>
#include <wtf/text/CString.h>
diff --git a/Source/WebCore/editing/visible_units.cpp b/Source/WebCore/editing/VisibleUnits.cpp
similarity index 99%
rename from Source/WebCore/editing/visible_units.cpp
rename to Source/WebCore/editing/VisibleUnits.cpp
index baa2065..17c2b335 100644
--- a/Source/WebCore/editing/visible_units.cpp
+++ b/Source/WebCore/editing/VisibleUnits.cpp
@@ -24,7 +24,7 @@
*/
#include "config.h"
-#include "visible_units.h"
+#include "VisibleUnits.h"
#include "Document.h"
#include "Element.h"
diff --git a/Source/WebCore/editing/visible_units.h b/Source/WebCore/editing/VisibleUnits.h
similarity index 98%
rename from Source/WebCore/editing/visible_units.h
rename to Source/WebCore/editing/VisibleUnits.h
index 723c196..e9aa78d 100644
--- a/Source/WebCore/editing/visible_units.h
+++ b/Source/WebCore/editing/VisibleUnits.h
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef visible_units_h
-#define visible_units_h
+#ifndef VisibleUnits_h
+#define VisibleUnits_h
#include "EditingBehaviorTypes.h"
#include "EditingBoundary.h"
@@ -99,4 +99,4 @@
} // namespace WebCore
-#endif // VisiblePosition_h
+#endif // VisibleUnits_h
diff --git a/Source/WebCore/editing/htmlediting.cpp b/Source/WebCore/editing/htmlediting.cpp
index 24eb6ea..14cb085 100644
--- a/Source/WebCore/editing/htmlediting.cpp
+++ b/Source/WebCore/editing/htmlediting.cpp
@@ -51,7 +51,7 @@
#include "TextIterator.h"
#include "VisiblePosition.h"
#include "VisibleSelection.h"
-#include "visible_units.h"
+#include "VisibleUnits.h"
#include <wtf/Assertions.h>
#include <wtf/StdLibExtras.h>
#include <wtf/unicode/CharacterNames.h>
diff --git a/Source/WebCore/editing/markup.cpp b/Source/WebCore/editing/markup.cpp
index d3277c3..3c3a570 100644
--- a/Source/WebCore/editing/markup.cpp
+++ b/Source/WebCore/editing/markup.cpp
@@ -62,9 +62,9 @@
#include "StyleResolver.h"
#include "TextIterator.h"
#include "VisibleSelection.h"
+#include "VisibleUnits.h"
#include "XMLNSNames.h"
#include "htmlediting.h"
-#include "visible_units.h"
#include <wtf/StdLibExtras.h>
#include <wtf/text/StringBuilder.h>
#include <wtf/unicode/CharacterNames.h>
diff --git a/Source/WebCore/page/Frame.cpp b/Source/WebCore/page/Frame.cpp
index c7ed072..ecd1752 100644
--- a/Source/WebCore/page/Frame.cpp
+++ b/Source/WebCore/page/Frame.cpp
@@ -85,13 +85,13 @@
#include "TextResourceDecoder.h"
#include "UserContentURLPattern.h"
#include "UserTypingGestureIndicator.h"
+#include "VisibleUnits.h"
#include "WebKitFontFamilyNames.h"
#include "XMLNSNames.h"
#include "XMLNames.h"
#include "htmlediting.h"
#include "markup.h"
#include "npruntime_impl.h"
-#include "visible_units.h"
#include <wtf/PassOwnPtr.h>
#include <wtf/RefCountedLeakCounter.h>
#include <wtf/StdLibExtras.h>
diff --git a/Source/WebCore/page/mac/FrameMac.mm b/Source/WebCore/page/mac/FrameMac.mm
index 31d6649..3144225 100644
--- a/Source/WebCore/page/mac/FrameMac.mm
+++ b/Source/WebCore/page/mac/FrameMac.mm
@@ -51,7 +51,7 @@
#import "RenderView.h"
#import "Scrollbar.h"
#import "SimpleFontData.h"
-#import "visible_units.h"
+#import "VisibleUnits.h"
#import <wtf/StdLibExtras.h>
@interface NSView (WebCoreHTMLDocumentView)
diff --git a/Source/WebCore/platform/win/EditorWin.cpp b/Source/WebCore/platform/win/EditorWin.cpp
index f9505b3..4838552 100644
--- a/Source/WebCore/platform/win/EditorWin.cpp
+++ b/Source/WebCore/platform/win/EditorWin.cpp
@@ -33,7 +33,7 @@
#include "Frame.h"
#include "htmlediting.h"
#include "TextIterator.h"
-#include "visible_units.h"
+#include "VisibleUnits.h"
#include <windows.h>
diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index d3eb588..4845721 100644
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,12 @@
+2013-03-05 Kent Tamura <tkent@chromium.org>
+
+ Rename WebCore/editing/visible_units.* to VisibleUnits.*
+ https://bugs.webkit.org/show_bug.cgi?id=111426
+
+ Reviewed by Alexey Proskuryakov.
+
+ * WebView/WebFrame.mm:
+
2013-03-05 James Robinson <jamesr@chromium.org>
ContainerNode::setActive should not sleep for 100ms on platforms that do not implement synchronous repaint(true) semantics
diff --git a/Source/WebKit/mac/WebView/WebFrame.mm b/Source/WebKit/mac/WebView/WebFrame.mm
index e7604be..17af8f0 100644
--- a/Source/WebKit/mac/WebView/WebFrame.mm
+++ b/Source/WebKit/mac/WebView/WebFrame.mm
@@ -93,9 +93,9 @@
#import <WebCore/StylePropertySet.h>
#import <WebCore/TextIterator.h>
#import <WebCore/ThreadCheck.h>
+#import <WebCore/VisibleUnits.h>
#import <WebCore/htmlediting.h>
#import <WebCore/markup.h>
-#import <WebCore/visible_units.h>
#import <WebKitSystemInterface.h>
#import <runtime/JSLock.h>
#import <runtime/JSObject.h>
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 262a477..5bc053e 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2013-03-05 Kent Tamura <tkent@chromium.org>
+
+ Rename WebCore/editing/visible_units.* to VisibleUnits.*
+ https://bugs.webkit.org/show_bug.cgi?id=111426
+
+ Reviewed by Alexey Proskuryakov.
+
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+
2013-03-06 Zeno Albisser <zeno@webkit.org>
DataReference::vector() should be const.
diff --git a/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm b/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm
index 83545fb..c1fae93 100644
--- a/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm
+++ b/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm
@@ -61,7 +61,7 @@
#import <WebCore/StyleInheritedData.h>
#import <WebCore/TextIterator.h>
#import <WebCore/WindowsKeyboardCodes.h>
-#import <WebCore/visible_units.h>
+#import <WebCore/VisibleUnits.h>
#import <WebKitSystemInterface.h>
using namespace WebCore;
