1 files changed, 2 insertions, 19 deletions
diff --git a/WebKit/chromium/src/ChromeClientImpl.cpp b/WebKit/chromium/src/ChromeClientImpl.cpp
index 7b67ede..c43a0b0 100644
--- a/WebKit/chromium/src/ChromeClientImpl.cpp
+++ b/WebKit/chromium/src/ChromeClientImpl.cpp
@@ -61,7 +61,6 @@
 #include "ScriptController.h"
 #include "SearchPopupMenuChromium.h"
 #include "SecurityOrigin.h"
-#include "Settings.h"
 #if USE(V8)
 #include "V8Proxy.h"
 #endif
@@ -808,25 +807,9 @@ void ChromeClientImpl::scheduleCompositingLayerSync()
     m_webView->setRootLayerNeedsDisplay();
 }
 
-ChromeClient::CompositingTriggerFlags ChromeClientImpl::allowedCompositingTriggers() const
+bool ChromeClientImpl::allowsAcceleratedCompositing() const
 {
-    if (!m_webView->allowsAcceleratedCompositing())
-        return 0;
-
-    CompositingTriggerFlags flags = 0;
-    Settings* settings = m_webView->page()->settings();
-    if (settings->acceleratedCompositingFor3DTransformsEnabled())
-        flags |= ThreeDTransformTrigger;
-    if (settings->acceleratedCompositingForVideoEnabled())
-        flags |= VideoTrigger;
-    if (settings->acceleratedCompositingForPluginsEnabled())
-        flags |= PluginTrigger;
-    if (settings->acceleratedCompositingForAnimationEnabled())
-        flags |= AnimationTrigger;
-    if (settings->acceleratedCompositingForCanvasEnabled())
-        flags |= CanvasTrigger;
-
-    return flags;
+    return m_webView->allowsAcceleratedCompositing();
 }
 #endif