Refactor the way PaintArtifactCompositor is attached and used.

third_party/WebKit/Source/core/page/ChromeClient.h

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple, Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  * Copyright (C) 2012 Samsung Electronics. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 52 matching lines @@
 class HitTestResult;
 class IntRect;
 class LocalFrame;
 class Node;
 class Page;
 class PaintArtifact;
 class PopupOpeningObserver;
 class WebDragData;
 class WebFrameScheduler;
 class WebImage;
+class WebLayer;
 
 struct CompositedSelection;
 struct DateTimeChooserParameters;
 struct FrameLoadRequest;
 struct GraphicsDeviceAdapter;
 struct ViewportDescription;
 struct WebPoint;
 struct WindowFeatures;
 
 class CORE_EXPORT ChromeClient : public HostWindow {
@@ skipping 106 matching lines @@
     //    ENABLE(INPUT_MULTIPLE_FIELDS_UI)
     virtual DateTimeChooser* openDateTimeChooser(DateTimeChooserClient*, const DateTimeChooserParameters&) = 0;
 
     virtual void openTextDataListChooser(HTMLInputElement&)= 0;
 
     virtual void openFileChooser(LocalFrame*, PassRefPtr<FileChooser>) = 0;
 
     // Asychronous request to enumerate all files in a directory chosen by the user.
     virtual void enumerateChosenDirectory(FileChooser*) = 0;
 
-    // Pass 0 as the GraphicsLayer to detach the root layer.
+    // Pass nullptr as the GraphicsLayer to detach the root layer.
     // This sets the graphics layer for the LocalFrame's WebWidget, if it has
     // one. Otherwise it sets it for the WebViewImpl.
     virtual void attachRootGraphicsLayer(GraphicsLayer*, LocalFrame* localRoot) = 0;
 
-    // In Slimming Paint v2, called when the paint artifact is updated, to allow
-    // the underlying web widget to composite it.
-    virtual void didPaint(const PaintArtifact&) { }
+    // Pass nullptr as the WebLayer to detach the root layer.
+    // This sets the WebLayer for the LocalFrame's WebWidget, if it has
+    // one. Otherwise it sets it for the WebViewImpl.
+    virtual void attachRootLayer(WebLayer*, LocalFrame* localRoot) = 0;
 
     virtual void attachCompositorAnimationTimeline(CompositorAnimationTimeline*, LocalFrame* localRoot) { }
     virtual void detachCompositorAnimationTimeline(CompositorAnimationTimeline*, LocalFrame* localRoot) { }
 
     virtual void enterFullscreenForElement(Element*) { }
     virtual void exitFullscreenForElement(Element*) { }
 
     virtual void clearCompositedSelection(LocalFrame*) { }
     virtual void updateCompositedSelection(LocalFrame*, const CompositedSelection&) { }
 
@@ skipping 86 matching lines @@
 
     LayoutPoint m_lastToolTipPoint;
     String m_lastToolTipText;
 
     FRIEND_TEST_ALL_PREFIXES(ChromeClientTest, SetToolTipFlood);
 };
 
 } // namespace blink
 
 #endif // ChromeClient_h