Skip to content
Permalink
Browse files
Move LineWidth.{h,cpp} into rendering/line
<https://webkit.org/b/124448>

Reviewed by David Hyatt.

In r159354 I introduced line directory. Now it's time to move the helper classes of RenderBlockLineLayout into 'line' subdirectory.

No new tests, no behavior change.

* CMakeLists.txt:
* GNUmakefile.list.am:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* rendering/line/LineWidth.cpp: Renamed from Source/WebCore/rendering/LineWidth.cpp.
(WebCore::LineWidth::LineWidth):
(WebCore::LineWidth::fitsOnLine):
(WebCore::LineWidth::fitsOnLineIncludingExtraWidth):
(WebCore::LineWidth::fitsOnLineExcludingTrailingWhitespace):
(WebCore::LineWidth::updateAvailableWidth):
(WebCore::LineWidth::shrinkAvailableWidthForNewFloatIfNeeded):
(WebCore::LineWidth::commit):
(WebCore::LineWidth::applyOverhang):
(WebCore::LineWidth::fitBelowFloats):
(WebCore::LineWidth::setTrailingWhitespaceWidth):
(WebCore::LineWidth::updateCurrentShapeSegment):
(WebCore::LineWidth::computeAvailableWidthFromLeftAndRight):
(WebCore::LineWidth::fitsOnLineExcludingTrailingCollapsedWhitespace):
* rendering/line/LineWidth.h: Renamed from Source/WebCore/rendering/LineWidth.h.
(WebCore::LineWidth::currentWidth):
(WebCore::LineWidth::uncommittedWidth):
(WebCore::LineWidth::committedWidth):
(WebCore::LineWidth::availableWidth):
(WebCore::LineWidth::addUncommittedWidth):
(WebCore::LineWidth::shouldIndentText):


