Changeset 150355 in webkit


Ignore:
Timestamp:
May 19, 2013 3:52:34 PM (11 years ago)
Author:
Simon Fraser
Message:

Change the terminology used by rendering code when painting a given node and its children from "paintingRoot" to "subtreePaintRoot"
​https://bugs.webkit.org/show_bug.cgi?id=116417

Reviewed by Sam Weinig.

PaintInfo and RenderLayer code referred to a "paintingRoot". This is only set when
FrameView::setNodeToDraw() has been called and is used to restrict painting to
some part of the subtree, but it could easily be misinterpreted, and confused with
the "rootLayer" used by RenderLayer (which is usually not the layer associated with
the paintingRoot).

Change the terminology from "paintingRoot" to "subtreePaintRoot" root to make the
purpose of this variable more obvious.

No behavior change.

  • page/FrameView.cpp: Add a comment for setNodeToDraw(); in future this should

be called setSubtreePaintRoot() or something. Not done in this patch to avoid
risk; this function is exported from WebCore.

  • rendering/InlineFlowBox.cpp:

(WebCore::InlineFlowBox::paint):

  • rendering/PaintInfo.h:

(WebCore::PaintInfo::PaintInfo):
(WebCore::PaintInfo::updateSubtreePaintRootForChildren):
(WebCore::PaintInfo::shouldPaintWithinRoot):

  • rendering/RenderBlock.cpp:

(WebCore::RenderBlock::paintContents):

  • rendering/RenderBox.cpp:

(WebCore::RenderBox::paint):

  • rendering/RenderLayer.cpp:

(WebCore::RenderLayer::paint):
(WebCore::RenderLayer::paintOverlayScrollbars):
(WebCore::RenderLayer::paintLayerContents):
(WebCore::RenderLayer::paintLayerByApplyingTransform):
(WebCore::RenderLayer::paintBackgroundForFragments):
(WebCore::RenderLayer::paintForegroundForFragments):
(WebCore::RenderLayer::paintForegroundForFragmentsWithPhase):
(WebCore::RenderLayer::paintOutlineForFragments):
(WebCore::RenderLayer::paintMaskForFragments):

  • rendering/RenderLayer.h:

(WebCore::RenderLayer::LayerPaintingInfo::LayerPaintingInfo):

  • rendering/RenderObject.cpp: Add a comment to recommend changing the name of

paintingRootRect() to refer to a subtree paint. Not done in this patch to avoid
risk; this function is exported from WebCore.

  • rendering/RenderSnapshottedPlugIn.cpp:

(WebCore::RenderSnapshottedPlugIn::paint):

  • rendering/RenderTable.cpp:

(WebCore::RenderTable::paintObject):

  • rendering/svg/RenderSVGContainer.cpp:

(WebCore::RenderSVGContainer::paint):

