Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(371)

Side by Side Diff: third_party/WebKit/Source/core/paint/PaintLayer.cpp

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
3 * reserved. 3 * reserved.
4 * 4 *
5 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 5 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
6 * 6 *
7 * Other contributors: 7 * Other contributors:
8 * Robert O'Callahan <roc+@cs.cmu.edu> 8 * Robert O'Callahan <roc+@cs.cmu.edu>
9 * David Baron <dbaron@fas.harvard.edu> 9 * David Baron <dbaron@fas.harvard.edu>
10 * Christian Biesinger <cbiesinger@web.de> 10 * Christian Biesinger <cbiesinger@web.de>
(...skipping 1041 matching lines...) Expand 10 before | Expand all | Expand 10 after
1052 current->m_childNeedsCompositingInputsUpdate = true; 1052 current->m_childNeedsCompositingInputsUpdate = true;
1053 1053
1054 compositor()->setNeedsCompositingUpdate( 1054 compositor()->setNeedsCompositingUpdate(
1055 CompositingUpdateAfterCompositingInputChange); 1055 CompositingUpdateAfterCompositingInputChange);
1056 } 1056 }
1057 1057
1058 void PaintLayer::updateAncestorDependentCompositingInputs( 1058 void PaintLayer::updateAncestorDependentCompositingInputs(
1059 const AncestorDependentCompositingInputs& compositingInputs, 1059 const AncestorDependentCompositingInputs& compositingInputs,
1060 bool hasAncestorWithClipPath) { 1060 bool hasAncestorWithClipPath) {
1061 m_ancestorDependentCompositingInputs = 1061 m_ancestorDependentCompositingInputs =
1062 makeUnique<AncestorDependentCompositingInputs>(compositingInputs); 1062 WTF::makeUnique<AncestorDependentCompositingInputs>(compositingInputs);
1063 m_hasAncestorWithClipPath = hasAncestorWithClipPath; 1063 m_hasAncestorWithClipPath = hasAncestorWithClipPath;
1064 m_needsAncestorDependentCompositingInputsUpdate = false; 1064 m_needsAncestorDependentCompositingInputsUpdate = false;
1065 } 1065 }
1066 1066
1067 void PaintLayer::didUpdateCompositingInputs() { 1067 void PaintLayer::didUpdateCompositingInputs() {
1068 DCHECK(!needsCompositingInputsUpdate()); 1068 DCHECK(!needsCompositingInputsUpdate());
1069 m_childNeedsCompositingInputsUpdate = false; 1069 m_childNeedsCompositingInputsUpdate = false;
1070 if (m_scrollableArea) 1070 if (m_scrollableArea)
1071 m_scrollableArea->updateNeedsCompositedScrolling(); 1071 m_scrollableArea->updateNeedsCompositedScrolling();
1072 } 1072 }
(...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after
1551 // paint it; if it becomes self-painting, it should paint itself and no 1551 // paint it; if it becomes self-painting, it should paint itself and no
1552 // ancestor should paint it. 1552 // ancestor should paint it.
1553 if (wasSelfPaintingLayer != isSelfPaintingLayer() && 1553 if (wasSelfPaintingLayer != isSelfPaintingLayer() &&
1554 m_layoutObject->isFloating()) 1554 m_layoutObject->isFloating())
1555 LayoutBlockFlow::setAncestorShouldPaintFloatingObject(*layoutBox()); 1555 LayoutBlockFlow::setAncestorShouldPaintFloatingObject(*layoutBox());
1556 } 1556 }
1557 1557
1558 void PaintLayer::updateStackingNode() { 1558 void PaintLayer::updateStackingNode() {
1559 DCHECK(!m_stackingNode); 1559 DCHECK(!m_stackingNode);
1560 if (requiresStackingNode()) 1560 if (requiresStackingNode())
1561 m_stackingNode = makeUnique<PaintLayerStackingNode>(this); 1561 m_stackingNode = WTF::makeUnique<PaintLayerStackingNode>(this);
1562 else 1562 else
1563 m_stackingNode = nullptr; 1563 m_stackingNode = nullptr;
1564 } 1564 }
1565 1565
1566 void PaintLayer::updateScrollableArea() { 1566 void PaintLayer::updateScrollableArea() {
1567 DCHECK(!m_scrollableArea); 1567 DCHECK(!m_scrollableArea);
1568 if (requiresScrollableArea()) 1568 if (requiresScrollableArea())
1569 m_scrollableArea = PaintLayerScrollableArea::create(*this); 1569 m_scrollableArea = PaintLayerScrollableArea::create(*this);
1570 } 1570 }
1571 1571
(...skipping 1103 matching lines...) Expand 10 before | Expand all | Expand 10 after
2675 if (m_stackingNode->hasNegativeZOrderList()) 2675 if (m_stackingNode->hasNegativeZOrderList())
2676 location = BackgroundPaintInGraphicsLayer; 2676 location = BackgroundPaintInGraphicsLayer;
2677 return location; 2677 return location;
2678 } 2678 }
2679 2679
2680 void PaintLayer::ensureCompositedLayerMapping() { 2680 void PaintLayer::ensureCompositedLayerMapping() {
2681 if (m_rareData && m_rareData->compositedLayerMapping) 2681 if (m_rareData && m_rareData->compositedLayerMapping)
2682 return; 2682 return;
2683 2683
2684 ensureRareData().compositedLayerMapping = 2684 ensureRareData().compositedLayerMapping =
2685 wrapUnique(new CompositedLayerMapping(*this)); 2685 WTF::wrapUnique(new CompositedLayerMapping(*this));
2686 m_rareData->compositedLayerMapping->setNeedsGraphicsLayerUpdate( 2686 m_rareData->compositedLayerMapping->setNeedsGraphicsLayerUpdate(
2687 GraphicsLayerUpdateSubtree); 2687 GraphicsLayerUpdateSubtree);
2688 2688
2689 if (PaintLayerResourceInfo* resourceInfo = this->resourceInfo()) 2689 if (PaintLayerResourceInfo* resourceInfo = this->resourceInfo())
2690 resourceInfo->invalidateFilterChain(); 2690 resourceInfo->invalidateFilterChain();
2691 } 2691 }
2692 2692
2693 void PaintLayer::clearCompositedLayerMapping(bool layerBeingDestroyed) { 2693 void PaintLayer::clearCompositedLayerMapping(bool layerBeingDestroyed) {
2694 if (!layerBeingDestroyed) { 2694 if (!layerBeingDestroyed) {
2695 // We need to make sure our decendants get a geometry update. In principle, 2695 // We need to make sure our decendants get a geometry update. In principle,
(...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after
3277 } 3277 }
3278 3278
3279 void showLayerTree(const blink::LayoutObject* layoutObject) { 3279 void showLayerTree(const blink::LayoutObject* layoutObject) {
3280 if (!layoutObject) { 3280 if (!layoutObject) {
3281 LOG(INFO) << "Cannot showLayerTree. Root is (nil)"; 3281 LOG(INFO) << "Cannot showLayerTree. Root is (nil)";
3282 return; 3282 return;
3283 } 3283 }
3284 showLayerTree(layoutObject->enclosingLayer()); 3284 showLayerTree(layoutObject->enclosingLayer());
3285 } 3285 }
3286 #endif 3286 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/paint/PaintLayer.h ('k') | third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698