Part 2 of merges for Chromium bug #64589...

WebKit/chromium/src/ChromeClientImpl.cpp

Index: WebKit/chromium/src/ChromeClientImpl.cpp
===================================================================
--- WebKit/chromium/src/ChromeClientImpl.cpp	(revision 73145)
+++ WebKit/chromium/src/ChromeClientImpl.cpp	(working copy)
@@ -61,6 +61,7 @@
 #include "ScriptController.h"
 #include "SearchPopupMenuChromium.h"
 #include "SecurityOrigin.h"
+#include "Settings.h"
 #if USE(V8)
 #include "V8Proxy.h"
 #endif
@@ -812,7 +813,20 @@
     if (!m_webView->allowsAcceleratedCompositing())
         return 0;
 
-    return ChromeClient::AllTriggers;
+    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;
 }
 #endif