Changeset 142860 in webkit

Timestamp:

02/14/13 01:16:17 (14 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r142841.
​http://trac.webkit.org/changeset/142841
​https://bugs.webkit.org/show_bug.cgi?id=109791

Caused webkit_unit_tests to crash on chromium bots. (Requested
by atwilson_ on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2013-02-14

Source/Platform:

• chromium/public/WebUnitTestSupport.h:

(WebKit):
(WebKit::WebUnitTestSupport::createLayerTreeViewForTesting):

Source/WebKit/chromium:

• tests/GraphicsLayerChromiumTest.cpp:

(WebKit::GraphicsLayerChromiumTest::GraphicsLayerChromiumTest):

• tests/ScrollingCoordinatorChromiumTest.cpp:

(WebKit::FakeWebViewClient::initializeLayerTreeView):

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/ChangeLog (modified) (1 diff)
• 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-14  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r142841.
+        http://trac.webkit.org/changeset/142841
+        https://bugs.webkit.org/show_bug.cgi?id=109791
+
+        Caused webkit_unit_tests to crash on chromium bots. (Requested
+        by atwilson_ on #webkit).
+
+        * chromium/public/WebUnitTestSupport.h:
+        (WebKit):
+        (WebKit::WebUnitTestSupport::createLayerTreeViewForTesting):
+
 2013-02-12  James Robinson  <jamesr@chromium.org>
 

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

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

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-02-14  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r142841.
+        http://trac.webkit.org/changeset/142841
+        https://bugs.webkit.org/show_bug.cgi?id=109791
+
+        Caused webkit_unit_tests to crash on chromium bots. (Requested
+        by atwilson_ on #webkit).
+
+        * tests/GraphicsLayerChromiumTest.cpp:
+        (WebKit::GraphicsLayerChromiumTest::GraphicsLayerChromiumTest):
+        * tests/ScrollingCoordinatorChromiumTest.cpp:
+        (WebKit::FakeWebViewClient::initializeLayerTreeView):
+
 2013-02-13  Max Vujovic  <mvujovic@adobe.com>
 

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, 0));
+        m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLayerTreeViewForTesting(WebUnitTestSupport::TestViewTypeUnitTest));
         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, 0));
+        m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLayerTreeViewForTesting(WebUnitTestSupport::TestViewTypeUnitTest));
         ASSERT(m_layerTreeView);
         m_layerTreeView->setRootLayer(rootLayer);

trunk/Tools/ChangeLog

@@ +1 @@
+2013-02-14  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r142841.
+        http://trac.webkit.org/changeset/142841
+        https://bugs.webkit.org/show_bug.cgi?id=109791
+
+        Caused webkit_unit_tests to crash on chromium bots. (Requested
+        by atwilson_ on #webkit).
+
+        * DumpRenderTree/chromium/WebViewHost.cpp:
+        (WebViewHost::createOutputSurface):
+        (WebViewHost::initializeLayerTreeView):
+
 2013-02-13  Raphael Kubo da Costa  <raphael.kubo.da.costa@intel.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>
@@ -130 +129 @@
 WebCompositorOutputSurface* WebViewHost::createOutputSurface()
 {
-    // FIXME: Remove when the WebLayerTreeView is provided by WebUnitTestSupport.
     if (!webView())
         return 0;
@@ -326 +324 @@
 void WebViewHost::initializeLayerTreeView(WebLayerTreeViewClient* client, const WebLayer& rootLayer, const WebLayerTreeView::Settings& settings)
 {
-    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();
+    m_layerTreeView = adoptPtr(Platform::current()->compositorSupport()->createLayerTreeView(client, rootLayer, settings));
+    if (m_layerTreeView)
+        m_layerTreeView->setSurfaceReady();
 }