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

WebKit/chromium/src/ChromeClientImpl.h

 /*
  * 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 134 matching lines @@
     virtual void attachRootGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*);
 
     // Sets a flag to specify that the next time content is drawn to the window,
     // the changes appear on the screen in synchrony with updates to GraphicsLayers.
     virtual void setNeedsOneShotDrawingSynchronization() { }
 
     // Sets a flag to specify that the view needs to be updated, so we need
     // to do an eager layout before the drawing.
     virtual void scheduleCompositingLayerSync();
 
-    // Returns true if accelerated compositing is supported.
-    virtual bool allowsAcceleratedCompositing() const;
+    virtual CompositingTriggerFlags allowedCompositingTriggers() const;
 #endif
 
     virtual bool supportsFullscreenForNode(const WebCore::Node*);
     virtual void enterFullscreenForNode(WebCore::Node*);
     virtual void exitFullscreenForNode(WebCore::Node*);
 
     // ChromeClientChromium methods:
     virtual void popupOpened(WebCore::PopupContainer* popupContainer,
                              const WebCore::IntRect& bounds,
                              bool handleExternally);
@@ skipping 19 matching lines @@
     bool m_toolbarsVisible;
     bool m_statusbarVisible;
     bool m_scrollbarsVisible;
     bool m_menubarVisible;
     bool m_resizable;
 };
 
 } // namespace WebKit
 
 #endif