Refactor the way PaintArtifactCompositor is attached and used.

third_party/WebKit/Source/web/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 777 matching lines @@
         webframe->client()->postAccessibilityEvent(WebAXObject(obj), toWebAXEvent(notification));
 }
 
 String ChromeClientImpl::acceptLanguages()
 {
     return m_webView->client()->acceptLanguages();
 }
 
 void ChromeClientImpl::attachRootGraphicsLayer(GraphicsLayer* rootLayer, LocalFrame* localFrame)
 {
+    DCHECK(!RuntimeEnabledFeatures::slimmingPaintV2Enabled());
     WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(localFrame)->localRoot();
 
     // This method can be called while the frame is being detached. In that
     // case, the rootLayer is null, and the widget is already destroyed.
     DCHECK(webFrame->frameWidget() || !rootLayer);
     if (webFrame->frameWidget())
         webFrame->frameWidget()->setRootGraphicsLayer(rootLayer);
 }
 
-void ChromeClientImpl::didPaint(const PaintArtifact& paintArtifact)
+void ChromeClientImpl::attachRootLayer(WebLayer* rootLayer, LocalFrame* localFrame)
 {
-    // TODO(jbroman): This doesn't handle OOPIF correctly. We probably need a
-    // branch for WebFrameWidget, like attachRootGraphicsLayer.
-    m_webView->getPaintArtifactCompositor().update(paintArtifact);
+    WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(localFrame)->localRoot();
+
+    // This method can be called while the frame is being detached. In that
+    // case, the rootLayer is null, and the widget is already destroyed.
+    DCHECK(webFrame->frameWidget() || !rootLayer);
+    if (webFrame->frameWidget())
+        webFrame->frameWidget()->setRootLayer(rootLayer);
 }
 
 void ChromeClientImpl::attachCompositorAnimationTimeline(CompositorAnimationTimeline* compositorTimeline, LocalFrame* localFrame)
 {
     WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(localFrame)->localRoot();
     webFrame->frameWidget()->attachCompositorAnimationTimeline(compositorTimeline);
 }
 
 void ChromeClientImpl::detachCompositorAnimationTimeline(CompositorAnimationTimeline* compositorTimeline, LocalFrame* localFrame)
 {
@@ skipping 312 matching lines @@
     ScreenOrientationController::provideTo(frame, client ? client->webScreenOrientationClient() : nullptr);
     if (RuntimeEnabledFeatures::presentationEnabled())
         PresentationController::provideTo(frame, client ? client->presentationClient() : nullptr);
     if (RuntimeEnabledFeatures::audioOutputDevicesEnabled())
         provideAudioOutputDeviceClientTo(frame, AudioOutputDeviceClientImpl::create());
     if (RuntimeEnabledFeatures::installedAppEnabled())
         InstalledAppController::provideTo(frame, client ? client->installedAppClient() : nullptr);
 }
 
 } // namespace blink