Title: [153408] trunk/Source
Revision
153408
Author
[email protected]
Date
2013-07-27 22:14:33 -0700 (Sat, 27 Jul 2013)

Log Message

Replace all uses of GraphicsLayer::create function with the one that takes a GraphicsLayerFactory
https://bugs.webkit.org/show_bug.cgi?id=119186

Patch by Jacky Jiang <[email protected]> on 2013-07-27
Reviewed by Anders Carlsson.

Source/WebCore:

Remove GraphicsLayer::create(GraphicsLayerClient*) function since it's
been deprecated by r130072.

* WebCore.exp.in:
* WebCore.order:
* platform/graphics/GraphicsLayer.h:
* platform/graphics/blackberry/GraphicsLayerBlackBerry.cpp:
* platform/graphics/ca/GraphicsLayerCA.cpp:
* platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:

Source/WebKit/blackberry:

Replace GraphicsLayer::create calls and add a new function WebPagePrivate::graphicsLayerFactory().

* Api/WebOverlay.cpp:
(BlackBerry::WebKit::WebOverlayPrivateWebKitThread::WebOverlayPrivateWebKitThread):
* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::graphicsLayerFactory):
(BlackBerry::WebKit::WebPagePrivate::overlayLayer):
* Api/WebPage_p.h:
* WebKitSupport/FrameLayers.cpp:
(BlackBerry::WebKit::FrameLayers::addLayer):
* WebKitSupport/SelectionOverlay.cpp:
(BlackBerry::WebKit::SelectionOverlay::draw):

Source/WebKit/efl:

* WebCoreSupport/AcceleratedCompositingContextEfl.cpp:
(WebCore::AcceleratedCompositingContext::attachRootGraphicsLayer):

Source/WebKit/qt:

* WebCoreSupport/TextureMapperLayerClientQt.cpp:
(TextureMapperLayerClientQt::setRootGraphicsLayer):

Source/WebKit2:

* UIProcess/mac/RemoteLayerTreeHost.mm:
(WebKit::RemoteLayerTreeHost::getOrCreateLayer):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (153407 => 153408)


--- trunk/Source/WebCore/ChangeLog	2013-07-28 00:05:11 UTC (rev 153407)
+++ trunk/Source/WebCore/ChangeLog	2013-07-28 05:14:33 UTC (rev 153408)
@@ -1,3 +1,20 @@
+2013-07-27  Jacky Jiang  <[email protected]>
+
+        Replace all uses of GraphicsLayer::create function with the one that takes a GraphicsLayerFactory
+        https://bugs.webkit.org/show_bug.cgi?id=119186
+
+        Reviewed by Anders Carlsson.
+
+        Remove GraphicsLayer::create(GraphicsLayerClient*) function since it's
+        been deprecated by r130072.
+
+        * WebCore.exp.in:
+        * WebCore.order:
+        * platform/graphics/GraphicsLayer.h:
+        * platform/graphics/blackberry/GraphicsLayerBlackBerry.cpp:
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
+
 2013-07-27  Alexey Proskuryakov  <[email protected]>
 
         HTMLParserScheduler gets into an inconsistent state when suspended for reasons

Modified: trunk/Source/WebCore/WebCore.exp.in (153407 => 153408)


--- trunk/Source/WebCore/WebCore.exp.in	2013-07-28 00:05:11 UTC (rev 153407)
+++ trunk/Source/WebCore/WebCore.exp.in	2013-07-28 05:14:33 UTC (rev 153408)
@@ -259,7 +259,6 @@
 __ZN7WebCore13GraphicsLayer18setBackgroundColorERKNS_5ColorE
 __ZN7WebCore13GraphicsLayer20setReplicatedByLayerEPS0_
 __ZN7WebCore13GraphicsLayer54noteDeviceOrPageScaleFactorChangedIncludingDescendantsEv
-__ZN7WebCore13GraphicsLayer6createEPNS_19GraphicsLayerClientE
 __ZN7WebCore13GraphicsLayer6createEPNS_20GraphicsLayerFactoryEPNS_19GraphicsLayerClientE
 __ZN7WebCore13GraphicsLayer8addChildEPS0_
 __ZN7WebCore13GraphicsLayerC2EPNS_19GraphicsLayerClientE

Modified: trunk/Source/WebCore/WebCore.order (153407 => 153408)


--- trunk/Source/WebCore/WebCore.order	2013-07-28 00:05:11 UTC (rev 153407)
+++ trunk/Source/WebCore/WebCore.order	2013-07-28 05:14:33 UTC (rev 153408)
@@ -5962,7 +5962,6 @@
 __ZN7WebCore21RenderLayerCompositor23ensureRootPlatformLayerEv
 __ZNK7WebCore21RenderLayerCompositor42shouldPropagateCompositingToEnclosingFrameEv
 __ZNK7WebCore21RenderLayerCompositor21enclosingFrameElementEv
