Ignore:
Timestamp:
06/25/09 19:31:23 (5 years ago)
Author:
barraclough@apple.com
Message:

Merged r44960:45000 into nitro-extreme branch.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/nitro-extreme/WebCore/rendering/RenderLayer.cpp

    r45225 r45238  
    311311 
    312312#if USE(ACCELERATED_COMPOSITING) 
    313     if (!parent()) 
    314         compositor()->updateRootLayerPosition(); 
    315  
    316313    if (isComposited()) 
    317314        backing()->updateAfterLayout(); 
     
    19401937{ 
    19411938#if USE(ACCELERATED_COMPOSITING) 
    1942     // Composited RenderLayers are painted via the backing's paintIntoLayer(). 
    1943     if (isComposited() && !backing()->paintingGoesToWindow()) 
    1944         return; 
     1939    if (isComposited()) { 
     1940        // The updatingControlTints() painting pass goes through compositing layers, 
     1941        // but we need to ensure that we don't cache clip rects computed with the wrong root in this case. 
     1942        if (p->updatingControlTints()) 
     1943            temporaryClipRects = true; 
     1944        else if (!backing()->paintingGoesToWindow()) { 
     1945            // If this RenderLayer should paint into its backing, that will be done via RenderLayerBacking::paintIntoLayer(). 
     1946            return; 
     1947        } 
     1948    } 
    19451949#endif 
    19461950 
     
    23022306        if (isComposited()) { 
    23032307            // It doesn't make sense to project hitTestRect into the plane of this layer, so use the same bounds we use for painting. 
    2304             localHitTestRect = compositor()->calculateCompositedBounds(this, this); 
     2308            localHitTestRect = backing()->compositedBounds(); 
    23052309        } else 
    23062310#endif 
Note: See TracChangeset for help on using the changeset viewer.