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

Unified Diff: WebCore/rendering/RenderLayerCompositor.h

Issue 5523003: Part 1 of merges for Chromium bug #64589... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/597/
Patch Set: Created 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « WebCore/rendering/RenderLayerBacking.cpp ('k') | WebCore/rendering/RenderLayerCompositor.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: WebCore/rendering/RenderLayerCompositor.h
===================================================================
--- WebCore/rendering/RenderLayerCompositor.h (revision 73142)
+++ WebCore/rendering/RenderLayerCompositor.h (working copy)
@@ -26,6 +26,7 @@
#ifndef RenderLayerCompositor_h
#define RenderLayerCompositor_h
+#include "ChromeClient.h"
#include "RenderLayer.h"
#include "RenderLayerBacking.h"
@@ -67,7 +68,9 @@
// Returns true if the accelerated compositing is enabled
bool hasAcceleratedCompositing() const { return m_hasAcceleratedCompositing; }
-
+
+ bool canRender3DTransforms() const;
+
bool showDebugBorders() const { return m_showDebugBorders; }
bool showRepaintCounter() const { return m_showRepaintCounter; }
@@ -232,6 +235,8 @@
Timer<RenderLayerCompositor> m_updateCompositingLayersTimer;
bool m_hasAcceleratedCompositing;
+ ChromeClient::CompositingTriggerFlags m_compositingTriggers;
+
bool m_showDebugBorders;
bool m_showRepaintCounter;
bool m_compositingConsultsOverlap;
« no previous file with comments | « WebCore/rendering/RenderLayerBacking.cpp ('k') | WebCore/rendering/RenderLayerCompositor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698