Canonical link: https://commits.webkit.org/142826@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@159569 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
zhorvath committed Nov 20, 2013
1 parent 40b3b13 commit 3f3360cc7aa742629f7206bd2b10a0fbe8b6fe9d
Showing 8 changed files with 55 additions and 17 deletions.
@@ -2115,7 +2115,6 @@ set(WebCore_SOURCES
rendering/InlineTextBox.cpp
rendering/LayoutRepainter.cpp
rendering/LayoutState.cpp
rendering/LineWidth.cpp
rendering/OrderIterator.cpp
rendering/PointerEventsHitRules.cpp
rendering/RenderBlock.cpp
@@ -2214,6 +2213,7 @@ set(WebCore_SOURCES

rendering/line/LineBreaker.cpp
rendering/line/LineInfo.cpp
rendering/line/LineWidth.cpp

rendering/mathml/RenderMathMLBlock.cpp
rendering/mathml/RenderMathMLFenced.cpp
@@ -1,3 +1,41 @@
2013-11-20 Zoltan Horvath <zoltan@webkit.org>

Move LineWidth.{h,cpp} into rendering/line
<https://webkit.org/b/124448>

Reviewed by David Hyatt.

In r159354 I introduced line directory. Now it's time to move the helper classes of RenderBlockLineLayout into 'line' subdirectory.

No new tests, no behavior change.

* CMakeLists.txt:
* GNUmakefile.list.am:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* rendering/line/LineWidth.cpp: Renamed from Source/WebCore/rendering/LineWidth.cpp.
(WebCore::LineWidth::LineWidth):
(WebCore::LineWidth::fitsOnLine):
(WebCore::LineWidth::fitsOnLineIncludingExtraWidth):
(WebCore::LineWidth::fitsOnLineExcludingTrailingWhitespace):
(WebCore::LineWidth::updateAvailableWidth):
(WebCore::LineWidth::shrinkAvailableWidthForNewFloatIfNeeded):
(WebCore::LineWidth::commit):
(WebCore::LineWidth::applyOverhang):
(WebCore::LineWidth::fitBelowFloats):
(WebCore::LineWidth::setTrailingWhitespaceWidth):
(WebCore::LineWidth::updateCurrentShapeSegment):
(WebCore::LineWidth::computeAvailableWidthFromLeftAndRight):
(WebCore::LineWidth::fitsOnLineExcludingTrailingCollapsedWhitespace):
* rendering/line/LineWidth.h: Renamed from Source/WebCore/rendering/LineWidth.h.
(WebCore::LineWidth::currentWidth):
(WebCore::LineWidth::uncommittedWidth):
(WebCore::LineWidth::committedWidth):
(WebCore::LineWidth::availableWidth):
(WebCore::LineWidth::addUncommittedWidth):
(WebCore::LineWidth::shouldIndentText):

2013-11-20 Brady Eidson <beidson@apple.com>

Alphabetization followup to r159567
@@ -4307,8 +4307,6 @@ webcore_sources += \
Source/WebCore/rendering/LogicalSelectionOffsetCaches.h \
Source/WebCore/rendering/LayoutRepainter.h \
Source/WebCore/rendering/LayoutRepainter.cpp \
Source/WebCore/rendering/LineWidth.h \
Source/WebCore/rendering/LineWidth.cpp \
Source/WebCore/rendering/OverlapTestRequestClient.h \
Source/WebCore/rendering/OrderIterator.cpp \
Source/WebCore/rendering/OrderIterator.h \
@@ -4517,6 +4515,8 @@ webcore_sources += \
Source/WebCore/rendering/line/LineBreaker.cpp \
Source/WebCore/rendering/line/LineInlineHeaders.h \
Source/WebCore/rendering/line/LineLayoutState.h \
Source/WebCore/rendering/line/LineWidth.h \
Source/WebCore/rendering/line/LineWidth.cpp \
Source/WebCore/rendering/mathml/RenderMathMLBlock.cpp \
Source/WebCore/rendering/mathml/RenderMathMLBlock.h \
Source/WebCore/rendering/mathml/RenderMathMLFenced.cpp \
@@ -9698,7 +9698,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\rendering\LineWidth.cpp" />
<ClCompile Include="..\rendering\OrderIterator.cpp" />
<ClCompile Include="..\rendering\PointerEventsHitRules.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -11064,6 +11063,7 @@
<ClCompile Include="..\rendering\TextPaintStyle.cpp" />
<ClCompile Include="..\rendering\line\LineBreaker.cpp" />
<ClCompile Include="..\rendering\line\LineInfo.cpp" />
<ClCompile Include="..\rendering\line\LineWidth.cpp" />
<ClCompile Include="..\rendering\shapes\PolygonShape.cpp" />
<ClCompile Include="..\rendering\shapes\RasterShape.cpp" />
<ClCompile Include="..\rendering\shapes\RectangleShape.cpp" />
@@ -19813,7 +19813,6 @@
<ClInclude Include="..\rendering\InlineTextBox.h" />
<ClInclude Include="..\rendering\LayoutRepainter.h" />
<ClInclude Include="..\rendering\LayoutState.h" />
<ClInclude Include="..\rendering\LineWidth.h" />
<ClInclude Include="..\rendering\OrderIterator.h" />
<ClInclude Include="..\rendering\PaintInfo.h" />
<ClInclude Include="..\rendering\PaintPhase.h" />
@@ -19891,6 +19890,7 @@
<ClInclude Include="..\rendering\line\LineInfo.h" />
<ClInclude Include="..\rendering\line\LineInlineHeaders.h" />
<ClInclude Include="..\rendering\line\LineLayoutState.h" />
<ClInclude Include="..\rendering\line\LineWidth.h" />
<ClInclude Include="..\rendering\shapes\PolygonShape.h" />
<ClInclude Include="..\rendering\shapes\RasterShape.h" />
<ClInclude Include="..\rendering\shapes\RectangleShape.h" />
@@ -6904,7 +6904,7 @@
<ClCompile Include="..\Modules\indexeddb\leveldb\IDBFactoryBackendLevelDB.cpp">
<Filter>Modules\indexeddb\leveldb</Filter>
</ClCompile>
<ClCompile Include="..\rendering\LineWidth.cpp">
<ClCompile Include="..\rendering\line\LineWidth.cpp">
<Filter>rendering</Filter>
</ClCompile>
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSBeforeUnloadEvent.cpp">
@@ -14657,6 +14657,9 @@
<ClInclude Include="..\rendering\RenderElement.h">
<Filter>rendering</Filter>
</ClInclude>
<ClInclude Include="..\rendering\line\LineWidth.h">
<Filter>rendering\line</Filter>
</ClInclude>
<ClInclude Include="..\platform\graphics\FloatPolygon.h">
<Filter>platform\graphics</Filter>
</ClInclude>
@@ -14684,9 +14687,6 @@
<ClInclude Include="..\rendering\shapes\RectangleShape.h">
<Filter>rendering\shapes</Filter>
</ClInclude>
<ClInclude Include="..\rendering\LineWidth.h">
<Filter>rendering</Filter>
</ClInclude>
<ClInclude Include="..\rendering\LineLayoutState.h">
<Filter>rendering</Filter>
</ClInclude>
@@ -3442,8 +3442,6 @@
A07D3356152B630E001B6393 /* JSWebGLShaderPrecisionFormat.h in Headers */ = {isa = PBXBuildFile; fileRef = A07D3354152B630E001B6393 /* JSWebGLShaderPrecisionFormat.h */; };
A07D3358152B632D001B6393 /* WebGLShaderPrecisionFormat.h in Headers */ = {isa = PBXBuildFile; fileRef = A07D3357152B632D001B6393 /* WebGLShaderPrecisionFormat.h */; };
A08CF154152B77B3009C5775 /* WebGLShaderPrecisionFormat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A08CF153152B77B3009C5775 /* WebGLShaderPrecisionFormat.cpp */; };
A0CB002417DF82660017896B /* LineWidth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A0CB002317DF81AC0017896B /* LineWidth.cpp */; };
A0CB002517DF826C0017896B /* LineWidth.h in Headers */ = {isa = PBXBuildFile; fileRef = A0CB002117DE9CD00017896B /* LineWidth.h */; settings = {ATTRIBUTES = (); }; };
A0EE0DF5144F825500F80B0D /* WebGLDebugRendererInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A0EE0DF1144F825500F80B0D /* WebGLDebugRendererInfo.cpp */; };
A0EE0DF6144F825500F80B0D /* WebGLDebugRendererInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = A0EE0DF2144F825500F80B0D /* WebGLDebugRendererInfo.h */; };
A0EE0DF7144F825500F80B0D /* WebGLDebugShaders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A0EE0DF3144F825500F80B0D /* WebGLDebugShaders.cpp */; };
@@ -6305,6 +6303,8 @@
FFB698CF183402BB00158A31 /* LineInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FFB698CD1833F17600158A31 /* LineInfo.cpp */; };
FFD5B97A135CC97800D5E92A /* PageVisibilityState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FFD5B977135CC97800D5E92A /* PageVisibilityState.cpp */; };
FFD5B97B135CC97800D5E92A /* PageVisibilityState.h in Headers */ = {isa = PBXBuildFile; fileRef = FFD5B978135CC97800D5E92A /* PageVisibilityState.h */; settings = {ATTRIBUTES = (Private, ); }; };
FFDBC047183D27B700407109 /* LineWidth.h in Headers */ = {isa = PBXBuildFile; fileRef = FFDBC045183D27B700407109 /* LineWidth.h */; };
FFDBC048183D27B700407109 /* LineWidth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FFDBC046183D27B700407109 /* LineWidth.cpp */; };
FFEFAB2A18380DA000514534 /* LineLayoutState.h in Headers */ = {isa = PBXBuildFile; fileRef = FFEFAB2918380DA000514534 /* LineLayoutState.h */; };
/* End PBXBuildFile section */

