Changeset 113514 in webkit
- Timestamp:
- Apr 6, 2012 3:55:45 PM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r113513 r113514 1 2012-04-06 Simon Fraser <simon.fraser@apple.com> 2 3 Rename paintingGoesToWindow() to paintsIntoWindow() 4 https://bugs.webkit.org/show_bug.cgi?id=83406 5 6 Reviewed by Dirk Schulze. 7 8 Rename paintingGoesToWindow() to paintsIntoWindow() to be consistent 9 with some future refactoring. 10 11 * rendering/RenderLayer.cpp: 12 (WebCore::RenderLayer::setFilterBackendNeedsRepaintingInRect): 13 (WebCore::RenderLayer::paintLayer): 14 (WebCore::RenderLayer::paintsWithTransform): 15 (WebCore::RenderLayer::setBackingNeedsRepaint): 16 (WebCore::RenderLayer::setBackingNeedsRepaintInRect): 17 * rendering/RenderLayerBacking.cpp: 18 (WebCore::RenderLayerBacking::containsPaintedContent): 19 (WebCore::RenderLayerBacking::paintsIntoWindow): 20 (WebCore::RenderLayerBacking::paintIntoLayer): 21 * rendering/RenderLayerBacking.h: 22 (RenderLayerBacking): 23 * rendering/RenderLayerCompositor.cpp: 24 (WebCore::RenderLayerCompositor::rootLayerAttachmentChanged): 25 * rendering/RenderObject.cpp: 26 (WebCore::RenderObject::repaintUsingContainer): 27 * rendering/RenderView.cpp: 28 (WebCore::RenderView::paintBoxDecorations): 29 1 30 2012-04-06 James Simonsen <simonjam@chromium.org> 2 31 -
trunk/Source/WebCore/rendering/RenderLayer.cpp
r113335 r113514 1011 1011 #if USE(ACCELERATED_COMPOSITING) 1012 1012 if (parentLayer->isComposited()) { 1013 if (!parentLayer->backing()->paint ingGoesToWindow()) {1013 if (!parentLayer->backing()->paintsIntoWindow()) { 1014 1014 parentLayer->setBackingNeedsRepaintInRect(parentLayerRect); 1015 1015 return; … … 2856 2856 if (context->updatingControlTints() || (paintBehavior & PaintBehaviorFlattenCompositingLayers)) 2857 2857 paintFlags |= PaintLayerTemporaryClipRects; 2858 else if (!backing()->paint ingGoesToWindow() && !shouldDoSoftwarePaint(this, paintFlags & PaintLayerPaintingReflection)) {2858 else if (!backing()->paintsIntoWindow() && !shouldDoSoftwarePaint(this, paintFlags & PaintLayerPaintingReflection)) { 2859 2859 // If this RenderLayer should paint into its backing, that will be done via RenderLayerBacking::paintIntoLayer(). 2860 2860 return; … … 4271 4271 { 4272 4272 #if USE(ACCELERATED_COMPOSITING) 4273 bool paintsToWindow = !isComposited() || backing()->paint ingGoesToWindow();4273 bool paintsToWindow = !isComposited() || backing()->paintsIntoWindow(); 4274 4274 #else 4275 4275 bool paintsToWindow = true; … … 4551 4551 { 4552 4552 ASSERT(isComposited()); 4553 if (backing()->paint ingGoesToWindow()) {4553 if (backing()->paintsIntoWindow()) { 4554 4554 // If we're trying to repaint the placeholder document layer, propagate the 4555 4555 // repaint to the native view system. … … 4566 4566 // so assert but check that the layer is composited. 4567 4567 ASSERT(isComposited()); 4568 if (!isComposited() || backing()->paint ingGoesToWindow()) {4568 if (!isComposited() || backing()->paintsIntoWindow()) { 4569 4569 // If we're trying to repaint the placeholder document layer, propagate the 4570 4570 // repaint to the native view system. -
trunk/Source/WebCore/rendering/RenderLayerBacking.cpp
r113335 r113514 938 938 bool RenderLayerBacking::containsPaintedContent() const 939 939 { 940 if (isSimpleContainerCompositingLayer() || paint ingGoesToWindow() || m_artificiallyInflatedBounds || m_owningLayer->isReflection())940 if (isSimpleContainerCompositingLayer() || paintsIntoWindow() || m_artificiallyInflatedBounds || m_owningLayer->isReflection()) 941 941 return false; 942 942 … … 1077 1077 } 1078 1078 1079 bool RenderLayerBacking::paint ingGoesToWindow() const1079 bool RenderLayerBacking::paintsIntoWindow() const 1080 1080 { 1081 1081 if (m_usingTiledCacheLayer) … … 1133 1133 RenderObject* paintingRoot) 1134 1134 { 1135 if (paint ingGoesToWindow()) {1135 if (paintsIntoWindow()) { 1136 1136 ASSERT_NOT_REACHED(); 1137 1137 return; -
trunk/Source/WebCore/rendering/RenderLayerBacking.h
r113281 r113514 96 96 // This returns false for other layers, and when the document layer actually needs to paint into its backing store 97 97 // for some reason. 98 bool paint ingGoesToWindow() const;98 bool paintsIntoWindow() const; 99 99 100 100 void setContentsNeedDisplay(); -
trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp
r113335 r113514 2043 2043 void RenderLayerCompositor::rootLayerAttachmentChanged() 2044 2044 { 2045 // The attachment can affect whether the RenderView layer's paint ingGoesToWindow() behavior,2045 // The attachment can affect whether the RenderView layer's paintsIntoWindow() behavior, 2046 2046 // so call updateGraphicsLayerGeometry() to udpate that. 2047 2047 RenderLayer* layer = m_renderView->layer(); -
trunk/Source/WebCore/rendering/RenderObject.cpp
r113491 r113514 1315 1315 ASSERT(repaintContainer == v); 1316 1316 bool viewHasCompositedLayer = v->hasLayer() && v->layer()->isComposited(); 1317 if (!viewHasCompositedLayer || v->layer()->backing()->paint ingGoesToWindow()) {1317 if (!viewHasCompositedLayer || v->layer()->backing()->paintsIntoWindow()) { 1318 1318 LayoutRect repaintRectangle = r; 1319 1319 if (viewHasCompositedLayer && v->layer()->transform()) -
trunk/Source/WebCore/rendering/RenderView.cpp
r113487 r113514 253 253 #if USE(ACCELERATED_COMPOSITING) 254 254 if (RenderLayer* compositingLayer = layer->enclosingCompositingLayer()) { 255 if (!compositingLayer->backing()->paint ingGoesToWindow()) {255 if (!compositingLayer->backing()->paintsIntoWindow()) { 256 256 frameView()->setCannotBlitToWindow(); 257 257 break;
Note: See TracChangeset
for help on using the changeset viewer.