Changeset 238963 in webkit


Ignore:
Timestamp:
Dec 7, 2018 12:10:14 PM (5 years ago)
Author:
Antti Koivisto
Message:

Rename LayoutState to RenderLayoutState
​https://bugs.webkit.org/show_bug.cgi?id=192504

Reviewed by Zalan Bujtas.

The name is better used in LFC.

  • Sources.txt:
  • WebCore.xcodeproj/project.pbxproj:
  • page/FrameViewLayoutContext.cpp:

(WebCore::FrameViewLayoutContext::layoutState const):
(WebCore::FrameViewLayoutContext::pushLayoutState):
(WebCore::FrameViewLayoutContext::pushLayoutStateForPaginationIfNeeded):

  • page/FrameViewLayoutContext.h:
  • rendering/LayoutState.cpp: Removed.
  • rendering/LayoutState.h: Removed.
  • rendering/RenderBlock.cpp:
  • rendering/RenderBlock.h:
  • rendering/RenderBlockFlow.cpp:

(WebCore::RenderBlockFlow::checkForPaginationLogicalHeightChange):

  • rendering/RenderBlockLineLayout.cpp:
  • rendering/RenderBox.cpp:
  • rendering/RenderEmbeddedObject.cpp:
  • rendering/RenderFragmentedFlow.cpp:
  • rendering/RenderGrid.cpp:
  • rendering/RenderImage.cpp:
  • rendering/RenderInline.cpp:
  • rendering/RenderLayoutState.cpp: Copied from Source/WebCore/rendering/LayoutState.cpp.

(WebCore::RenderLayoutState::RenderLayoutState):
(WebCore::RenderLayoutState::computeOffsets):
(WebCore::RenderLayoutState::computeClipRect):
(WebCore::RenderLayoutState::computePaginationInformation):
(WebCore::RenderLayoutState::pageLogicalOffset const):
(WebCore::RenderLayoutState::computeLineGridPaginationOrigin):
(WebCore::RenderLayoutState::propagateLineGridInfo):
(WebCore::RenderLayoutState::establishLineGrid):
(WebCore::RenderLayoutState::addLayoutDelta):
(WebCore::RenderLayoutState::layoutDeltaMatches const):
(WebCore::LayoutState::LayoutState): Deleted.
(WebCore::LayoutState::computeOffsets): Deleted.
(WebCore::LayoutState::computeClipRect): Deleted.
(WebCore::LayoutState::computePaginationInformation): Deleted.
(WebCore::LayoutState::pageLogicalOffset const): Deleted.
(WebCore::LayoutState::computeLineGridPaginationOrigin): Deleted.
(WebCore::LayoutState::propagateLineGridInfo): Deleted.
(WebCore::LayoutState::establishLineGrid): Deleted.
(WebCore::LayoutState::addLayoutDelta): Deleted.
(WebCore::LayoutState::layoutDeltaMatches const): Deleted.

  • rendering/RenderLayoutState.h: Copied from Source/WebCore/rendering/LayoutState.h.

(WebCore::RenderLayoutState::RenderLayoutState):
(WebCore::LayoutState::LayoutState): Deleted.
(WebCore::LayoutState::isPaginated const): Deleted.
(WebCore::LayoutState::pageLogicalHeight const): Deleted.
(WebCore::LayoutState::pageLogicalHeightChanged const): Deleted.
(WebCore::LayoutState::lineGrid const): Deleted.
(WebCore::LayoutState::lineGridOffset const): Deleted.
(WebCore::LayoutState::lineGridPaginationOrigin const): Deleted.
(WebCore::LayoutState::paintOffset const): Deleted.
(WebCore::LayoutState::layoutOffset const): Deleted.
(WebCore::LayoutState::pageOffset const): Deleted.
(WebCore::LayoutState::needsBlockDirectionLocationSetBeforeLayout const): Deleted.
(WebCore::LayoutState::renderer const): Deleted.
(WebCore::LayoutState::clipRect const): Deleted.
(WebCore::LayoutState::isClipped const): Deleted.
(WebCore::LayoutState::layoutDelta const): Deleted.

  • rendering/RenderListBox.cpp:
  • rendering/RenderMediaControlElements.cpp:
  • rendering/RenderMultiColumnFlow.cpp:
  • rendering/RenderTable.cpp:
  • rendering/RenderTableRow.cpp:
  • rendering/RenderTableSection.cpp:
  • rendering/RenderVTTCue.cpp:
  • rendering/RenderView.cpp:
  • rendering/RenderView.h:
  • rendering/RootInlineBox.cpp:
  • rendering/svg/RenderSVGRoot.cpp:

(WebCore::RenderSVGRoot::layout):

Location:
trunk/Source/WebCore
Files:
26 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r238961 r238963  
     12018-12-07  Antti Koivisto  <antti@apple.com>
     2
     3        Rename LayoutState to RenderLayoutState
     4        https://bugs.webkit.org/show_bug.cgi?id=192504
     5
     6        Reviewed by Zalan Bujtas.
     7
     8        The name is better used in LFC.
     9
     10        * Sources.txt:
     11        * WebCore.xcodeproj/project.pbxproj:
     12        * page/FrameViewLayoutContext.cpp:
     13        (WebCore::FrameViewLayoutContext::layoutState const):
     14        (WebCore::FrameViewLayoutContext::pushLayoutState):
     15        (WebCore::FrameViewLayoutContext::pushLayoutStateForPaginationIfNeeded):
     16        * page/FrameViewLayoutContext.h:
     17        * rendering/LayoutState.cpp: Removed.
     18        * rendering/LayoutState.h: Removed.
     19        * rendering/RenderBlock.cpp:
     20        * rendering/RenderBlock.h:
     21        * rendering/RenderBlockFlow.cpp:
     22        (WebCore::RenderBlockFlow::checkForPaginationLogicalHeightChange):
     23        * rendering/RenderBlockLineLayout.cpp:
     24        * rendering/RenderBox.cpp:
     25        * rendering/RenderEmbeddedObject.cpp:
     26        * rendering/RenderFragmentedFlow.cpp:
     27        * rendering/RenderGrid.cpp:
     28        * rendering/RenderImage.cpp:
     29        * rendering/RenderInline.cpp:
     30        * rendering/RenderLayoutState.cpp: Copied from Source/WebCore/rendering/LayoutState.cpp.
     31        (WebCore::RenderLayoutState::RenderLayoutState):
     32        (WebCore::RenderLayoutState::computeOffsets):
     33        (WebCore::RenderLayoutState::computeClipRect):
     34        (WebCore::RenderLayoutState::computePaginationInformation):
     35        (WebCore::RenderLayoutState::pageLogicalOffset const):
     36        (WebCore::RenderLayoutState::computeLineGridPaginationOrigin):
     37        (WebCore::RenderLayoutState::propagateLineGridInfo):
     38        (WebCore::RenderLayoutState::establishLineGrid):
     39        (WebCore::RenderLayoutState::addLayoutDelta):
     40        (WebCore::RenderLayoutState::layoutDeltaMatches const):
     41        (WebCore::LayoutState::LayoutState): Deleted.
     42        (WebCore::LayoutState::computeOffsets): Deleted.
     43        (WebCore::LayoutState::computeClipRect): Deleted.
     44        (WebCore::LayoutState::computePaginationInformation): Deleted.
     45        (WebCore::LayoutState::pageLogicalOffset const): Deleted.
     46        (WebCore::LayoutState::computeLineGridPaginationOrigin): Deleted.
     47        (WebCore::LayoutState::propagateLineGridInfo): Deleted.
     48        (WebCore::LayoutState::establishLineGrid): Deleted.
     49        (WebCore::LayoutState::addLayoutDelta): Deleted.
     50        (WebCore::LayoutState::layoutDeltaMatches const): Deleted.
     51        * rendering/RenderLayoutState.h: Copied from Source/WebCore/rendering/LayoutState.h.
     52        (WebCore::RenderLayoutState::RenderLayoutState):
     53        (WebCore::LayoutState::LayoutState): Deleted.
     54        (WebCore::LayoutState::isPaginated const): Deleted.
     55        (WebCore::LayoutState::pageLogicalHeight const): Deleted.
     56        (WebCore::LayoutState::pageLogicalHeightChanged const): Deleted.
     57        (WebCore::LayoutState::lineGrid const): Deleted.
     58        (WebCore::LayoutState::lineGridOffset const): Deleted.
     59        (WebCore::LayoutState::lineGridPaginationOrigin const): Deleted.
     60        (WebCore::LayoutState::paintOffset const): Deleted.
     61        (WebCore::LayoutState::layoutOffset const): Deleted.
     62        (WebCore::LayoutState::pageOffset const): Deleted.
     63        (WebCore::LayoutState::needsBlockDirectionLocationSetBeforeLayout const): Deleted.
     64        (WebCore::LayoutState::renderer const): Deleted.
     65        (WebCore::LayoutState::clipRect const): Deleted.
     66        (WebCore::LayoutState::isClipped const): Deleted.
     67        (WebCore::LayoutState::layoutDelta const): Deleted.
     68        * rendering/RenderListBox.cpp:
     69        * rendering/RenderMediaControlElements.cpp:
     70        * rendering/RenderMultiColumnFlow.cpp:
     71        * rendering/RenderTable.cpp:
     72        * rendering/RenderTableRow.cpp:
     73        * rendering/RenderTableSection.cpp:
     74        * rendering/RenderVTTCue.cpp:
     75        * rendering/RenderView.cpp:
     76        * rendering/RenderView.h:
     77        * rendering/RootInlineBox.cpp:
     78        * rendering/svg/RenderSVGRoot.cpp:
     79        (WebCore::RenderSVGRoot::layout):
     80
    1812018-12-07  Antti Koivisto  <antti@apple.com>
    282

  • trunk/Source/WebCore/Sources.txt

    r238872 r238963  
    19181918rendering/LayoutDisallowedScope.cpp
    19191919rendering/LayoutRepainter.cpp
    1920 rendering/LayoutState.cpp
    19211920rendering/MarkedText.cpp
    19221921rendering/OrderIterator.cpp
    … …  
    19571956rendering/RenderLayerFilters.cpp
    19581957rendering/RenderLayerModelObject.cpp
     1958rendering/RenderLayoutState.cpp
    19591959rendering/RenderLineBoxList.cpp
    19601960rendering/RenderLineBreak.cpp

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r238902 r238963  
    808808                2D8B92FF203D13E1009C868F /* UnifiedSource530.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE5F85D31FA23859006DB63B /* UnifiedSource530.cpp */; };
    809809                2D8FEBDD143E3EF70072502B /* CSSCrossfadeValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D8FEBDB143E3EF70072502B /* CSSCrossfadeValue.h */; };
    810                 2D9066070BE141D400956998 /* LayoutState.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D9066050BE141D400956998 /* LayoutState.h */; settings = {ATTRIBUTES = (Private, ); }; };
     810                2D9066070BE141D400956998 /* RenderLayoutState.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D9066050BE141D400956998 /* RenderLayoutState.h */; settings = {ATTRIBUTES = (Private, ); }; };
    811811                2D92A79A2134AD7900F493FD /* QuickLookSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 443917FD1A91B2F8006E04F2 /* QuickLookSoftLink.mm */; };
    812812                2D92A79D2134AF9500F493FD /* UserAgentIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = A3AF9D8320325691006CAD06 /* UserAgentIOS.mm */; };
    … …  
    66536653                2D8FEBDA143E3EF70072502B /* CSSCrossfadeValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSCrossfadeValue.cpp; sourceTree = "<group>"; };
    66546654                2D8FEBDB143E3EF70072502B /* CSSCrossfadeValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSCrossfadeValue.h; sourceTree = "<group>"; };
    6655                 2D9066040BE141D400956998 /* LayoutState.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = LayoutState.cpp; sourceTree = "<group>"; };
    6656                 2D9066050BE141D400956998 /* LayoutState.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = LayoutState.h; sourceTree = "<group>"; };
     6655                2D9066040BE141D400956998 /* RenderLayoutState.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderLayoutState.cpp; sourceTree = "<group>"; };
     6656                2D9066050BE141D400956998 /* RenderLayoutState.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderLayoutState.h; sourceTree = "<group>"; };
    66576657                2D90660C0665D937006B6F1A /* DataTransferMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DataTransferMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    66586658                2D93AEE119DF5641002A86C3 /* ServicesOverlayController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ServicesOverlayController.h; sourceTree = "<group>"; };
    … …  
    2650826508                                A120ACA113F9984600FE4AC7 /* LayoutRepainter.cpp */,
    2650926509                                A120ACA013F9983700FE4AC7 /* LayoutRepainter.h */,
    26510                                 2D9066040BE141D400956998 /* LayoutState.cpp */,
    26511                                 2D9066050BE141D400956998 /* LayoutState.h */,
    2651226510                                9BA273F3172206BB0097CE47 /* LogicalSelectionOffsetCaches.h */,
    2651326511                                CE1866421F72E5B400A0CAB6 /* MarkedText.cpp */,
    … …  
    2659626594                                3C244FE5A375AC633F88BE6F /* RenderLayerModelObject.cpp */,
    2659726595                                3C244FE4A375AC633F88BE6F /* RenderLayerModelObject.h */,
     26596                                2D9066040BE141D400956998 /* RenderLayoutState.cpp */,
     26597                                2D9066050BE141D400956998 /* RenderLayoutState.h */,
    2659826598                                BC33FB1A0F30EE85002CDD7C /* RenderLineBoxList.cpp */,
    2659926599                                0BE030A10F3112FB003C1A46 /* RenderLineBoxList.h */,
    … …  
    2799427994                                CDE595971BF26E2100A1CBE8 /* CDMSessionMediaSourceAVFObjC.h in Headers */,
    2799527995                                5FA904CA178E61F5004C8A2D /* CertificateInfo.h in Headers */,
    27996                                 91B8F0B521953D65000C2B00 /* CertificateInfoBase.h in Headers */,
    27997                                 FE36FD1516C7826500F887C1 /* ChangeVersionData.h in Headers */,
     27996                                91B8F0B521953D65000C2B00 /* CertificateInfoBase.h in Headers */,
     27997                                FE36FD1516C7826500F887C1 /* ChangeVersionData.h in Headers */,
    2799827998                                97BC69DD1505F076001B74AC /* ChangeVersionWrapper.h in Headers */,
    2799927999                                FD315FFF12B0267600C1A359 /* ChannelMergerNode.h in Headers */,
    … …  
    2999629996                                11310CF320BA4A370065A8D0 /* LayoutReplaced.h in Headers */,
    2999729997                                141DC054164834B900371E5A /* LayoutSize.h in Headers */,
    29998                                 2D9066070BE141D400956998 /* LayoutState.h in Headers */,
     29998                                2D9066070BE141D400956998 /* RenderLayoutState.h in Headers */,
    2999929999                                11310CF220BA4A320065A8D0 /* LayoutTreeBuilder.h in Headers */,
    3000030000                                141DC0481648348F00371E5A /* LayoutUnit.h in Headers */,

  • trunk/Source/WebCore/page/FrameViewLayoutContext.cpp

    r238791 r238963  
    3333#include "InspectorInstrumentation.h"
    3434#include "LayoutDisallowedScope.h"
    35 #include "LayoutState.h"
    3635#include "Logging.h"
    3736#include "RenderElement.h"
     37#include "RenderLayoutState.h"
    3838#include "RenderView.h"
    3939#include "RuntimeEnabledFeatures.h"
    … …  
    585585#endif
    586586
    587 LayoutState* FrameViewLayoutContext::layoutState() const
     587RenderLayoutState* FrameViewLayoutContext::layoutState() const
    588588{
    589589    if (m_layoutStateStack.isEmpty())
    … …  
    597597    ASSERT(!layoutState());
    598598
    599     m_layoutStateStack.append(std::make_unique<LayoutState>(root));
     599    m_layoutStateStack.append(std::make_unique<RenderLayoutState>(root));
    600600}
    601601
    … …  
    604604    if (layoutState())
    605605        return false;
    606     m_layoutStateStack.append(std::make_unique<LayoutState>(layoutRoot, LayoutState::IsPaginated::Yes));
     606    m_layoutStateStack.append(std::make_unique<RenderLayoutState>(layoutRoot, RenderLayoutState::IsPaginated::Yes));
    607607    return true;
    608608}
    … …  
    614614    if (!layoutState || !needsFullRepaint() || layoutState->isPaginated() || renderer.enclosingFragmentedFlow()
    615615        || layoutState->lineGrid() || (renderer.style().lineGrid() != RenderStyle::initialLineGrid() && renderer.isRenderBlockFlow())) {
    616         m_layoutStateStack.append(std::make_unique<LayoutState>(m_layoutStateStack, renderer, offset, pageHeight, pageHeightChanged));
     616        m_layoutStateStack.append(std::make_unique<RenderLayoutState>(m_layoutStateStack, renderer, offset, pageHeight, pageHeightChanged));
    617617        return true;
    618618    }

  • trunk/Source/WebCore/page/FrameViewLayoutContext.h

    r238463 r238963  
    3838class LayoutScope;
    3939class LayoutSize;
    40 class LayoutState;
    4140class RenderBlockFlow;
    4241class RenderBox;
    4342class RenderObject;
    4443class RenderElement;
     44class RenderLayoutState;
    4545class RenderView;
    4646   
    … …  
    9494    void flushAsynchronousTasks();
    9595
    96     LayoutState* layoutState() const;
     96    RenderLayoutState* layoutState() const;
    9797    // Returns true if layoutState should be used for its cached offset and clip.
    9898    bool isPaintOffsetCacheEnabled() const { return !m_paintOffsetCacheDisableCount && layoutState(); }
    … …  
    108108    bool layoutDeltaMatches(const LayoutSize& delta);
    109109#endif
    110     using LayoutStateStack = Vector<std::unique_ptr<LayoutState>>;
     110    using LayoutStateStack = Vector<std::unique_ptr<RenderLayoutState>>;
    111111
    112112private:

  • trunk/Source/WebCore/rendering/RenderBlock.cpp

    r238463 r238963  
    5656#include "RenderIterator.h"
    5757#include "RenderLayer.h"
     58#include "RenderLayoutState.h"
    5859#include "RenderListMarker.h"
    5960#include "RenderMenuList.h"

  • trunk/Source/WebCore/rendering/RenderBlock.h

    r238463 r238963  
    3232namespace WebCore {
    3333
    34 class LayoutState;
    3534class LineLayoutState;
    3635class LogicalSelectionOffsetCaches;

  • trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

    r238504 r238963  
    3636#include "InlineTextBox.h"
    3737#include "LayoutRepainter.h"
    38 #include "LayoutState.h"
    3938#include "Logging.h"
    4039#include "RenderCombineText.h"
    … …  
    4342#include "RenderIterator.h"
    4443#include "RenderLayer.h"
     44#include "RenderLayoutState.h"
    4545#include "RenderLineBreak.h"
    4646#include "RenderListItem.h"
    … …  
    38433843
    38443844        // FIXME: This is a hack to always make sure we have a page logical height, if said height
    3845         // is known. The page logical height thing in LayoutState is meaningless for flow
     3845        // is known. The page logical height thing in RenderLayoutState is meaningless for flow
    38463846        // thread-based pagination (page height isn't necessarily uniform throughout the flow
    38473847        // thread), but as long as it is used universally as a means to determine whether page

  • trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

    r238504 r238963  
    3434#include "InlineTextBox.h"
    3535#include "InlineTextBoxStyle.h"
    36 #include "LayoutState.h"
    3736#include "LineLayoutState.h"
    3837#include "Logging.h"
    … …  
    4039#include "RenderFragmentContainer.h"
    4140#include "RenderFragmentedFlow.h"
     41#include "RenderLayoutState.h"
    4242#include "RenderLineBreak.h"
    4343#include "RenderRubyBase.h"

  • trunk/Source/WebCore/rendering/RenderBox.cpp

    r238463 r238963  
    4848#include "HitTestResult.h"
    4949#include "InlineElementBox.h"
    50 #include "LayoutState.h"
    5150#include "Page.h"
    5251#include "PaintInfo.h"
    … …  
    6261#include "RenderLayer.h"
    6362#include "RenderLayerCompositor.h"
     63#include "RenderLayoutState.h"
    6464#include "RenderMultiColumnFlow.h"
    6565#include "RenderTableCell.h"

  • trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp

    r237266 r238963  
    4343#include "HTMLPlugInElement.h"
    4444#include "HitTestResult.h"
    45 #include "LayoutState.h"
    4645#include "LocalizedStrings.h"
    4746#include "MouseEvent.h"
    … …  
    5150#include "PlatformMouseEvent.h"
    5251#include "PluginViewBase.h"
     52#include "RenderLayoutState.h"
    5353#include "RenderTheme.h"
    5454#include "RenderView.h"

  • trunk/Source/WebCore/rendering/RenderFragmentedFlow.cpp

    r238463 r238963  
    3434#include "HitTestResult.h"
    3535#include "InlineElementBox.h"
    36 #include "LayoutState.h"
    3736#include "Node.h"
    3837#include "PODIntervalTree.h"
    … …  
    4241#include "RenderLayer.h"
    4342#include "RenderLayerCompositor.h"
     43#include "RenderLayoutState.h"
    4444#include "RenderTableCell.h"
    4545#include "RenderTableSection.h"

  • trunk/Source/WebCore/rendering/RenderGrid.cpp

    r238551 r238963  
    3333#include "GridTrackSizingAlgorithm.h"
    3434#include "LayoutRepainter.h"
    35 #include "LayoutState.h"
    3635#include "RenderChildIterator.h"
    3736#include "RenderLayer.h"
     37#include "RenderLayoutState.h"
    3838#include "RenderTreeBuilder.h"
    3939#include "RenderView.h"

  • trunk/Source/WebCore/rendering/RenderImage.cpp

    r238566 r238963  
    4646#include "HitTestResult.h"
    4747#include "InlineElementBox.h"
    48 #include "LayoutState.h"
    4948#include "Page.h"
    5049#include "PaintInfo.h"
    5150#include "RenderFragmentedFlow.h"
    5251#include "RenderImageResourceStyleImage.h"
     52#include "RenderLayoutState.h"
    5353#include "RenderTheme.h"
    5454#include "RenderView.h"

  • trunk/Source/WebCore/rendering/RenderInline.cpp

    r237266 r238963  
    3131#include "InlineElementBox.h"
    3232#include "InlineTextBox.h"
    33 #include "LayoutState.h"
    3433#include "RenderBlock.h"
    3534#include "RenderChildIterator.h"
    … …  
    3938#include "RenderIterator.h"
    4039#include "RenderLayer.h"
     40#include "RenderLayoutState.h"
    4141#include "RenderLineBreak.h"
    4242#include "RenderListMarker.h"

  • trunk/Source/WebCore/rendering/RenderLayoutState.cpp

    r238962 r238963  
    2525
    2626#include "config.h"
    27 #include "LayoutState.h"
     27#include "RenderLayoutState.h"
    2828
    2929#include "RenderFragmentedFlow.h"
    … …  
    3636namespace WebCore {
    3737
    38 LayoutState::LayoutState(RenderElement& renderer, IsPaginated isPaginated)
     38RenderLayoutState::RenderLayoutState(RenderElement& renderer, IsPaginated isPaginated)
    3939    : m_clipped(false)
    4040    , m_isPaginated(isPaginated == IsPaginated::Yes)
    … …  
    6565}
    6666
    67 LayoutState::LayoutState(const FrameViewLayoutContext::LayoutStateStack& layoutStateStack, RenderBox& renderer, const LayoutSize& offset, LayoutUnit pageLogicalHeight, bool pageLogicalHeightChanged)
     67RenderLayoutState::RenderLayoutState(const FrameViewLayoutContext::LayoutStateStack& layoutStateStack, RenderBox& renderer, const LayoutSize& offset, LayoutUnit pageLogicalHeight, bool pageLogicalHeightChanged)
    6868    : m_clipped(false)
    6969    , m_isPaginated(false)
    … …  
    8585}
    8686
    87 void LayoutState::computeOffsets(const LayoutState& ancestor, RenderBox& renderer, LayoutSize offset)
     87void RenderLayoutState::computeOffsets(const RenderLayoutState& ancestor, RenderBox& renderer, LayoutSize offset)
    8888{
    8989    bool fixed = renderer.isFixedPositioned();
    … …  
    116116}
    117117
    118 void LayoutState::computeClipRect(const LayoutState& ancestor, RenderBox& renderer)
     118void RenderLayoutState::computeClipRect(const RenderLayoutState& ancestor, RenderBox& renderer)
    119119{
    120120    m_clipped = !renderer.isFixedPositioned() && ancestor.isClipped();
    … …  
    134134}
    135135
    136 void LayoutState::computePaginationInformation(const FrameViewLayoutContext::LayoutStateStack& layoutStateStack, RenderBox& renderer, LayoutUnit pageLogicalHeight, bool pageLogicalHeightChanged)
     136void RenderLayoutState::computePaginationInformation(const FrameViewLayoutContext::LayoutStateStack& layoutStateStack, RenderBox& renderer, LayoutUnit pageLogicalHeight, bool pageLogicalHeightChanged)
    137137{
    138138    auto* ancestor = layoutStateStack.isEmpty() ? nullptr : layoutStateStack.last().get();
    … …  
    171171}
    172172
    173 LayoutUnit LayoutState::pageLogicalOffset(RenderBox* child, LayoutUnit childLogicalOffset) const
     173LayoutUnit RenderLayoutState::pageLogicalOffset(RenderBox* child, LayoutUnit childLogicalOffset) const
    174174{
    175175    if (child->isHorizontalWritingMode())
    … …  
    178178}
    179179
    180 void LayoutState::computeLineGridPaginationOrigin(const RenderMultiColumnFlow& multicol)
     180void RenderLayoutState::computeLineGridPaginationOrigin(const RenderMultiColumnFlow& multicol)
    181181{
    182182    if (!isPaginated() || !pageLogicalHeight())
    … …  
    219219}
    220220
    221 void LayoutState::propagateLineGridInfo(const LayoutState& ancestor, RenderBox& renderer)
     221void RenderLayoutState::propagateLineGridInfo(const RenderLayoutState& ancestor, RenderBox& renderer)
    222222{
    223223    // Disable line grids for objects we don't support. For now this includes overflow:scroll/auto, inline blocks and
    … …  
    231231}
    232232
    233 void LayoutState::establishLineGrid(const FrameViewLayoutContext::LayoutStateStack& layoutStateStack, RenderBlockFlow& renderer)
     233void RenderLayoutState::establishLineGrid(const FrameViewLayoutContext::LayoutStateStack& layoutStateStack, RenderBlockFlow& renderer)
    234234{
    235235    // First check to see if this grid has been established already.
    … …  
    258258}
    259259
    260 void LayoutState::addLayoutDelta(LayoutSize delta)
     260void RenderLayoutState::addLayoutDelta(LayoutSize delta)
    261261{
    262262    m_layoutDelta += delta;
    … …  
    268268
    269269#if !ASSERT_DISABLED
    270 bool LayoutState::layoutDeltaMatches(LayoutSize delta) const
     270bool RenderLayoutState::layoutDeltaMatches(LayoutSize delta) const
    271271{
    272272    return (delta.width() == m_layoutDelta.width() || m_layoutDeltaXSaturated) && (delta.height() == m_layoutDelta.height() || m_layoutDeltaYSaturated);

  • trunk/Source/WebCore/rendering/RenderLayoutState.h

    r238962 r238963  
    3939class RenderObject;
    4040
    41 class LayoutState {
    42     WTF_MAKE_NONCOPYABLE(LayoutState); WTF_MAKE_FAST_ALLOCATED;
     41class RenderLayoutState {
     42    WTF_MAKE_NONCOPYABLE(RenderLayoutState); WTF_MAKE_FAST_ALLOCATED;
    4343
    4444public:
    45     LayoutState()
     45    RenderLayoutState()
    4646        : m_clipped(false)
    4747        , m_isPaginated(false)
    … …  
    5353    {
    5454    }
    55     LayoutState(const FrameViewLayoutContext::LayoutStateStack&, RenderBox&, const LayoutSize& offset, LayoutUnit pageHeight, bool pageHeightChanged);
     55    RenderLayoutState(const FrameViewLayoutContext::LayoutStateStack&, RenderBox&, const LayoutSize& offset, LayoutUnit pageHeight, bool pageHeightChanged);
    5656    enum class IsPaginated { No, Yes };
    57     explicit LayoutState(RenderElement&, IsPaginated = IsPaginated::No);
     57    explicit RenderLayoutState(RenderElement&, IsPaginated = IsPaginated::No);
    5858
    5959    bool isPaginated() const { return m_isPaginated; }
    … …  
    9090
    9191private:
    92     void computeOffsets(const LayoutState& ancestor, RenderBox&, LayoutSize offset);
    93     void computeClipRect(const LayoutState& ancestor, RenderBox&);
     92    void computeOffsets(const RenderLayoutState& ancestor, RenderBox&, LayoutSize offset);
     93    void computeClipRect(const RenderLayoutState& ancestor, RenderBox&);
    9494    // FIXME: webkit.org/b/179440 these functions should be part of the pagination code/FrameViewLayoutContext.
    9595    void computePaginationInformation(const FrameViewLayoutContext::LayoutStateStack&, RenderBox&, LayoutUnit pageLogicalHeight, bool pageLogicalHeightChanged);
    96     void propagateLineGridInfo(const LayoutState& ancestor, RenderBox&);
     96    void propagateLineGridInfo(const RenderLayoutState& ancestor, RenderBox&);
    9797    void establishLineGrid(const FrameViewLayoutContext::LayoutStateStack&, RenderBlockFlow&);
    9898    void computeLineGridPaginationOrigin(const RenderMultiColumnFlow&);

  • trunk/Source/WebCore/rendering/RenderListBox.cpp

    r238001 r238963  
    4747#include "HTMLSelectElement.h"
    4848#include "HitTestResult.h"
    49 #include "LayoutState.h"
    5049#include "NodeRenderStyle.h"
    5150#include "Page.h"
    5251#include "PaintInfo.h"
    5352#include "RenderLayer.h"
     53#include "RenderLayoutState.h"
    5454#include "RenderScrollbar.h"
    5555#include "RenderText.h"

  • trunk/Source/WebCore/rendering/RenderMediaControlElements.cpp

    r232178 r238963  
    3131#include "RenderMediaControlElements.h"
    3232
    33 #include "LayoutState.h"
    3433#include "MediaControlElements.h"
     34#include "RenderLayoutState.h"
    3535#include "RenderTheme.h"
    3636#include "RenderView.h"

  • trunk/Source/WebCore/rendering/RenderMultiColumnFlow.cpp

    r238463 r238963  
    2828
    2929#include "HitTestResult.h"
    30 #include "LayoutState.h"
    3130#include "RenderIterator.h"
     31#include "RenderLayoutState.h"
    3232#include "RenderMultiColumnSet.h"
    3333#include "RenderMultiColumnSpannerPlaceholder.h"

  • trunk/Source/WebCore/rendering/RenderTable.cpp

    r238463 r238963  
    3636#include "HTMLTableElement.h"
    3737#include "LayoutRepainter.h"
    38 #include "LayoutState.h"
    3938#include "RenderBlockFlow.h"
    4039#include "RenderChildIterator.h"
    … …  
    4241#include "RenderIterator.h"
    4342#include "RenderLayer.h"
     43#include "RenderLayoutState.h"
    4444#include "RenderTableCaption.h"
    4545#include "RenderTableCell.h"

  • trunk/Source/WebCore/rendering/RenderTableRow.cpp

    r234619 r238963  
    2929#include "HTMLNames.h"
    3030#include "HitTestResult.h"
    31 #include "LayoutState.h"
    3231#include "PaintInfo.h"
     32#include "RenderLayoutState.h"
    3333#include "RenderTableCell.h"
    3434#include "RenderTreeBuilder.h"

  • trunk/Source/WebCore/rendering/RenderTableSection.cpp

    r238463 r238963  
    2929#include "HitTestResult.h"
    3030#include "HTMLNames.h"
    31 #include "LayoutState.h"
    3231#include "PaintInfo.h"
    3332#include "RenderChildIterator.h"
     33#include "RenderLayoutState.h"
    3434#include "RenderTableCell.h"
    3535#include "RenderTableCol.h"

  • trunk/Source/WebCore/rendering/RenderVTTCue.cpp

    r224546 r238963  
    3030#include "RenderVTTCue.h"
    3131
    32 #include "LayoutState.h"
    3332#include "RenderInline.h"
     33#include "RenderLayoutState.h"
    3434#include "RenderView.h"
    3535#include "TextTrackCueGeneric.h"

  • trunk/Source/WebCore/rendering/RenderView.cpp

    r238463 r238963  
    3535#include "HitTestResult.h"
    3636#include "ImageQualityController.h"
    37 #include "LayoutState.h"
    3837#include "NodeTraversal.h"
    3938#include "Page.h"
    … …  
    4443#include "RenderLayerBacking.h"
    4544#include "RenderLayerCompositor.h"
     45#include "RenderLayoutState.h"
    4646#include "RenderMultiColumnFlow.h"
    4747#include "RenderMultiColumnSet.h"

  • trunk/Source/WebCore/rendering/RenderView.h

    r237255 r238963  
    3434
    3535class ImageQualityController;
    36 class LayoutState;
    3736class RenderLayerCompositor;
     37class RenderLayoutState;
    3838class RenderQuote;
    3939
    … …  
    211211    void flushAccumulatedRepaintRegion() const;
    212212
    213     void layoutContent(const LayoutState&);
     213    void layoutContent(const RenderLayoutState&);
    214214
    215215    bool isScrollableOrRubberbandableBox() const override;

  • trunk/Source/WebCore/rendering/RootInlineBox.cpp

    r238359 r238963  
    3030#include "HitTestResult.h"
    3131#include "InlineTextBox.h"
    32 #include "LayoutState.h"
    3332#include "LogicalSelectionOffsetCaches.h"
    3433#include "PaintInfo.h"
    3534#include "RenderFragmentedFlow.h"
    3635#include "RenderInline.h"
     36#include "RenderLayoutState.h"
    3737#include "RenderRubyBase.h"
    3838#include "RenderRubyRun.h"

  • trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp

    r238071 r238963  
    2929#include "HitTestResult.h"
    3030#include "LayoutRepainter.h"
    31 #include "LayoutState.h"
    3231#include "Page.h"
    3332#include "RenderIterator.h"
    3433#include "RenderLayer.h"
     34#include "RenderLayoutState.h"
    3535#include "RenderSVGResource.h"
    3636#include "RenderSVGResourceContainer.h"
    … …  
    146146    m_resourcesNeedingToInvalidateClients.clear();
    147147
    148     // Arbitrary affine transforms are incompatible with LayoutState.
     148    // Arbitrary affine transforms are incompatible with RenderLayoutState.
    149149    LayoutStateDisabler layoutStateDisabler(view().frameView().layoutContext());
    150150
Note: See TracChangeset for help on using the changeset viewer.