Changeset 142841 in webkit

Timestamp:

Feb 13, 2013 6:30:25 PM (11 years ago)

Author:

jamesr@google.com

Message:

[chromium] Request WebLayerTreeView for DumpRenderTree via explicit testing path
​https://bugs.webkit.org/show_bug.cgi?id=109634

Reviewed by Adrienne Walker.

Source/Platform:

• chromium/public/WebUnitTestSupport.h:

Tools:

• DumpRenderTree/chromium/WebViewHost.cpp:

(WebViewHost::createOutputSurface):
(WebViewHost::initializeLayerTreeView):

Location:

trunk

Files:

• Source/Platform/ChangeLog (modified) (1 diff)
• Source/Platform/chromium/public/WebUnitTestSupport.h (modified) (2 diffs)
• Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp (modified) (1 diff)
• Source/WebKit/chromium/tests/ScrollingCoordinatorChromiumTest.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/chromium/WebViewHost.cpp (modified) (3 diffs)

trunk/Source/Platform/ChangeLog

@@ +1 @@
+2013-02-12  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Request WebLayerTreeView for DumpRenderTree via explicit testing path
+        https://bugs.webkit.org/show_bug.cgi?id=109634
+
+        Reviewed by Adrienne Walker.
+
+        * chromium/public/WebUnitTestSupport.h:
+
 2013-02-13  Eberhard Graether  <egraether@google.com>
 

trunk/Source/Platform/chromium/public/WebUnitTestSupport.h

@@ -33 +33 @@
 
 class WebLayerTreeView;
+class WebLayerTreeViewClient;
 class WebURL;
 class WebURLResponse;
@@ -63 +64 @@
     enum TestViewType {
         TestViewTypeUnitTest,
-        TestViewTypeLayoutTest
+        TestViewTypeLayoutTestSoftware,
+        TestViewTypeLayoutTest3d,
     };
-    virtual WebLayerTreeView* createLayerTreeViewForTesting(TestViewType type) { return 0; }
+    virtual WebLayerTreeView* createLayerTreeViewForTesting(TestViewType, WebLayerTreeViewClient*) { return 0; }
+    virtual WebLayerTreeView* createLayerTreeViewForTesting(TestViewType) { return 0; }
 };
 

trunk/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp

@@ -63 +63 @@
         m_graphicsLayer = adoptPtr(new GraphicsLayerChromium(&m_client));
         m_platformLayer = m_graphicsLayer->platformLayer();
-        m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLayerTreeViewForTesting(WebUnitTestSupport::TestViewTypeUnitTest));
+        m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLayerTreeViewForTesting(WebUnitTestSupport::TestViewTypeUnitTest, 0));
         ASSERT(m_layerTreeView);
         m_layerTreeView->setRootLayer(*m_platformLayer);

trunk/Source/WebKit/chromium/tests/ScrollingCoordinatorChromiumTest.cpp

@@ -60 +60 @@
     virtual void initializeLayerTreeView(WebLayerTreeViewClient* client, const WebLayer& rootLayer, const WebLayerTreeView::Settings& settings)
     {
-        m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLayerTreeViewForTesting(WebUnitTestSupport::TestViewTypeUnitTest));
+        m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLayerTreeViewForTesting(WebUnitTestSupport::TestViewTypeUnitTest, 0));
         ASSERT(m_layerTreeView);
         m_layerTreeView->setRootLayer(rootLayer);

trunk/Tools/ChangeLog

@@ +1 @@
+2013-02-12  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Request WebLayerTreeView for DumpRenderTree via explicit testing path
+        https://bugs.webkit.org/show_bug.cgi?id=109634
+
+        Reviewed by Adrienne Walker.
+
+        * DumpRenderTree/chromium/WebViewHost.cpp:
+        (WebViewHost::createOutputSurface):
+        (WebViewHost::initializeLayerTreeView):
+
 2013-02-13  David Farler  <dfarler@apple.com>
 

trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp

@@ -75 +75 @@
 #include <public/WebURLRequest.h>
 #include <public/WebURLResponse.h>
+#include <public/WebUnitTestSupport.h>
 
 #include <wtf/Assertions.h>
@@ -129 +130 @@
 WebCompositorOutputSurface* WebViewHost::createOutputSurface()
 {
+    // FIXME: Remove when the WebLayerTreeView is provided by WebUnitTestSupport.
     if (!webView())
         return 0;
@@ -331 +333 @@
 void WebViewHost::initializeLayerTreeView(WebLayerTreeViewClient* client, const WebLayer& rootLayer, const WebLayerTreeView::Settings& settings)
 {
-    m_layerTreeView = adoptPtr(Platform::current()->compositorSupport()->createLayerTreeView(client, rootLayer, settings));
-    if (m_layerTreeView)
-        m_layerTreeView->setSurfaceReady();
+    if (m_shell->softwareCompositingEnabled())
+        m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLayerTreeViewForTesting(WebUnitTestSupport::TestViewTypeLayoutTestSoftware, client));
+    else
+        m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLayerTreeViewForTesting(WebUnitTestSupport::TestViewTypeLayoutTest3d, client));
+
+    // FIXME: Remove this path when the unitTestSupport version is implemented in chromium land.
+    if (!m_layerTreeView)
+        m_layerTreeView = adoptPtr(Platform::current()->compositorSupport()->createLayerTreeView(client, rootLayer, settings));
+
+    ASSERT(m_layerTreeView);
+    m_layerTreeView->setRootLayer(rootLayer);
+    m_layerTreeView->setSurfaceReady();
 }