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

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

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
« no previous file with comments | « sky/engine/core/rendering/RenderImage.cpp ('k') | sky/engine/core/rendering/RenderLayer.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2003, 2009, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2009, 2012 Apple Inc. All rights reserved.
3 * Copyright (C) 2013 Intel Corporation. All rights reserved. 3 * Copyright (C) 2013 Intel Corporation. All rights 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 class FilterOperations; 63 class FilterOperations;
64 class HitTestRequest; 64 class HitTestRequest;
65 class HitTestResult; 65 class HitTestResult;
66 class HitTestingTransformState; 66 class HitTestingTransformState;
67 class RenderStyle; 67 class RenderStyle;
68 class TransformationMatrix; 68 class TransformationMatrix;
69 69
70 enum BorderRadiusClippingRule { IncludeSelfForBorderRadius, DoNotIncludeSelfForB orderRadius }; 70 enum BorderRadiusClippingRule { IncludeSelfForBorderRadius, DoNotIncludeSelfForB orderRadius };
71 enum IncludeSelfOrNot { IncludeSelf, ExcludeSelf }; 71 enum IncludeSelfOrNot { IncludeSelf, ExcludeSelf };
72 72
73 enum CompositingQueryMode {
74 CompositingQueriesAreAllowed,
75 CompositingQueriesAreOnlyAllowedInCertainDocumentLifecyclePhases
76 };
77
78 // FIXME: remove this once the compositing query ASSERTS are no longer hit.
79 class DisableCompositingQueryAsserts {
80 WTF_MAKE_NONCOPYABLE(DisableCompositingQueryAsserts);
81 public:
82 DisableCompositingQueryAsserts();
83 private:
84 TemporaryChange<CompositingQueryMode> m_disabler;
85 };
86
87 class RenderLayer { 73 class RenderLayer {
88 WTF_MAKE_NONCOPYABLE(RenderLayer); 74 WTF_MAKE_NONCOPYABLE(RenderLayer);
89 public: 75 public:
90 RenderLayer(RenderLayerModelObject*, LayerType); 76 RenderLayer(RenderLayerModelObject*, LayerType);
91 ~RenderLayer(); 77 ~RenderLayer();
92 78
93 String debugName() const; 79 String debugName() const;
94 80
95 RenderLayerModelObject* renderer() const { return m_renderer; } 81 RenderLayerModelObject* renderer() const { return m_renderer; }
96 RenderBox* renderBox() const { return m_renderer && m_renderer->isBox() ? to RenderBox(m_renderer) : 0; } 82 RenderBox* renderBox() const { return m_renderer && m_renderer->isBox() ? to RenderBox(m_renderer) : 0; }
(...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
593 579
594 } // namespace blink 580 } // namespace blink
595 581
596 #ifndef NDEBUG 582 #ifndef NDEBUG
597 // Outside the WebCore namespace for ease of invocation from gdb. 583 // Outside the WebCore namespace for ease of invocation from gdb.
598 void showLayerTree(const blink::RenderLayer*); 584 void showLayerTree(const blink::RenderLayer*);
599 void showLayerTree(const blink::RenderObject*); 585 void showLayerTree(const blink::RenderObject*);
600 #endif 586 #endif
601 587
602 #endif // SKY_ENGINE_CORE_RENDERING_RENDERLAYER_H_ 588 #endif // SKY_ENGINE_CORE_RENDERING_RENDERLAYER_H_
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderImage.cpp ('k') | sky/engine/core/rendering/RenderLayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698