Location:
trunk/Source/WebCore
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r150354 r150355  
     12013-05-19  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Change the terminology used by rendering code when painting a given node and its children from "paintingRoot" to "subtreePaintRoot"
     4        https://bugs.webkit.org/show_bug.cgi?id=116417
     5
     6        Reviewed by Sam Weinig.
     7       
     8        PaintInfo and RenderLayer code referred to a "paintingRoot". This is only set when
     9        FrameView::setNodeToDraw() has been called and is used to restrict painting to
     10        some part of the subtree, but it could easily be misinterpreted, and confused with
     11        the "rootLayer" used by RenderLayer (which is usually not the layer associated with
     12        the paintingRoot).
     13       
     14        Change the terminology from "paintingRoot" to "subtreePaintRoot" root to make the
     15        purpose of this variable more obvious.
     16
     17        No behavior change.
     18
     19        * page/FrameView.cpp: Add a comment for setNodeToDraw(); in future this should
     20        be called setSubtreePaintRoot() or something. Not done in this patch to avoid
     21        risk; this function is exported from WebCore.
     22        * rendering/InlineFlowBox.cpp:
     23        (WebCore::InlineFlowBox::paint):
     24        * rendering/PaintInfo.h:
     25        (WebCore::PaintInfo::PaintInfo):
     26        (WebCore::PaintInfo::updateSubtreePaintRootForChildren):
     27        (WebCore::PaintInfo::shouldPaintWithinRoot):
     28        * rendering/RenderBlock.cpp:
     29        (WebCore::RenderBlock::paintContents):
     30        * rendering/RenderBox.cpp:
     31        (WebCore::RenderBox::paint):
     32        * rendering/RenderLayer.cpp:
     33        (WebCore::RenderLayer::paint):
     34        (WebCore::RenderLayer::paintOverlayScrollbars):
     35        (WebCore::RenderLayer::paintLayerContents):
     36        (WebCore::RenderLayer::paintLayerByApplyingTransform):
     37        (WebCore::RenderLayer::paintBackgroundForFragments):
     38        (WebCore::RenderLayer::paintForegroundForFragments):
     39        (WebCore::RenderLayer::paintForegroundForFragmentsWithPhase):
     40        (WebCore::RenderLayer::paintOutlineForFragments):
     41        (WebCore::RenderLayer::paintMaskForFragments):
     42        * rendering/RenderLayer.h:
     43        (WebCore::RenderLayer::LayerPaintingInfo::LayerPaintingInfo):
     44        * rendering/RenderObject.cpp: Add a comment to recommend changing the name of
     45        paintingRootRect() to refer to a subtree paint. Not done in this patch to avoid
     46        risk; this function is exported from WebCore.
     47        * rendering/RenderSnapshottedPlugIn.cpp:
     48        (WebCore::RenderSnapshottedPlugIn::paint):
     49        * rendering/RenderTable.cpp:
     50        (WebCore::RenderTable::paintObject):
     51        * rendering/svg/RenderSVGContainer.cpp:
     52        (WebCore::RenderSVGContainer::paint):
     53
    1542013-05-19  Darin Adler  <darin@apple.com>
    255

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

    r150307 r150355  
    35823582}
    35833583
     3584// FIXME: change this to use the subtreePaint terminology.
    35843585void FrameView::setNodeToDraw(Node* node)
    35853586{

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

    r150258 r150355  
    11421142    PaintInfo childInfo(paintInfo);
    11431143    childInfo.phase = paintPhase;
    1144     childInfo.updatePaintingRootForChildren(renderer());
     1144    childInfo.updateSubtreePaintRootForChildren(renderer());
    11451145   
    11461146    // Paint our children.

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

    r144350 r150355  
    5555struct PaintInfo {
    5656    PaintInfo(GraphicsContext* newContext, const IntRect& newRect, PaintPhase newPhase, PaintBehavior newPaintBehavior,
    57         RenderObject* newPaintingRoot = 0, RenderRegion* region = 0, ListHashSet<RenderInline*>* newOutlineObjects = 0,
     57        RenderObject* newSubtreePaintRoot = 0, RenderRegion* region = 0, ListHashSet<RenderInline*>* newOutlineObjects = 0,
    5858        OverlapTestRequestMap* overlapTestRequests = 0, const RenderLayerModelObject* newPaintContainer = 0)
    5959        : context(newContext)
    … …  
    6161        , phase(newPhase)
    6262        , paintBehavior(newPaintBehavior)
    63         , paintingRoot(newPaintingRoot)
     63        , subtreePaintRoot(newSubtreePaintRoot)
    6464        , renderRegion(region)
    6565        , outlineObjects(newOutlineObjects)
    … …  
    6969    }
    7070
    71     void updatePaintingRootForChildren(const RenderObject* renderer)
     71    void updateSubtreePaintRootForChildren(const RenderObject* renderer)
    7272    {
    73         if (!paintingRoot)
     73        if (!subtreePaintRoot)
    7474            return;
    7575
    7676        // If we're the painting root, kids draw normally, and see root of 0.
    77         if (paintingRoot == renderer) {
    78             paintingRoot = 0;
     77        if (subtreePaintRoot == renderer) {
     78            subtreePaintRoot = 0;
    7979            return;
    8080        }
    … …  
    8383    bool shouldPaintWithinRoot(const RenderObject* renderer) const
    8484    {
    85         return !paintingRoot || paintingRoot == renderer;
     85        return !subtreePaintRoot || subtreePaintRoot == renderer;
    8686    }
    8787
    … …  
    113113    PaintPhase phase;
    114114    PaintBehavior paintBehavior;
    115     RenderObject* paintingRoot; // used to draw just one element and its visual kids
     115    RenderObject* subtreePaintRoot; // used to draw just one element and its visual children
    116116    RenderRegion* renderRegion;
    117117    ListHashSet<RenderInline*>* outlineObjects; // used to list outlines that should be painted by a block with inline children

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

    r150155 r150355  
    31173117        PaintInfo paintInfoForChild(paintInfo);
    31183118        paintInfoForChild.phase = newPhase;
    3119         paintInfoForChild.updatePaintingRootForChildren(this);
     3119        paintInfoForChild.updateSubtreePaintRootForChildren(this);
    31203120
    31213121        // FIXME: Paint-time pagination is obsolete and is now only used by embedded WebViews inside AppKit

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

    r150259 r150355  
    10311031    // default implementation. Just pass paint through to the children
    10321032    PaintInfo childInfo(paintInfo);
    1033     childInfo.updatePaintingRootForChildren(this);
     1033    childInfo.updateSubtreePaintRootForChildren(this);
    10341034    for (RenderObject* child = firstChild(); child; child = child->nextSibling())
    10351035        child->paint(childInfo, adjustedPaintOffset);

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

    r150349 r150355  
    34723472}
    34733473
    3474 void RenderLayer::paint(GraphicsContext* context, const LayoutRect& damageRect, PaintBehavior paintBehavior, RenderObject* paintingRoot, RenderRegion* region, PaintLayerFlags paintFlags)
     3474void RenderLayer::paint(GraphicsContext* context, const LayoutRect& damageRect, PaintBehavior paintBehavior, RenderObject* subtreePaintRoot, RenderRegion* region, PaintLayerFlags paintFlags)
    34753475{
    34763476    OverlapTestRequestMap overlapTestRequests;
    34773477
    3478     LayerPaintingInfo paintingInfo(this, enclosingIntRect(damageRect), paintBehavior, LayoutSize(), paintingRoot, region, &overlapTestRequests);
     3478    LayerPaintingInfo paintingInfo(this, enclosingIntRect(damageRect), paintBehavior, LayoutSize(), subtreePaintRoot, region, &overlapTestRequests);
    34793479    paintLayer(context, paintingInfo, paintFlags);
    34803480
    … …  
    34843484}
    34853485
    3486 void RenderLayer::paintOverlayScrollbars(GraphicsContext* context, const LayoutRect& damageRect, PaintBehavior paintBehavior, RenderObject* paintingRoot)
     3486void RenderLayer::paintOverlayScrollbars(GraphicsContext* context, const LayoutRect& damageRect, PaintBehavior paintBehavior, RenderObject* subtreePaintRoot)
    34873487{
    34883488    if (!m_containsDirtyOverlayScrollbars)
    34893489        return;
    34903490
    3491     LayerPaintingInfo paintingInfo(this, enclosingIntRect(damageRect), paintBehavior, LayoutSize(), paintingRoot);
     3491    LayerPaintingInfo paintingInfo(this, enclosingIntRect(damageRect), paintBehavior, LayoutSize(), subtreePaintRoot);
    34923492    paintLayer(context, paintingInfo, PaintLayerPaintingOverlayScrollbars);
    34933493
    … …  
    38723872#endif
    38733873
    3874     // If this layer's renderer is a child of the paintingRoot, we render unconditionally, which
    3875     // is done by passing a nil paintingRoot down to our renderer (as if no paintingRoot was ever set).
    3876     // Else, our renderer tree may or may not contain the painting root, so we pass that root along
     3874    // If this layer's renderer is a child of the subtreePaintRoot, we render unconditionally, which
     3875    // is done by passing a nil subtreePaintRoot down to our renderer (as if no subtreePaintRoot was ever set).
     3876    // Otherwise, our renderer tree may or may not contain the subtreePaintRoot root, so we pass that root along
    38773877    // so it will be tested against as we descend through the renderers.
    3878     RenderObject* paintingRootForRenderer = 0;
    3879     if (localPaintingInfo.paintingRoot && !renderer()->isDescendantOf(localPaintingInfo.paintingRoot))
    3880         paintingRootForRenderer = localPaintingInfo.paintingRoot;
     3878    RenderObject* subtreePaintRootForRenderer = 0;
     3879    if (localPaintingInfo.subtreePaintRoot && !renderer()->isDescendantOf(localPaintingInfo.subtreePaintRoot))
     3880        subtreePaintRootForRenderer = localPaintingInfo.subtreePaintRoot;
    38813881
    38823882    if (localPaintingInfo.overlapTestRequests && isSelfPaintingLayer)
    … …  
    39063906        if (shouldPaintContent && !selectionOnly)
    39073907            paintBackgroundForFragments(layerFragments, context, transparencyLayerContext, paintingInfo.paintDirtyRect, haveTransparency,
    3908                 localPaintingInfo, paintBehavior, paintingRootForRenderer);
     3908                localPaintingInfo, paintBehavior, subtreePaintRootForRenderer);
    39093909    }
    39103910
    … …  
    39163916        if (shouldPaintContent)
    39173917            paintForegroundForFragments(layerFragments, context, transparencyLayerContext, paintingInfo.paintDirtyRect, haveTransparency,
    3918                 localPaintingInfo, paintBehavior, paintingRootForRenderer, selectionOnly, forceBlackText);
     3918                localPaintingInfo, paintBehavior, subtreePaintRootForRenderer, selectionOnly, forceBlackText);
    39193919    }
    39203920
    39213921    if (shouldPaintOutline)
    3922         paintOutlineForFragments(layerFragments, context, localPaintingInfo, paintBehavior, paintingRootForRenderer);
     3922        paintOutlineForFragments(layerFragments, context, localPaintingInfo, paintBehavior, subtreePaintRootForRenderer);
    39233923
    39243924    if (isPaintingCompositedForeground) {
    … …  
    39453945    if ((localPaintFlags & PaintLayerPaintingCompositingMaskPhase) && shouldPaintContent && renderer()->hasMask() && !selectionOnly) {
    39463946        // Paint the mask for the fragments.
    3947         paintMaskForFragments(layerFragments, context, localPaintingInfo, paintingRootForRenderer);
     3947        paintMaskForFragments(layerFragments, context, localPaintingInfo, subtreePaintRootForRenderer);
    39483948    }
    39493949
    … …  
    39813981    // Now do a paint with the root layer shifted to be us.
    39823982    LayerPaintingInfo transformedPaintingInfo(this, enclosingIntRect(transform.inverse().mapRect(paintingInfo.paintDirtyRect)), paintingInfo.paintBehavior,
    3983         adjustedSubPixelAccumulation, paintingInfo.paintingRoot, paintingInfo.region, paintingInfo.overlapTestRequests);
     3983        adjustedSubPixelAccumulation, paintingInfo.subtreePaintRoot, paintingInfo.region, paintingInfo.overlapTestRequests);
    39843984    paintLayerContentsAndReflection(context, transformedPaintingInfo, paintFlags);
    39853985}
    … …  
    41274127void RenderLayer::paintBackgroundForFragments(const LayerFragments& layerFragments, GraphicsContext* context, GraphicsContext* transparencyLayerContext,
    41284128    const LayoutRect& transparencyPaintDirtyRect, bool haveTransparency, const LayerPaintingInfo& localPaintingInfo, PaintBehavior paintBehavior,
    4129     RenderObject* paintingRootForRenderer)
     4129    RenderObject* subtreePaintRootForRenderer)
    41304130{
    41314131    for (size_t i = 0; i < layerFragments.size(); ++i) {
    … …  
    41464146        // Paint the background.
    41474147        // FIXME: Eventually we will collect the region from the fragment itself instead of just from the paint info.
    4148         PaintInfo paintInfo(context, pixelSnappedIntRect(fragment.backgroundRect.rect()), PaintPhaseBlockBackground, paintBehavior, paintingRootForRenderer, localPaintingInfo.region, 0, 0, localPaintingInfo.rootLayer->renderer());
     4148        PaintInfo paintInfo(context, pixelSnappedIntRect(fragment.backgroundRect.rect()), PaintPhaseBlockBackground, paintBehavior, subtreePaintRootForRenderer, localPaintingInfo.region, 0, 0, localPaintingInfo.rootLayer->renderer());
    41494149        renderer()->paint(paintInfo, toPoint(fragment.layerBounds.location() - renderBoxLocation() + localPaintingInfo.subPixelAccumulation));
    41504150
    … …  
    41564156void RenderLayer::paintForegroundForFragments(const LayerFragments& layerFragments, GraphicsContext* context, GraphicsContext* transparencyLayerContext,
    41574157    const LayoutRect& transparencyPaintDirtyRect, bool haveTransparency, const LayerPaintingInfo& localPaintingInfo, PaintBehavior paintBehavior,
    4158     RenderObject* paintingRootForRenderer, bool selectionOnly, bool forceBlackText)
     4158    RenderObject* subtreePaintRootForRenderer, bool selectionOnly, bool forceBlackText)
    41594159{
    41604160    // Begin transparency if we have something to paint.
    … …  
    41794179    // interleaving of the fragments to work properly.
    41804180    paintForegroundForFragmentsWithPhase(selectionOnly ? PaintPhaseSelection : PaintPhaseChildBlockBackgrounds, layerFragments,
    4181         context, localPaintingInfo, localPaintBehavior, paintingRootForRenderer);
     4181        context, localPaintingInfo, localPaintBehavior, subtreePaintRootForRenderer);
    41824182   
    41834183    if (!selectionOnly) {
    4184         paintForegroundForFragmentsWithPhase(PaintPhaseFloat, layerFragments, context, localPaintingInfo, localPaintBehavior, paintingRootForRenderer);
    4185         paintForegroundForFragmentsWithPhase(PaintPhaseForeground, layerFragments, context, localPaintingInfo, localPaintBehavior, paintingRootForRenderer);
    4186         paintForegroundForFragmentsWithPhase(PaintPhaseChildOutlines, layerFragments, context, localPaintingInfo, localPaintBehavior, paintingRootForRenderer);
     4184        paintForegroundForFragmentsWithPhase(PaintPhaseFloat, layerFragments, context, localPaintingInfo, localPaintBehavior, subtreePaintRootForRenderer);
     4185        paintForegroundForFragmentsWithPhase(PaintPhaseForeground, layerFragments, context, localPaintingInfo, localPaintBehavior, subtreePaintRootForRenderer);
     4186        paintForegroundForFragmentsWithPhase(PaintPhaseChildOutlines, layerFragments, context, localPaintingInfo, localPaintBehavior, subtreePaintRootForRenderer);
    41874187    }
    41884188   
    … …  
    41924192
    41934193void RenderLayer::paintForegroundForFragmentsWithPhase(PaintPhase phase, const LayerFragments& layerFragments, GraphicsContext* context,
    4194     const LayerPaintingInfo& localPaintingInfo, PaintBehavior paintBehavior, RenderObject* paintingRootForRenderer)
     4194    const LayerPaintingInfo& localPaintingInfo, PaintBehavior paintBehavior, RenderObject* subtreePaintRootForRenderer)
    41954195{
    41964196    bool shouldClip = localPaintingInfo.clipToDirtyRect && layerFragments.size() > 1;
    … …  
    42044204            clipToRect(localPaintingInfo.rootLayer, context, localPaintingInfo.paintDirtyRect, fragment.foregroundRect);
    42054205   
    4206         PaintInfo paintInfo(context, pixelSnappedIntRect(fragment.foregroundRect.rect()), phase, paintBehavior, paintingRootForRenderer, localPaintingInfo.region, 0, 0, localPaintingInfo.rootLayer->renderer());
     4206        PaintInfo paintInfo(context, pixelSnappedIntRect(fragment.foregroundRect.rect()), phase, paintBehavior, subtreePaintRootForRenderer, localPaintingInfo.region, 0, 0, localPaintingInfo.rootLayer->renderer());
    42074207        if (phase == PaintPhaseForeground)
    42084208            paintInfo.overlapTestRequests = localPaintingInfo.overlapTestRequests;
    … …  
    42154215
    42164216void RenderLayer::paintOutlineForFragments(const LayerFragments& layerFragments, GraphicsContext* context, const LayerPaintingInfo& localPaintingInfo,
    4217     PaintBehavior paintBehavior, RenderObject* paintingRootForRenderer)
     4217    PaintBehavior paintBehavior, RenderObject* subtreePaintRootForRenderer)
    42184218{
    42194219    for (size_t i = 0; i < layerFragments.size(); ++i) {
    … …  
    42234223   
    42244224        // Paint our own outline
    4225         PaintInfo paintInfo(context, pixelSnappedIntRect(fragment.outlineRect.rect()), PaintPhaseSelfOutline, paintBehavior, paintingRootForRenderer, localPaintingInfo.region, 0, 0, localPaintingInfo.rootLayer->renderer());
     4225        PaintInfo paintInfo(context, pixelSnappedIntRect(fragment.outlineRect.rect()), PaintPhaseSelfOutline, paintBehavior, subtreePaintRootForRenderer, localPaintingInfo.region, 0, 0, localPaintingInfo.rootLayer->renderer());
    42264226        clipToRect(localPaintingInfo.rootLayer, context, localPaintingInfo.paintDirtyRect, fragment.outlineRect, DoNotIncludeSelfForBorderRadius);
    42274227        renderer()->paint(paintInfo, toPoint(fragment.layerBounds.location() - renderBoxLocation() + localPaintingInfo.subPixelAccumulation));
    … …  
    42314231
    42324232void RenderLayer::paintMaskForFragments(const LayerFragments& layerFragments, GraphicsContext* context, const LayerPaintingInfo& localPaintingInfo,
    4233     RenderObject* paintingRootForRenderer)
     4233    RenderObject* subtreePaintRootForRenderer)
    42344234{
    42354235    for (size_t i = 0; i < layerFragments.size(); ++i) {
    … …  
    42434243        // Paint the mask.
    42444244        // FIXME: Eventually we will collect the region from the fragment itself instead of just from the paint info.
    4245         PaintInfo paintInfo(context, pixelSnappedIntRect(fragment.backgroundRect.rect()), PaintPhaseMask, PaintBehaviorNormal, paintingRootForRenderer, localPaintingInfo.region, 0, 0, localPaintingInfo.rootLayer->renderer());
     4245        PaintInfo paintInfo(context, pixelSnappedIntRect(fragment.backgroundRect.rect()), PaintPhaseMask, PaintBehaviorNormal, subtreePaintRootForRenderer, localPaintingInfo.region, 0, 0, localPaintingInfo.rootLayer->renderer());
    42464246        renderer()->paint(paintInfo, toPoint(fragment.layerBounds.location() - renderBoxLocation() + localPaintingInfo.subPixelAccumulation));
    42474247       

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

    r150349 r150355  
    625625    // front.  The hitTest method looks for mouse events by walking
    626626    // layers that intersect the point from front to back.
    627     void paint(GraphicsContext*, const LayoutRect& damageRect, PaintBehavior = PaintBehaviorNormal, RenderObject* paintingRoot = 0,
     627    void paint(GraphicsContext*, const LayoutRect& damageRect, PaintBehavior = PaintBehaviorNormal, RenderObject* subtreePaintRoot = 0,
    628628        RenderRegion* = 0, PaintLayerFlags = 0);
    629629    bool hitTest(const HitTestRequest&, HitTestResult&);
    630630    bool hitTest(const HitTestRequest&, const HitTestLocation&, HitTestResult&);
    631     void paintOverlayScrollbars(GraphicsContext*, const LayoutRect& damageRect, PaintBehavior, RenderObject* paintingRoot = 0);
     631    void paintOverlayScrollbars(GraphicsContext*, const LayoutRect& damageRect, PaintBehavior, RenderObject* subtreePaintRoot = 0);
    632632
    633633    struct ClipRectsContext {
    … …  
    917917
    918918    struct LayerPaintingInfo {
    919         LayerPaintingInfo(RenderLayer* inRootLayer, const LayoutRect& inDirtyRect, PaintBehavior inPaintBehavior, const LayoutSize& inSubPixelAccumulation, RenderObject* inPaintingRoot = 0, RenderRegion*inRegion = 0, OverlapTestRequestMap* inOverlapTestRequests = 0)
     919        LayerPaintingInfo(RenderLayer* inRootLayer, const LayoutRect& inDirtyRect, PaintBehavior inPaintBehavior, const LayoutSize& inSubPixelAccumulation, RenderObject* inSubtreePaintRoot = 0, RenderRegion*inRegion = 0, OverlapTestRequestMap* inOverlapTestRequests = 0)
    920920            : rootLayer(inRootLayer)
    921             , paintingRoot(inPaintingRoot)
     921            , subtreePaintRoot(inSubtreePaintRoot)
    922922            , paintDirtyRect(inDirtyRect)
    923923            , subPixelAccumulation(inSubPixelAccumulation)
    … …  
    928928        { }
    929929        RenderLayer* rootLayer;
    930         RenderObject* paintingRoot; // only paint descendants of this object
     930        RenderObject* subtreePaintRoot; // only paint descendants of this object
    931931        LayoutRect paintDirtyRect; // relative to rootLayer;
    932932        LayoutSize subPixelAccumulation;

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

    r150259 r150355  
    12371237}
    12381238
     1239// FIXME: change this to use the subtreePaint terminology
    12391240LayoutRect RenderObject::paintingRootRect(LayoutRect& topLevelRect)
    12401241{

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

    r149871 r150355  
    102102    PaintInfo paintInfoForChild(paintInfo);
    103103    paintInfoForChild.phase = newPhase;
    104     paintInfoForChild.updatePaintingRootForChildren(this);
     104    paintInfoForChild.updateSubtreePaintRootForChildren(this);
    105105
    106106    for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) {

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

    r149550 r150355  
    654654    PaintInfo info(paintInfo);
    655655    info.phase = paintPhase;
    656     info.updatePaintingRootForChildren(this);
     656    info.updateSubtreePaintRootForChildren(this);
    657657
    658658    for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {

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

    r148536 r150355  
    139139
    140140        if (continueRendering) {
    141             childPaintInfo.updatePaintingRootForChildren(this);
     141            childPaintInfo.updateSubtreePaintRootForChildren(this);
    142142            for (RenderObject* child = firstChild(); child; child = child->nextSibling())
    143143                child->paint(childPaintInfo, IntPoint());
Note: See TracChangeset for help on using the changeset viewer.