Blink Platform: Erase GraphicsLayerFactory.

third_party/WebKit/Source/core/frame/VisualViewport.cpp

 /*
  * Copyright (C) 2013 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 29 matching lines @@
 #include "core/layout/compositing/PaintLayerCompositor.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/Page.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
 #include "platform/Histogram.h"
 #include "platform/TraceEvent.h"
 #include "platform/geometry/DoubleRect.h"
 #include "platform/geometry/FloatSize.h"
 #include "platform/graphics/GraphicsLayer.h"
-#include "platform/graphics/GraphicsLayerFactory.h"
 #include "platform/scroll/Scrollbar.h"
 #include "platform/scroll/ScrollbarThemeOverlay.h"
 #include "public/platform/WebCompositorSupport.h"
 #include "public/platform/WebLayer.h"
 #include "public/platform/WebLayerTreeView.h"
 #include "public/platform/WebScrollbar.h"
 #include "public/platform/WebScrollbarLayer.h"
 
 using blink::WebLayer;
 using blink::WebLayerTreeView;
 using blink::WebScrollbar;
 using blink::WebScrollbarLayer;
 using blink::FrameHost;
 using blink::GraphicsLayer;
-using blink::GraphicsLayerFactory;
 
 namespace blink {
 
 VisualViewport::VisualViewport(FrameHost& owner)
     : m_frameHost(&owner)
     , m_scale(1)
     , m_topControlsAdjustment(0)
     , m_maxPageScale(-1)
     , m_trackPinchZoomStatsForPage(false)
 {
@@ skipping 193 matching lines @@
 //     |           +-- overflowControlsHostLayer (root layer) [ owned by PaintLayerCompositor ]
 //     |               +-- outerViewportContainerLayer (fixed pos container) [frame container layer in PaintLayerCompositor]
 //     |               |   +-- outerViewportScrollLayer [frame scroll layer in PaintLayerCompositor]
 //     |               |       +-- content layers ...
 //     +- *PageOverlay for InspectorOverlay
 //     +- *PageOverlay for ColorOverlay
 //     +- horizontalScrollbarLayer [ owned by PaintLayerCompositor ]
 //     +- verticalScrollbarLayer [ owned by PaintLayerCompositor ]
 //     +- scroll corner (non-overlay only) [ owned by PaintLayerCompositor ]
 //
-void VisualViewport::attachToLayerTree(GraphicsLayer* currentLayerTreeRoot, GraphicsLayerFactory* graphicsLayerFactory)
+void VisualViewport::attachToLayerTree(GraphicsLayer* currentLayerTreeRoot)
 {
     TRACE_EVENT1("blink", "VisualViewport::attachToLayerTree", "currentLayerTreeRoot", (bool)currentLayerTreeRoot);
     if (!currentLayerTreeRoot) {
         if (m_innerViewportScrollLayer)
             m_innerViewportScrollLayer->removeAllChildren();
         return;
     }
 
     if (currentLayerTreeRoot->parent() && currentLayerTreeRoot->parent() == m_innerViewportScrollLayer)
         return;
 
     if (!m_innerViewportScrollLayer) {
         ASSERT(!m_overlayScrollbarHorizontal
             && !m_overlayScrollbarVertical
             && !m_overscrollElasticityLayer
             && !m_pageScaleLayer
             && !m_innerViewportContainerLayer);
 
         // FIXME: The root transform layer should only be created on demand.
-        m_rootTransformLayer = GraphicsLayer::create(graphicsLayerFactory, this);
-        m_innerViewportContainerLayer = GraphicsLayer::create(graphicsLayerFactory, this);
-        m_overscrollElasticityLayer = GraphicsLayer::create(graphicsLayerFactory, this);
-        m_pageScaleLayer = GraphicsLayer::create(graphicsLayerFactory, this);
-        m_innerViewportScrollLayer = GraphicsLayer::create(graphicsLayerFactory, this);
-        m_overlayScrollbarHorizontal = GraphicsLayer::create(graphicsLayerFactory, this);
-        m_overlayScrollbarVertical = GraphicsLayer::create(graphicsLayerFactory, this);
+        m_rootTransformLayer = GraphicsLayer::create(this);
+        m_innerViewportContainerLayer = GraphicsLayer::create(this);
+        m_overscrollElasticityLayer = GraphicsLayer::create(this);
+        m_pageScaleLayer = GraphicsLayer::create(this);
+        m_innerViewportScrollLayer = GraphicsLayer::create(this);
+        m_overlayScrollbarHorizontal = GraphicsLayer::create(this);
+        m_overlayScrollbarVertical = GraphicsLayer::create(this);
 
         ScrollingCoordinator* coordinator = frameHost().page().scrollingCoordinator();
         ASSERT(coordinator);
         coordinator->setLayerIsContainerForFixedPositionLayers(m_innerViewportScrollLayer.get(), true);
 
         // Set masks to bounds so the compositor doesn't clobber a manually
         // set inner viewport container layer size.
         m_innerViewportContainerLayer->setMasksToBounds(frameHost().settings().mainFrameClipsContent());
         m_innerViewportContainerLayer->setSize(FloatSize(m_size));
 
@@ skipping 423 matching lines @@
     } else if (graphicsLayer == m_rootTransformLayer) {
         name =  "Root Transform Layer";
     } else {
         ASSERT_NOT_REACHED();
     }
 
     return name;
 }
 
 } // namespace blink