[CSS Exclusions] Rename WrapShapeInfo to ExclusionShapeInfo
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 26 Sep 2012 19:55:35 +0000 (19:55 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 26 Sep 2012 19:55:35 +0000 (19:55 +0000)
commit7bc3d3e73c7de4c7044abbaf63b2929c2445d16f
tree795bc864344e480b9ef5444dfb3593dcab03c1e8
parent9ab530d4e130099fd7d7978755e2483b9c520d38
[CSS Exclusions] Rename WrapShapeInfo to ExclusionShapeInfo
https://bugs.webkit.org/show_bug.cgi?id=96157

Patch by Bear Travis <betravis@adobe.com> on 2012-09-26
Reviewed by Dirk Schulze.

Rename WrapShapeInfo to the more specific ExclusionShapeInsideInfo, which is the only
information the class is currently tracking. This patch updates build files, class
instances and variable names. When shape-outside is added, there may be an additional
ExclusionShapeOutsideInfo class that shares a common parent class with
ExclusionShapeInsideInfo. This patch only changes names, there is no new functionality.

Covered by existing tests

* CMakeLists.txt: Rename files from WrapShapeInfo to ExclusionShapeInsideInfo.
* GNUmakefile.list.am: Ditto.
* Target.pri: Ditto.
* WebCore.gypi: Ditto.
* WebCore.vcproj/WebCore.vcproj: Ditto.
* WebCore.xcodeproj/project.pbxproj: Ditto.
* rendering/ExclusionShapeInsideInfo.cpp: Renamed from Source/WebCore/rendering/WrapShapeInfo.cpp.
(WebCore):  Renaming functions and variables to use ExclusionShapeInsideInfo rather than
WrapShapeInfo.
(WebCore::exclusionShapeInsideInfoMap):
(WebCore::ExclusionShapeInsideInfo::ExclusionShapeInsideInfo):
(WebCore::ExclusionShapeInsideInfo::~ExclusionShapeInsideInfo):
(WebCore::ExclusionShapeInsideInfo::ensureExclusionShapeInsideInfoForRenderBlock):
(WebCore::ExclusionShapeInsideInfo::exclusionShapeInsideInfoForRenderBlock):
(WebCore::ExclusionShapeInsideInfo::isExclusionShapeInsideInfoEnabledForRenderBlock):
(WebCore::ExclusionShapeInsideInfo::removeExclusionShapeInsideInfoForRenderBlock):
(WebCore::ExclusionShapeInsideInfo::computeShapeSize):
(WebCore::ExclusionShapeInsideInfo::computeSegmentsForLine):
* rendering/ExclusionShapeInsideInfo.h: Renamed from Source/WebCore/rendering/WrapShapeInfo.h.
(WebCore):
(ExclusionShapeInsideInfo):
(WebCore::ExclusionShapeInsideInfo::create):
(WebCore::ExclusionShapeInsideInfo::shapeLogicalTop):
(WebCore::ExclusionShapeInsideInfo::shapeLogicalBottom):
(WebCore::ExclusionShapeInsideInfo::hasSegments):
(WebCore::ExclusionShapeInsideInfo::segments):
(WebCore::ExclusionShapeInsideInfo::dirtyShapeSize):
(WebCore::ExclusionShapeInsideInfo::lineOverlapsShapeBounds):
* rendering/LayoutState.cpp:
(WebCore::LayoutState::LayoutState):
* rendering/LayoutState.h:
(WebCore):
(WebCore::LayoutState::LayoutState):
(WebCore::LayoutState::exclusionShapeInsideInfo):
(LayoutState):
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::willBeDestroyed):
(WebCore::RenderBlock::styleDidChange):
(WebCore::RenderBlock::updateExclusionShapeInsideInfoAfterStyleChange):
(WebCore::RenderBlock::updateRegionsAndExclusionsLogicalSize):
(WebCore::RenderBlock::computeExclusionShapeSize):
* rendering/RenderBlock.h:
(WebCore::RenderBlock::exclusionShapeInsideInfo):
(RenderBlock):
* rendering/RenderBlockLineLayout.cpp:
(WebCore::layoutExclusionShapeInsideInfo):
(WebCore::LineWidth::LineWidth):
(WebCore::RenderBlock::computeInlineDirectionPositionsForLine):
(WebCore::RenderBlock::layoutRunsAndFloatsInRange):
* rendering/RenderView.h:
(WebCore::RenderView::pushLayoutState):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@129689 268f45cc-cd09-0410-ab3c-d52691b4dbfc
15 files changed:
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.list.am
Source/WebCore/Target.pri
Source/WebCore/WebCore.gypi
Source/WebCore/WebCore.vcproj/WebCore.vcproj
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/rendering/ExclusionShapeInsideInfo.cpp [moved from Source/WebCore/rendering/WrapShapeInfo.cpp with 64% similarity]
Source/WebCore/rendering/ExclusionShapeInsideInfo.h [moved from Source/WebCore/rendering/WrapShapeInfo.h with 76% similarity]
Source/WebCore/rendering/LayoutState.cpp
Source/WebCore/rendering/LayoutState.h
Source/WebCore/rendering/RenderBlock.cpp
Source/WebCore/rendering/RenderBlock.h
Source/WebCore/rendering/RenderBlockLineLayout.cpp
Source/WebCore/rendering/RenderView.h