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

WebKit/qt/WebCoreSupport/ChromeClientQt.h

 /*
  * Copyright (C) 2006 Zack Rusin <zack@kde.org>
  * 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:
  * 1. Redistributions of source code must retain the above copyright
@@ skipping 134 matching lines @@
 #if ENABLE(NOTIFICATIONS)
         virtual NotificationPresenter* notificationPresenter() const;
 #endif
 
 #if USE(ACCELERATED_COMPOSITING)
         // see ChromeClient.h
         // this is a hook for WebCore to tell us what we need to do with the GraphicsLayers
         virtual void attachRootGraphicsLayer(Frame*, GraphicsLayer*);
         virtual void setNeedsOneShotDrawingSynchronization();
         virtual void scheduleCompositingLayerSync();
-        virtual bool allowsAcceleratedCompositing() const;
+        virtual CompositingTriggerFlags allowedCompositingTriggers() const;
 #endif
 
 #if ENABLE(TILED_BACKING_STORE)
         virtual IntRect visibleRectForTiledBackingStore() const;
 #endif
 
 #if ENABLE(TOUCH_EVENTS)
         virtual void needTouchEvents(bool) { }
 #endif
 
@@ skipping 30 matching lines @@
         bool menuBarVisible;
         QEventLoop* m_eventLoop;
 
         static bool dumpVisitedLinksCallbacks;
 
         mutable QtPlatformPlugin m_platformPlugin;
     };
 }
 
 #endif