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

WebKit/qt/WebCoreSupport/ChromeClientQt.cpp

 /*
  * Copyright (C) 2006 Zack Rusin <zack@kde.org>
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ skipping 599 matching lines @@
         platformPageClient()->markForSync(false);
 }
 
 void ChromeClientQt::scheduleCompositingLayerSync()
 {
     // we want the layers to synchronize ASAP
     if (platformPageClient())
         platformPageClient()->markForSync(true);
 }
 
-bool ChromeClientQt::allowsAcceleratedCompositing() const
+ChromeClient::CompositingTriggerFlags ChromeClientQt::allowedCompositingTriggers() const
 {
-    return (platformPageClient() && platformPageClient()->allowsAcceleratedCompositing());
+    if (platformPageClient() && platformPageClient()->allowsAcceleratedCompositing())
+        return AllTriggers;
+
+    return 0;
 }
 
 #endif
 
 #if ENABLE(TILED_BACKING_STORE)
 IntRect ChromeClientQt::visibleRectForTiledBackingStore() const
 {
     if (!platformPageClient() || !m_webPage)
         return IntRect();
 
@@ skipping 43 matching lines @@
 {
     // We don't need to do anything here because history is tied to QWebPage rather than stored
     // in a separate database
     if (dumpVisitedLinksCallbacks) {
         printf("Asked to populate visited links for WebView \"%s\"\n",
                 qPrintable(m_webPage->mainFrame()->url().toString()));
     }
 }
 
 } // namespace WebCore