-__ZN7WebCore13GraphicsLayer6createEPNS_19GraphicsLayerClientE
 __ZN7WebCore15GraphicsLayerCAC2EPNS_19GraphicsLayerClientE
 __ZN7WebCore13GraphicsLayerC2EPNS_19GraphicsLayerClientE
 __ZN7WebCore15PlatformCALayer6createENS0_9LayerTypeEPNS_21PlatformCALayerClientE

Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.h (153407 => 153408)


--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.h	2013-07-28 00:05:11 UTC (rev 153407)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.h	2013-07-28 05:14:33 UTC (rev 153408)
@@ -224,9 +224,6 @@
     WTF_MAKE_NONCOPYABLE(GraphicsLayer); WTF_MAKE_FAST_ALLOCATED;
 public:
     static PassOwnPtr<GraphicsLayer> create(GraphicsLayerFactory*, GraphicsLayerClient*);
-
-    // FIXME: Replace all uses of this create function with the one that takes a GraphicsLayerFactory.
-    static PassOwnPtr<GraphicsLayer> create(GraphicsLayerClient*);
     
     virtual ~GraphicsLayer();
 

Modified: trunk/Source/WebCore/platform/graphics/blackberry/GraphicsLayerBlackBerry.cpp (153407 => 153408)


--- trunk/Source/WebCore/platform/graphics/blackberry/GraphicsLayerBlackBerry.cpp	2013-07-28 00:05:11 UTC (rev 153407)
+++ trunk/Source/WebCore/platform/graphics/blackberry/GraphicsLayerBlackBerry.cpp	2013-07-28 05:14:33 UTC (rev 153408)
@@ -88,11 +88,6 @@
     return factory->createGraphicsLayer(client);
 }
 
-PassOwnPtr<GraphicsLayer> GraphicsLayer::create(GraphicsLayerClient* client)
-{
-    return adoptPtr(new GraphicsLayerBlackBerry(client));
-}
-
 GraphicsLayerBlackBerry::GraphicsLayerBlackBerry(GraphicsLayerClient* client)
     : GraphicsLayer(client)
     , m_suspendTime(0)

Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (153407 => 153408)


--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp	2013-07-28 00:05:11 UTC (rev 153407)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp	2013-07-28 05:14:33 UTC (rev 153408)
@@ -270,11 +270,6 @@
     return factory->createGraphicsLayer(client);
 }
 
-PassOwnPtr<GraphicsLayer> GraphicsLayer::create(GraphicsLayerClient* client)
-{
-    return adoptPtr(new GraphicsLayerCA(client));
-}
-
 GraphicsLayerCA::GraphicsLayerCA(GraphicsLayerClient* client)
     : GraphicsLayer(client)
     , m_contentsLayerPurpose(NoContentsLayer)

Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp (153407 => 153408)


--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp	2013-07-28 00:05:11 UTC (rev 153407)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp	2013-07-28 05:14:33 UTC (rev 153408)
@@ -43,11 +43,6 @@
     return factory->createGraphicsLayer(client);
 }
 
-PassOwnPtr<GraphicsLayer> GraphicsLayer::create(GraphicsLayerClient* client)
-{
-    return adoptPtr(new GraphicsLayerTextureMapper(client));
-}
-
 GraphicsLayerTextureMapper::GraphicsLayerTextureMapper(GraphicsLayerClient* client)
     : GraphicsLayer(client)
     , m_layer(adoptPtr(new TextureMapperLayer()))

Modified: trunk/Source/WebKit/blackberry/Api/WebOverlay.cpp (153407 => 153408)


--- trunk/Source/WebKit/blackberry/Api/WebOverlay.cpp	2013-07-28 00:05:11 UTC (rev 153407)
+++ trunk/Source/WebKit/blackberry/Api/WebOverlay.cpp	2013-07-28 05:14:33 UTC (rev 153408)
@@ -247,7 +247,7 @@
 }
 
 WebOverlayPrivateWebKitThread::WebOverlayPrivateWebKitThread(GraphicsLayerClient* client)
-    : m_layer(GraphicsLayer::create(client ? client : this))
+    : m_layer(GraphicsLayer::create(0, client ? client : this))
 {
     m_layerCompositingThread = m_layer->platformLayer()->layerCompositingThread();
 }

Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (153407 => 153408)


--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2013-07-28 00:05:11 UTC (rev 153407)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2013-07-28 05:14:33 UTC (rev 153408)
@@ -5243,10 +5243,15 @@
     return LayerRenderingResults();
 }
 
