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

Side by Side Diff: sky/engine/core/rendering/RenderLayer.cpp

Issue 787293002: Remove the straggling DisableCompositingQueryAsserts. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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 reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
5 * 5 *
6 * Other contributors: 6 * Other contributors:
7 * Robert O'Callahan <roc+@cs.cmu.edu> 7 * Robert O'Callahan <roc+@cs.cmu.edu>
8 * David Baron <dbaron@fas.harvard.edu> 8 * David Baron <dbaron@fas.harvard.edu>
9 * Christian Biesinger <cbiesinger@web.de> 9 * Christian Biesinger <cbiesinger@web.de>
10 * Randall Jesup <rjesup@wgate.com> 10 * Randall Jesup <rjesup@wgate.com>
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 #include "sky/engine/platform/graphics/filters/SourceGraphic.h" 71 #include "sky/engine/platform/graphics/filters/SourceGraphic.h"
72 #include "sky/engine/platform/transforms/ScaleTransformOperation.h" 72 #include "sky/engine/platform/transforms/ScaleTransformOperation.h"
73 #include "sky/engine/platform/transforms/TransformationMatrix.h" 73 #include "sky/engine/platform/transforms/TransformationMatrix.h"
74 #include "sky/engine/platform/transforms/TranslateTransformOperation.h" 74 #include "sky/engine/platform/transforms/TranslateTransformOperation.h"
75 #include "sky/engine/public/platform/Platform.h" 75 #include "sky/engine/public/platform/Platform.h"
76 #include "sky/engine/wtf/StdLibExtras.h" 76 #include "sky/engine/wtf/StdLibExtras.h"
77 #include "sky/engine/wtf/text/CString.h" 77 #include "sky/engine/wtf/text/CString.h"
78 78
79 namespace blink { 79 namespace blink {
80 80
81 namespace {
82
83 static CompositingQueryMode gCompositingQueryMode =
84 CompositingQueriesAreOnlyAllowedInCertainDocumentLifecyclePhases;
85
86 } // namespace
87
88 RenderLayer::RenderLayer(RenderLayerModelObject* renderer, LayerType type) 81 RenderLayer::RenderLayer(RenderLayerModelObject* renderer, LayerType type)
89 : m_layerType(type) 82 : m_layerType(type)
90 , m_hasSelfPaintingLayerDescendant(false) 83 , m_hasSelfPaintingLayerDescendant(false)
91 , m_hasSelfPaintingLayerDescendantDirty(false) 84 , m_hasSelfPaintingLayerDescendantDirty(false)
92 , m_isRootLayer(renderer->isRenderView()) 85 , m_isRootLayer(renderer->isRenderView())
93 , m_usedTransparency(false) 86 , m_usedTransparency(false)
94 , m_3DTransformedDescendantStatusDirty(true) 87 , m_3DTransformedDescendantStatusDirty(true)
95 , m_has3DTransformedDescendant(false) 88 , m_has3DTransformedDescendant(false)
96 , m_containsDirtyOverlayScrollbars(false) 89 , m_containsDirtyOverlayScrollbars(false)
97 , m_hasFilterInfo(false) 90 , m_hasFilterInfo(false)
(...skipping 1952 matching lines...) Expand 10 before | Expand all | Expand 10 after
2050 2043
2051 void RenderLayer::setShouldDoFullPaintInvalidationIncludingNonCompositingDescend ants() 2044 void RenderLayer::setShouldDoFullPaintInvalidationIncludingNonCompositingDescend ants()
2052 { 2045 {
2053 renderer()->setShouldDoFullPaintInvalidation(true); 2046 renderer()->setShouldDoFullPaintInvalidation(true);
2054 2047
2055 for (RenderLayer* child = firstChild(); child; child = child->nextSibling()) { 2048 for (RenderLayer* child = firstChild(); child; child = child->nextSibling()) {
2056 child->setShouldDoFullPaintInvalidationIncludingNonCompositingDescendant s(); 2049 child->setShouldDoFullPaintInvalidationIncludingNonCompositingDescendant s();
2057 } 2050 }
2058 } 2051 }
2059 2052
2060 DisableCompositingQueryAsserts::DisableCompositingQueryAsserts()
2061 : m_disabler(gCompositingQueryMode, CompositingQueriesAreAllowed) { }
2062
2063 } // namespace blink 2053 } // namespace blink
2064 2054
2065 #ifndef NDEBUG 2055 #ifndef NDEBUG
2066 void showLayerTree(const blink::RenderLayer* layer) 2056 void showLayerTree(const blink::RenderLayer* layer)
2067 { 2057 {
2068 if (!layer) 2058 if (!layer)
2069 return; 2059 return;
2070 2060
2071 if (blink::LocalFrame* frame = layer->renderer()->frame()) { 2061 if (blink::LocalFrame* frame = layer->renderer()->frame()) {
2072 WTF::String output = externalRepresentation(frame, blink::RenderAsTextSh owAllLayers | blink::RenderAsTextShowLayerNesting | blink::RenderAsTextShowCompo sitedLayers | blink::RenderAsTextShowAddresses | blink::RenderAsTextShowIDAndCla ss | blink::RenderAsTextDontUpdateLayout | blink::RenderAsTextShowLayoutState); 2062 WTF::String output = externalRepresentation(frame, blink::RenderAsTextSh owAllLayers | blink::RenderAsTextShowLayerNesting | blink::RenderAsTextShowCompo sitedLayers | blink::RenderAsTextShowAddresses | blink::RenderAsTextShowIDAndCla ss | blink::RenderAsTextDontUpdateLayout | blink::RenderAsTextShowLayoutState);
2073 fprintf(stderr, "%s\n", output.utf8().data()); 2063 fprintf(stderr, "%s\n", output.utf8().data());
2074 } 2064 }
2075 } 2065 }
2076 2066
2077 void showLayerTree(const blink::RenderObject* renderer) 2067 void showLayerTree(const blink::RenderObject* renderer)
2078 { 2068 {
2079 if (!renderer) 2069 if (!renderer)
2080 return; 2070 return;
2081 showLayerTree(renderer->enclosingLayer()); 2071 showLayerTree(renderer->enclosingLayer());
2082 } 2072 }
2083 #endif 2073 #endif
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderLayer.h ('k') | sky/engine/core/rendering/RenderLayerScrollableArea.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698