diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
| commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
| tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebCore/rendering/LayoutState.h | |
| parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) | |
| download | qtwebkit-8995b83bcbfbb68245f779b64e5517627c6cc6ea.tar.gz | |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
Diffstat (limited to 'Source/WebCore/rendering/LayoutState.h')
| -rw-r--r-- | Source/WebCore/rendering/LayoutState.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/rendering/LayoutState.h b/Source/WebCore/rendering/LayoutState.h index a41a22677..5450df9cb 100644 --- a/Source/WebCore/rendering/LayoutState.h +++ b/Source/WebCore/rendering/LayoutState.h @@ -39,7 +39,7 @@ class RenderBox; class RenderObject; class RenderFlowThread; #if ENABLE(CSS_EXCLUSIONS) -class WrapShapeInfo; +class ExclusionShapeInsideInfo; #endif class LayoutState { @@ -57,7 +57,7 @@ public: , m_renderer(0) #endif #if ENABLE(CSS_EXCLUSIONS) - , m_wrapShapeInfo(0) + , m_exclusionShapeInsideInfo(0) #endif { } @@ -95,7 +95,7 @@ public: bool needsBlockDirectionLocationSetBeforeLayout() const { return m_lineGrid || (m_isPaginated && m_pageLogicalHeight); } #if ENABLE(CSS_EXCLUSIONS) - WrapShapeInfo* wrapShapeInfo() const { return m_wrapShapeInfo; } + ExclusionShapeInsideInfo* exclusionShapeInsideInfo() const { return m_exclusionShapeInsideInfo; } #endif private: // The normal operator new is disallowed. @@ -139,7 +139,7 @@ public: RenderObject* m_renderer; #endif #if ENABLE(CSS_EXCLUSIONS) - WrapShapeInfo* m_wrapShapeInfo; + ExclusionShapeInsideInfo* m_exclusionShapeInsideInfo; #endif }; |