@@ -10217,8 +10217,6 @@
A07D3357152B632D001B6393 /* WebGLShaderPrecisionFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebGLShaderPrecisionFormat.h; path = canvas/WebGLShaderPrecisionFormat.h; sourceTree = "<group>"; };
A07D3359152B633E001B6393 /* WebGLShaderPrecisionFormat.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WebGLShaderPrecisionFormat.idl; path = canvas/WebGLShaderPrecisionFormat.idl; sourceTree = "<group>"; };
A08CF153152B77B3009C5775 /* WebGLShaderPrecisionFormat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebGLShaderPrecisionFormat.cpp; path = canvas/WebGLShaderPrecisionFormat.cpp; sourceTree = "<group>"; };
A0CB002117DE9CD00017896B /* LineWidth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LineWidth.h; sourceTree = "<group>"; };
A0CB002317DF81AC0017896B /* LineWidth.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LineWidth.cpp; sourceTree = "<group>"; };
A0EE0DEF144F823200F80B0D /* WebGLDebugShaders.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WebGLDebugShaders.idl; path = canvas/WebGLDebugShaders.idl; sourceTree = "<group>"; };
A0EE0DF0144F824300F80B0D /* WebGLDebugRendererInfo.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WebGLDebugRendererInfo.idl; path = canvas/WebGLDebugRendererInfo.idl; sourceTree = "<group>"; };
A0EE0DF1144F825500F80B0D /* WebGLDebugRendererInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebGLDebugRendererInfo.cpp; path = canvas/WebGLDebugRendererInfo.cpp; sourceTree = "<group>"; };
@@ -13485,6 +13483,8 @@
FFB698CE1833F17600158A31 /* LineInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LineInfo.h; sourceTree = "<group>"; };
FFD5B977135CC97800D5E92A /* PageVisibilityState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageVisibilityState.cpp; sourceTree = "<group>"; };
FFD5B978135CC97800D5E92A /* PageVisibilityState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageVisibilityState.h; sourceTree = "<group>"; };
FFDBC045183D27B700407109 /* LineWidth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LineWidth.h; sourceTree = "<group>"; };
FFDBC046183D27B700407109 /* LineWidth.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LineWidth.cpp; sourceTree = "<group>"; };
FFEFAB2918380DA000514534 /* LineLayoutState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LineLayoutState.h; sourceTree = "<group>"; };
FFEFAB2D183BCB6F00514534 /* LineInlineHeaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LineInlineHeaders.h; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -20966,8 +20966,6 @@
A120ACA013F9983700FE4AC7 /* LayoutRepainter.h */,
2D9066040BE141D400956998 /* LayoutState.cpp */,
2D9066050BE141D400956998 /* LayoutState.h */,
A0CB002317DF81AC0017896B /* LineWidth.cpp */,
A0CB002117DE9CD00017896B /* LineWidth.h */,
9BA273F3172206BB0097CE47 /* LogicalSelectionOffsetCaches.h */,
3774ABA30FA21EB400AD7DE9 /* OverlapTestRequestClient.h */,
9377AB9F15DEFEEF0031FD04 /* Pagination.h */,
@@ -21907,6 +21905,8 @@
FFB698C81832F10B00158A31 /* line */ = {
isa = PBXGroup;
children = (
FFDBC045183D27B700407109 /* LineWidth.h */,
FFDBC046183D27B700407109 /* LineWidth.cpp */,
FFEFAB2D183BCB6F00514534 /* LineInlineHeaders.h */,
FFEFAB2918380DA000514534 /* LineLayoutState.h */,
FFB698CD1833F17600158A31 /* LineInfo.cpp */,
@@ -24750,6 +24750,7 @@
0810764412828556007C63BA /* SVGListProperty.h in Headers */,
088A0E09126EF1DB00978F7A /* SVGListPropertyTearOff.h in Headers */,
B2227A410D00BF220071B782 /* SVGLocatable.h in Headers */,
FFDBC047183D27B700407109 /* LineWidth.h in Headers */,
436708EE12D9CA4B00044234 /* SVGMarkerData.h in Headers */,
B2227A440D00BF220071B782 /* SVGMarkerElement.h in Headers */,
B2227A470D00BF220071B782 /* SVGMaskElement.h in Headers */,
@@ -25211,7 +25212,6 @@
BE16C59317CFE17200852C04 /* InbandGenericTextTrack.h in Headers */,
BE16C59517CFE17200852C04 /* InbandWebVTTTextTrack.h in Headers */,
BC10D76817D8EE71005E2626 /* RenderBlockFlow.h in Headers */,
A0CB002517DF826C0017896B /* LineWidth.h in Headers */,
CD3E251C18046B0600E27F56 /* GridCoordinate.h in Headers */,
CD3E252418046BCD00E27F56 /* CSSGridTemplateValue.h in Headers */,
CDEF4FD717E85C8F00AEE24B /* GridLength.h in Headers */,
@@ -28101,6 +28101,7 @@
A769E96A16689D0C005D4529 /* UserActionElementSet.cpp in Sources */,
65DF326109D1E199000BE325 /* UserAgentStyleSheetsData.cpp in Sources */,
BCACF3BC1072921A00C0C8A3 /* UserContentURLPattern.cpp in Sources */,
FFDBC048183D27B700407109 /* LineWidth.cpp in Sources */,
2542F4DA1166C25A00E89A86 /* UserGestureIndicator.cpp in Sources */,
BCDF317B11F8D683003C5BF8 /* UserTypingGestureIndicator.cpp in Sources */,
1FAFBF1815A5FA6E00083A20 /* UTIUtilities.mm in Sources */,
@@ -28288,7 +28289,6 @@
BE16C59217CFE17200852C04 /* InbandGenericTextTrack.cpp in Sources */,
BE16C59417CFE17200852C04 /* InbandWebVTTTextTrack.cpp in Sources */,
BC10D76717D8EE6E005E2626 /* RenderBlockFlow.cpp in Sources */,
A0CB002417DF82660017896B /* LineWidth.cpp in Sources */,
CD3E252318046BCD00E27F56 /* CSSGridTemplateValue.cpp in Sources */,
CDE7FC44181904B1002BBB77 /* OrderIterator.cpp in Sources */,
);
File renamed without changes.
File renamed without changes.

0 comments on commit 3f3360c

Please sign in to comment.