+WebCore::GraphicsLayerFactory* WebPagePrivate::graphicsLayerFactory() const
+{
+    return m_page->chrome().client()->graphicsLayerFactory();
+}
+
 GraphicsLayer* WebPagePrivate::overlayLayer()
 {
     if (!m_overlayLayer)
-        m_overlayLayer = GraphicsLayer::create(0, this);
+        m_overlayLayer = GraphicsLayer::create(graphicsLayerFactory(), this);
 
     return m_overlayLayer.get();
 }

Modified: trunk/Source/WebKit/blackberry/Api/WebPage_p.h (153407 => 153408)


--- trunk/Source/WebKit/blackberry/Api/WebPage_p.h	2013-07-28 00:05:11 UTC (rev 153407)
+++ trunk/Source/WebKit/blackberry/Api/WebPage_p.h	2013-07-28 05:14:33 UTC (rev 153408)
@@ -376,6 +376,7 @@
     void rootLayerCommitTimerFired(WebCore::Timer<WebPagePrivate>*);
     bool commitRootLayerIfNeeded();
     WebCore::LayerRenderingResults lastCompositingResults() const;
+    WebCore::GraphicsLayerFactory* graphicsLayerFactory() const;
     WebCore::GraphicsLayer* overlayLayer();
 
     // Fallback GraphicsLayerClient implementation, used for various overlay layers.

Modified: trunk/Source/WebKit/blackberry/ChangeLog (153407 => 153408)


--- trunk/Source/WebKit/blackberry/ChangeLog	2013-07-28 00:05:11 UTC (rev 153407)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-07-28 05:14:33 UTC (rev 153408)
@@ -1,3 +1,23 @@
+2013-07-27  Jacky Jiang  <[email protected]>
+
+        Replace all uses of GraphicsLayer::create function with the one that takes a GraphicsLayerFactory
+        https://bugs.webkit.org/show_bug.cgi?id=119186
+
+        Reviewed by Anders Carlsson.
+
+        Replace GraphicsLayer::create calls and add a new function WebPagePrivate::graphicsLayerFactory().
+
+        * Api/WebOverlay.cpp:
+        (BlackBerry::WebKit::WebOverlayPrivateWebKitThread::WebOverlayPrivateWebKitThread):
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::graphicsLayerFactory):
+        (BlackBerry::WebKit::WebPagePrivate::overlayLayer):
+        * Api/WebPage_p.h:
+        * WebKitSupport/FrameLayers.cpp:
+        (BlackBerry::WebKit::FrameLayers::addLayer):
+        * WebKitSupport/SelectionOverlay.cpp:
+        (BlackBerry::WebKit::SelectionOverlay::draw):
+
 2013-07-25  Andreas Kling  <[email protected]>
 
         ChromeClient::focusedNodeChanged() should be focusedElementChanged().

Modified: trunk/Source/WebKit/blackberry/WebKitSupport/FrameLayers.cpp (153407 => 153408)


--- trunk/Source/WebKit/blackberry/WebKitSupport/FrameLayers.cpp	2013-07-28 00:05:11 UTC (rev 153407)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/FrameLayers.cpp	2013-07-28 05:14:33 UTC (rev 153408)
@@ -78,7 +78,7 @@
     calculateRootLayer();
     if (!m_rootLayer) {
         ASSERT(!m_rootGraphicsLayer);
-        m_rootGraphicsLayer = GraphicsLayer::create(0);
+        m_rootGraphicsLayer = GraphicsLayer::create(m_pagePrivate->graphicsLayerFactory(), 0);
         m_rootLayer = m_rootGraphicsLayer->platformLayer();
     }
 

Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SelectionOverlay.cpp (153407 => 153408)


--- trunk/Source/WebKit/blackberry/WebKitSupport/SelectionOverlay.cpp	2013-07-28 00:05:11 UTC (rev 153407)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/SelectionOverlay.cpp	2013-07-28 05:14:33 UTC (rev 153408)
@@ -54,7 +54,7 @@
     m_selection = selection;
 
     while (m_layers.size() < static_cast<size_t>(m_selection.size()))
-        m_layers.append(GraphicsLayer::create(this));
+        m_layers.append(GraphicsLayer::create(m_page->graphicsLayerFactory(), this));
 
     m_layers.resize(m_selection.size());
 

Modified: trunk/Source/WebKit/efl/ChangeLog (153407 => 153408)


--- trunk/Source/WebKit/efl/ChangeLog	2013-07-28 00:05:11 UTC (rev 153407)
+++ trunk/Source/WebKit/efl/ChangeLog	2013-07-28 05:14:33 UTC (rev 153408)
@@ -1,3 +1,13 @@
+2013-07-27  Jacky Jiang  <[email protected]>
+
+        Replace all uses of GraphicsLayer::create function with the one that takes a GraphicsLayerFactory
+        https://bugs.webkit.org/show_bug.cgi?id=119186
+
+        Reviewed by Anders Carlsson.
+
+        * WebCoreSupport/AcceleratedCompositingContextEfl.cpp:
+        (WebCore::AcceleratedCompositingContext::attachRootGraphicsLayer):
+
 2013-07-25  Andreas Kling  <[email protected]>
 
         ChromeClient::focusedNodeChanged() should be focusedElementChanged().

