Refactor the way PaintArtifactCompositor is attached and used.

third_party/WebKit/Source/web/WebViewImpl.h

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * 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.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 19 matching lines @@
 
 #ifndef WebViewImpl_h
 #define WebViewImpl_h
 
 #include "core/page/ContextMenuProvider.h"
 #include "core/page/EventWithHitTestResults.h"
 #include "platform/animation/CompositorAnimationTimeline.h"
 #include "platform/geometry/IntPoint.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/graphics/GraphicsLayer.h"
-#include "platform/graphics/compositing/PaintArtifactCompositor.h"
 #include "platform/heap/Handle.h"
 #include "public/platform/WebDisplayMode.h"
 #include "public/platform/WebFloatSize.h"
 #include "public/platform/WebGestureCurveTarget.h"
 #include "public/platform/WebInputEventResult.h"
 #include "public/platform/WebLayer.h"
 #include "public/platform/WebPoint.h"
 #include "public/platform/WebRect.h"
 #include "public/platform/WebScheduler.h"
 #include "public/platform/WebSize.h"
@@ skipping 442 matching lines @@
     void forceNextDrawingBufferCreationToFail() override;
 
     CompositorProxyClient* createCompositorProxyClient();
     IntSize mainFrameSize();
     WebDisplayMode displayMode() const { return m_displayMode; }
 
     PageScaleConstraintsSet& pageScaleConstraintsSet() const;
 
     FloatSize elasticOverscroll() const { return m_elasticOverscroll; }
 
-    // Attaches the PaintArtifactCompositor's tree to this WebView's layer tree
-    // view.
-    void attachPaintArtifactCompositor();
-
-    // Detaches the PaintArtifactCompositor and clears the layer tree view's
-    // root layer.
-    void detachPaintArtifactCompositor();
-
-    // Use in Slimming Paint v2 to update the layer tree for the content.
-    PaintArtifactCompositor& getPaintArtifactCompositor() { return m_paintArtifactCompositor; }
-
     bool isTransparent() const;
     void setIsTransparent(bool value);
 
     double lastFrameTimeMonotonic() const { return m_lastFrameTimeMonotonic; }
 
     ChromeClientImpl& chromeClient() const { return *m_chromeClientImpl.get(); }
 
 private:
     InspectorOverlay* inspectorOverlay();
 
@@ skipping 89 matching lines @@
 
     void enablePopupMouseWheelEventListener();
     void disablePopupMouseWheelEventListener();
 
     void cancelPagePopup();
     void updatePageOverlays();
 
     float deviceScaleFactor() const;
 
     void setRootGraphicsLayer(GraphicsLayer*);
+    void setRootLayer(WebLayer*);
     void attachCompositorAnimationTimeline(CompositorAnimationTimeline*);
     void detachCompositorAnimationTimeline(CompositorAnimationTimeline*);
 
     LocalFrame* focusedLocalFrameInWidget() const;
     LocalFrame* focusedLocalFrameAvailableForIme() const;
 
     WebViewClient* m_client; // Can be 0 (e.g. unittests, shared workers, etc.)
     WebSpellCheckClient* m_spellCheckClient;
 
     Persistent<ChromeClientImpl> m_chromeClientImpl;
@@ skipping 122 matching lines @@
     // compositor thread. The LayerTreeHostImpl is indirectly owned by this
     // class so this pointer should be valid until this class is destructed.
     CrossThreadPersistent<CompositorMutatorImpl> m_mutator;
 
     Persistent<EventListener> m_popupMouseWheelEventListener;
 
     WebPageImportanceSignals m_pageImportanceSignals;
 
     const std::unique_ptr<WebViewScheduler> m_scheduler;
 
-    // Manages the layer tree created for this page in Slimming Paint v2.
-    PaintArtifactCompositor m_paintArtifactCompositor;
-
     double m_lastFrameTimeMonotonic;
 
     // TODO(lfg): This is used in order to disable compositor visibility while
     // the page is still visible. This is needed until the WebView and WebWidget
     // split is complete, since in out-of-process iframes the page can be
     // visible, but the WebView should not be used as a widget.
     bool m_overrideCompositorVisibility;
 
     Persistent<ResizeViewportAnchor> m_resizeViewportAnchor;
 };
 
 // We have no ways to check if the specified WebView is an instance of
 // WebViewImpl because WebViewImpl is the only implementation of WebView.
 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true);
 
 } // namespace blink
 
 #endif