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

Unified Diff: sky/engine/core/rendering/RenderLayer.h

Issue 758843004: Delete most of rendering/compositing. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: sky/engine/core/rendering/RenderLayer.h
diff --git a/sky/engine/core/rendering/RenderLayer.h b/sky/engine/core/rendering/RenderLayer.h
index b2e5c630af2292399a8ba13f3dd31efd3fbfc36f..5a32362ef84a1708af87f59be21d5611fc590ec6 100644
--- a/sky/engine/core/rendering/RenderLayer.h
+++ b/sky/engine/core/rendering/RenderLayer.h
@@ -54,6 +54,7 @@
#include "sky/engine/core/rendering/RenderLayerScrollableArea.h"
#include "sky/engine/core/rendering/RenderLayerStackingNode.h"
#include "sky/engine/core/rendering/RenderLayerStackingNodeIterator.h"
+#include "sky/engine/core/rendering/compositing/CompositingState.h"
#include "sky/engine/platform/graphics/CompositingReasons.h"
#include "sky/engine/public/platform/WebBlendMode.h"
#include "sky/engine/wtf/OwnPtr.h"
@@ -65,7 +66,6 @@ class FilterOperations;
class HitTestRequest;
class HitTestResult;
class HitTestingTransformState;
-class RenderLayerCompositor;
class RenderStyle;
class TransformationMatrix;
@@ -136,8 +136,6 @@ public:
bool isRootLayer() const { return m_isRootLayer; }
- RenderLayerCompositor* compositor() const;
-
// Notification from the renderer that its content changed (e.g. current frame of image changed).
// Allows updates of layer content without invalidating paint.
void contentChanged(ContentChangeType);
@@ -263,11 +261,8 @@ public:
// Only safe to call from RenderLayerModelObject::destroyLayer()
void operator delete(void*);
- CompositingState compositingState() const;
-
- // This returns true if our document is in a phase of its lifestyle during which
- // compositing state may legally be read.
- bool isAllowedToQueryCompositingState() const;
+ // FIXME(sky): Remove
+ CompositingState compositingState() const { return NotComposited; }
GraphicsLayer* graphicsLayerBacking() const;
@@ -427,7 +422,6 @@ public:
void updateAncestorDependentCompositingInputs(const AncestorDependentCompositingInputs&);
void updateDescendantDependentCompositingInputs(const DescendantDependentCompositingInputs&);
- void didUpdateCompositingInputs();
const AncestorDependentCompositingInputs& ancestorDependentCompositingInputs() const { ASSERT(!m_needsAncestorDependentCompositingInputsUpdate); return m_ancestorDependentCompositingInputs; }
const DescendantDependentCompositingInputs& descendantDependentCompositingInputs() const { ASSERT(!m_needsDescendantDependentCompositingInputsUpdate); return m_descendantDependentCompositingInputs; }
@@ -444,13 +438,13 @@ public:
bool hasAncestorWithClipPath() const { return ancestorDependentCompositingInputs().hasAncestorWithClipPath; }
bool hasDescendantWithClipPath() const { return descendantDependentCompositingInputs().hasDescendantWithClipPath; }
- bool lostGroupedMapping() const { ASSERT(isAllowedToQueryCompositingState()); return m_lostGroupedMapping; }
+ bool lostGroupedMapping() const { return m_lostGroupedMapping; }
void setLostGroupedMapping(bool b) { m_lostGroupedMapping = b; }
- CompositingReasons compositingReasons() const { ASSERT(isAllowedToQueryCompositingState()); return m_compositingReasons; }
+ CompositingReasons compositingReasons() const { return m_compositingReasons; }
void setCompositingReasons(CompositingReasons, CompositingReasons mask = CompositingReasonAll);
- bool hasCompositingDescendant() const { ASSERT(isAllowedToQueryCompositingState()); return m_hasCompositingDescendant; }
+ bool hasCompositingDescendant() const { return m_hasCompositingDescendant; }
void setHasCompositingDescendant(bool);
void updateOrRemoveFilterEffectRenderer();
@@ -552,7 +546,6 @@ private:
bool requiresScrollableArea() const { return renderBox(); }
void updateScrollableArea();
- bool attemptDirectCompositingUpdate(StyleDifference, const RenderStyle* oldStyle);
void updateTransform(const RenderStyle* oldStyle, RenderStyle* newStyle);
void dirty3DTransformedDescendantStatus();

Powered by Google App Engine
This is Rietveld 408576698