Modified: trunk/Source/WebKit/efl/WebCoreSupport/AcceleratedCompositingContextEfl.cpp (153407 => 153408)


--- trunk/Source/WebKit/efl/WebCoreSupport/AcceleratedCompositingContextEfl.cpp	2013-07-28 00:05:11 UTC (rev 153407)
+++ trunk/Source/WebKit/efl/WebCoreSupport/AcceleratedCompositingContextEfl.cpp	2013-07-28 05:14:33 UTC (rev 153408)
@@ -101,7 +101,7 @@
         return;
     }
 
-    m_rootGraphicsLayer = WebCore::GraphicsLayer::create(0);
+    m_rootGraphicsLayer = WebCore::GraphicsLayer::create(0, 0);
     m_rootTextureMapperLayer = toTextureMapperLayer(m_rootGraphicsLayer.get());
     m_rootGraphicsLayer->addChild(rootLayer);
     m_rootGraphicsLayer->setDrawsContent(false);

Modified: trunk/Source/WebKit/qt/ChangeLog (153407 => 153408)


--- trunk/Source/WebKit/qt/ChangeLog	2013-07-28 00:05:11 UTC (rev 153407)
+++ trunk/Source/WebKit/qt/ChangeLog	2013-07-28 05:14:33 UTC (rev 153408)
@@ -1,3 +1,13 @@
+2013-07-27  Jacky Jiang  <[email protected]>
+
+        Replace all uses of GraphicsLayer::create function with the one that takes a GraphicsLayerFactory
+        https://bugs.webkit.org/show_bug.cgi?id=119186
+
+        Reviewed by Anders Carlsson.
+
+        * WebCoreSupport/TextureMapperLayerClientQt.cpp:
+        (TextureMapperLayerClientQt::setRootGraphicsLayer):
+
 2013-07-25  Andreas Kling  <[email protected]>
 
         ChromeClient::focusedNodeChanged() should be focusedElementChanged().

Modified: trunk/Source/WebKit/qt/WebCoreSupport/TextureMapperLayerClientQt.cpp (153407 => 153408)


--- trunk/Source/WebKit/qt/WebCoreSupport/TextureMapperLayerClientQt.cpp	2013-07-28 00:05:11 UTC (rev 153407)
+++ trunk/Source/WebKit/qt/WebCoreSupport/TextureMapperLayerClientQt.cpp	2013-07-28 05:14:33 UTC (rev 153408)
@@ -64,7 +64,7 @@
 void TextureMapperLayerClientQt::setRootGraphicsLayer(GraphicsLayer* layer)
 {
     if (layer) {
-        m_rootGraphicsLayer = GraphicsLayer::create(0);
+        m_rootGraphicsLayer = GraphicsLayer::create(0, 0);
         m_rootTextureMapperLayer = toTextureMapperLayer(m_rootGraphicsLayer.get());
         m_rootGraphicsLayer->addChild(layer);
         m_rootGraphicsLayer->setDrawsContent(false);

Modified: trunk/Source/WebKit2/ChangeLog (153407 => 153408)


--- trunk/Source/WebKit2/ChangeLog	2013-07-28 00:05:11 UTC (rev 153407)
+++ trunk/Source/WebKit2/ChangeLog	2013-07-28 05:14:33 UTC (rev 153408)
@@ -1,3 +1,13 @@
+2013-07-27  Jacky Jiang  <[email protected]>
+
+        Replace all uses of GraphicsLayer::create function with the one that takes a GraphicsLayerFactory
+        https://bugs.webkit.org/show_bug.cgi?id=119186
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/mac/RemoteLayerTreeHost.mm:
+        (WebKit::RemoteLayerTreeHost::getOrCreateLayer):
+
 2013-07-27  Chris Fleizach  <[email protected]>
 
         AX: VoiceOver not working with data detection page overlays

Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm (153407 => 153408)


--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm	2013-07-28 00:05:11 UTC (rev 153407)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm	2013-07-28 05:14:33 UTC (rev 153408)
@@ -78,7 +78,7 @@
 {
     auto addResult = m_layers.add(layerID, nullptr);
     if (addResult.isNewEntry)
-        addResult.iterator->value = GraphicsLayer::create(this);
+        addResult.iterator->value = GraphicsLayer::create(0, this);
 
     return addResult.iterator->value.get();
 }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to