Changeset 148765 in webkit
- Timestamp:
- Apr 19, 2013 1:41:23 PM (11 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r148760 r148765 1 2013-04-19 Shawn Singh <shawnsingh@chromium.org> 2 3 Remove non-overlap testing code in RenderLayerCompositor 4 https://bugs.webkit.org/show_bug.cgi?id=85521 5 6 Reviewed by Simon Fraser. 7 8 m_compositingConsultsOverlap is always true in the current 9 code. This patch removes this flag, and removes dead code that is 10 never executed because it was never false. 11 12 No new tests, no change in behavior. The cleanup is covered by 13 existing tests. 14 15 * rendering/RenderLayer.cpp: 16 (WebCore::RenderLayer::updateCompositingLayersAfterScroll): 17 removed if-statement that is always true. 18 19 * rendering/RenderLayerBacking.cpp: 20 (WebCore::RenderLayerBacking::shouldClipCompositedBounds): 21 removed if-statement that would never get triggered. 22 23 * rendering/RenderLayerCompositor.cpp: 24 (WebCore::RenderLayerCompositor::RenderLayerCompositor): 25 (WebCore::RenderLayerCompositor::updateCompositingLayers): 26 removed m_compositingConsultsOverlap, and retained the code as if the flag were "true". 27 28 * rendering/RenderLayerCompositor.h: 29 (RenderLayerCompositor): 30 1 31 2013-04-19 Roger Fong <roger_fong@apple.com> 2 32 -
trunk/Source/WebCore/rendering/RenderLayer.cpp
r148545 r148765 2371 2371 // repositioning, so update compositing layers from there. 2372 2372 if (RenderLayer* compositingAncestor = stackingContainer()->enclosingCompositingLayer()) { 2373 if (compositor()->compositingConsultsOverlap()) { 2374 if (usesCompositedScrolling() && !hasOutOfFlowPositionedDescendant()) 2375 compositor()->updateCompositingLayers(CompositingUpdateOnCompositedScroll, compositingAncestor); 2376 else 2377 compositor()->updateCompositingLayers(CompositingUpdateOnScroll, compositingAncestor); 2378 } else 2379 compositingAncestor->backing()->updateAfterLayout(RenderLayerBacking::IsUpdateRoot); 2373 if (usesCompositedScrolling() && !hasOutOfFlowPositionedDescendant()) 2374 compositor()->updateCompositingLayers(CompositingUpdateOnCompositedScroll, compositingAncestor); 2375 else 2376 compositor()->updateCompositingLayers(CompositingUpdateOnScroll, compositingAncestor); 2380 2377 } 2381 2378 } -
trunk/Source/WebCore/rendering/RenderLayerBacking.cpp
r148748 r148765 420 420 return false; 421 421 422 if (!compositor()->compositingConsultsOverlap())423 return false;424 425 422 if (layerOrAncestorIsTransformedOrUsingCompositedScrolling(m_owningLayer)) 426 423 return false; -
trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp
r148590 r148765 156 156 157 157 struct CompositingState { 158 CompositingState(RenderLayer* compAncestor, bool testOverlap )158 CompositingState(RenderLayer* compAncestor, bool testOverlap = true) 159 159 : m_compositingAncestor(compAncestor) 160 160 , m_subtreeIsCompositing(false) … … 203 203 , m_showRepaintCounter(false) 204 204 , m_acceleratedDrawingEnabled(false) 205 , m_compositingConsultsOverlap(true)206 205 , m_reevaluateCompositingAfterLayout(false) 207 206 , m_compositing(false) … … 513 512 break; 514 513 case CompositingUpdateOnScroll: 515 if (m_compositingConsultsOverlap) 516 checkForHierarchyUpdate = true; // Overlap can change with scrolling, so need to check for hierarchy updates. 514 checkForHierarchyUpdate = true; // Overlap can change with scrolling, so need to check for hierarchy updates. 517 515 518 516 needGeometryUpdate = true; … … 528 526 bool needHierarchyUpdate = m_compositingLayersNeedRebuild; 529 527 bool isFullUpdate = !updateRoot; 530 if (!updateRoot || m_compositingConsultsOverlap) { 531 // Only clear the flag if we're updating the entire hierarchy. 532 m_compositingLayersNeedRebuild = false; 533 updateRoot = rootRenderLayer(); 534 } 528 529 // Only clear the flag if we're updating the entire hierarchy. 530 m_compositingLayersNeedRebuild = false; 531 updateRoot = rootRenderLayer(); 535 532 536 533 if (isFullUpdate && updateType == CompositingUpdateAfterLayout) … … 548 545 // Go through the layers in presentation order, so that we can compute which RenderLayers need compositing layers. 549 546 // FIXME: we could maybe do this and the hierarchy udpate in one pass, but the parenting logic would be more complex. 550 CompositingState compState(updateRoot , m_compositingConsultsOverlap);547 CompositingState compState(updateRoot); 551 548 bool layersChanged = false; 552 549 bool saw3DTransform = false; 553 if (m_compositingConsultsOverlap) { 554 OverlapMap overlapTestRequestMap; 555 computeCompositingRequirements(0, updateRoot, &overlapTestRequestMap, compState, layersChanged, saw3DTransform); 556 } else 557 computeCompositingRequirements(0, updateRoot, 0, compState, layersChanged, saw3DTransform); 558 550 OverlapMap overlapTestRequestMap; 551 computeCompositingRequirements(0, updateRoot, &overlapTestRequestMap, compState, layersChanged, saw3DTransform); 559 552 needHierarchyUpdate |= layersChanged; 560 553 } … … 569 562 Frame* frame = m_renderView->frameView()->frame(); 570 563 bool isMainFrame = !m_renderView->document()->ownerElement(); 571 LOG(Compositing, "\nUpdate %d of %s. Overlap testing is %s\n", m_rootLayerUpdateCount, isMainFrame ? "main frame" : frame->tree()->uniqueName().string().utf8().data(), 572 m_compositingConsultsOverlap ? "on" : "off"); 564 LOG(Compositing, "\nUpdate %d of %s.\n", m_rootLayerUpdateCount, isMainFrame ? "main frame" : frame->tree()->uniqueName().string().utf8().data()); 573 565 } 574 566 #endif -
trunk/Source/WebCore/rendering/RenderLayerCompositor.h
r148564 r148765 120 120 bool compositingLayersNeedRebuild() const { return m_compositingLayersNeedRebuild; } 121 121 122 // Controls whether or not to consult geometry when deciding which layers need123 // to be composited. Defaults to true.124 void setCompositingConsultsOverlap(bool b) { m_compositingConsultsOverlap = b; }125 bool compositingConsultsOverlap() const { return m_compositingConsultsOverlap; }126 127 122 // GraphicsLayers buffer state, which gets pushed to the underlying platform layers 128 123 // at specific times. … … 406 401 bool m_showRepaintCounter; 407 402 bool m_acceleratedDrawingEnabled; 408 bool m_compositingConsultsOverlap;409 403 410 404 // When true, we have to wait until layout has happened before we can decide whether to enter compositing mode,
Note: See TracChangeset
for help on using the changeset viewer.