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

WebKit/chromium/src/ChromeClientImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 43 matching lines @@
 #include "IntRect.h"
 #include "NavigationAction.h"
 #include "Node.h"
 #include "NotificationPresenterImpl.h"
 #include "Page.h"
 #include "PopupMenuChromium.h"
 #include "RenderWidget.h"
 #include "ScriptController.h"
 #include "SearchPopupMenuChromium.h"
 #include "SecurityOrigin.h"
+#include "Settings.h"
 #if USE(V8)
 #include "V8Proxy.h"
 #endif
 #include "WebAccessibilityObject.h"
 #include "WebConsoleMessage.h"
 #include "WebCursorInfo.h"
 #include "WebFileChooserCompletionImpl.h"
 #include "WebFrameClient.h"
 #include "WebFrameImpl.h"
 #include "WebGeolocationService.h"
@@ skipping 731 matching lines @@
 void ChromeClientImpl::scheduleCompositingLayerSync()
 {
     m_webView->setRootLayerNeedsDisplay();
 }
 
 ChromeClient::CompositingTriggerFlags ChromeClientImpl::allowedCompositingTriggers() const
 {
     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
 
 bool ChromeClientImpl::supportsFullscreenForNode(const WebCore::Node* node)
 {
     if (m_webView->client() && node->hasTagName(WebCore::HTMLNames::videoTag))
         return m_webView->client()->supportsFullscreen();
     return false;
 }
 
@@ skipping 21 matching lines @@
 
     return adoptRef(new PopupMenuChromium(client));
 }
 
 PassRefPtr<SearchPopupMenu> ChromeClientImpl::createSearchPopupMenu(PopupMenuClient* client) const
 {
     return adoptRef(new SearchPopupMenuChromium(client));
 }
 
 } // namespace WebKit