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

Unified Diff: Source/core/rendering/RenderView.h

Issue 723103002: Revert "Move ViewDisplayList to GraphicsLayer" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
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
« no previous file with comments | « Source/core/rendering/RenderObject.cpp ('k') | Source/core/rendering/RenderingTestHelper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderView.h
diff --git a/Source/core/rendering/RenderView.h b/Source/core/rendering/RenderView.h
index 30ee2ec5b62d190df8be15d2a12005804e532fb6..18d3dc3a0454d0684ed3ab8950b5ff65d99a1e7c 100644
--- a/Source/core/rendering/RenderView.h
+++ b/Source/core/rendering/RenderView.h
@@ -23,6 +23,7 @@
#define RenderView_h
#include "core/frame/FrameView.h"
+#include "core/paint/ViewDisplayList.h"
#include "core/rendering/LayoutState.h"
#include "core/rendering/PaintInvalidationState.h"
#include "core/rendering/RenderBlockFlow.h"
@@ -164,6 +165,14 @@ public:
void popLayoutState();
virtual void invalidateTreeIfNeeded(const PaintInvalidationState&) override final;
+ ViewDisplayList& viewDisplayList()
+ {
+ ASSERT(RuntimeEnabledFeatures::slimmingPaintEnabled());
+ if (!m_viewDisplayList)
+ m_viewDisplayList = adoptPtr(new ViewDisplayList());
+ return *m_viewDisplayList;
+ }
+
private:
virtual void mapLocalToContainer(const RenderLayerModelObject* paintInvalidationContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0, const PaintInvalidationState* = 0) const override;
virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const override;
@@ -200,6 +209,7 @@ private:
unsigned m_renderCounterCount;
unsigned m_hitTestCount;
+ OwnPtr<ViewDisplayList> m_viewDisplayList;
};
DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderView, isRenderView());
« no previous file with comments | « Source/core/rendering/RenderObject.cpp ('k') | Source/core/rendering/RenderingTestHelper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698