Merge WebKit at r72805: Initial merge by Git

Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.

Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790

1 files changed, 0 insertions, 13 deletions

diff --git a/WebCore/page/ChromeClient.h b/WebCore/page/ChromeClient.h
index d224726..0725f46 100644
--- a/WebCore/page/ChromeClient.h
+++ b/WebCore/page/ChromeClient.h
@@ -236,19 +236,6 @@ namespace WebCore {
         // Returns whether or not the client can render the composited layer,
         // regardless of the settings.
         virtual bool allowsAcceleratedCompositing() const { return true; }
-
-        enum CompositingTrigger {
-            ThreeDTransformTrigger = 1 << 0,
-            VideoTrigger = 1 << 1,
-            PluginTrigger = 1 << 2,
-            CanvasTrigger = 1 << 3,
-            AnimationTrigger = 1 << 4,
-            AllTriggers = 0xFFFFFFFF
-        };
-        typedef unsigned CompositingTriggerFlags;
-
-        // Returns a bitfield indicating conditions that can trigger the compositor.
-        virtual CompositingTriggerFlags allowedCompositingTriggers() const { return static_cast<CompositingTriggerFlags>(AllTriggers); }
 #endif
 
         virtual bool supportsFullscreenForNode(const Node*) { return false; }