Unreviewed, rolling out r142841.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 14 Feb 2013 09:16:17 +0000 (09:16 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 14 Feb 2013 09:16:17 +0000 (09:16 +0000)
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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@142860 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/Platform/ChangeLog
Source/Platform/chromium/public/WebUnitTestSupport.h
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp
Source/WebKit/chromium/tests/ScrollingCoordinatorChromiumTest.cpp
Tools/ChangeLog
Tools/DumpRenderTree/chromium/WebViewHost.cpp

index f22c084206a9609a7512413ec1437da76dcd151e..2146d22e84606637e601d1885c761254871cc951 100644 (file)
@@ -1,3 +1,16 @@
+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>
 
         [chromium] Request WebLayerTreeView for DumpRenderTree via explicit testing path
index e1bcfafb2c8b09475fd13d622e8156aebbf2adc1..bb00bda09a746f6a34c1c9d79e1f7894786529da 100644 (file)
@@ -32,7 +32,6 @@
 namespace WebKit {
 
 class WebLayerTreeView;
-class WebLayerTreeViewClient;
 class WebURL;
 class WebURLResponse;
 struct WebURLError;
@@ -63,11 +62,9 @@ public:
 #define HAVE_CREATELAYERTREEVIEWFORTESTING 1
     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; }
 };
 
 }
index a1afafbfe697fcbcdb489a42a3da70b0ee10831b..f7324f134da3e6ddef54111a623bd3c3a342e044 100644 (file)
@@ -1,3 +1,17 @@
+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>
 
         [CSS Filters] Refactor filter outsets into a class
index 6005a871266e2fb7cc2572e55b6b62f5826b0046..26412a57739d5f0d04f568106c2e8ce02ef9c956 100644 (file)
@@ -62,7 +62,7 @@ public:
         Platform::current()->compositorSupport()->initialize(0);
         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);
         m_layerTreeView->setViewportSize(WebSize(1, 1), WebSize(1, 1));
index 3e4b24a641a3bce210aa106e1924a2ec973b740f..2667cb5666932f16716f2dfbf7beb91f87664155 100644 (file)
@@ -59,7 +59,7 @@ public:
 
     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);
     }
index a3468d01fb0c11dcae8b1a8ce5d5ae5c6ed13dad..0734d4d40a75eb1c6873776a917fd1d6245698a3 100644 (file)
@@ -1,3 +1,16 @@
+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>
 
         [EFL][jhbuild] Silence GSettings-related warning.
index 28f4356955ccbbcb3bee70bce3b36493239069ba..5d8fed36bc6866ddbf7cda7fef9499243fb9c6be 100644 (file)
@@ -74,7 +74,6 @@
 #include <public/WebThread.h>
 #include <public/WebURLRequest.h>
 #include <public/WebURLResponse.h>
-#include <public/WebUnitTestSupport.h>
 
 #include <wtf/Assertions.h>
 #include <wtf/OwnArrayPtr.h>
@@ -129,7 +128,6 @@ WebStorageNamespace* WebViewHost::createSessionStorageNamespace(unsigned quota)
 
 WebCompositorOutputSurface* WebViewHost::createOutputSurface()
 {
-    // FIXME: Remove when the WebLayerTreeView is provided by WebUnitTestSupport.
     if (!webView())
         return 0;
 
@@ -325,18 +323,9 @@ void WebViewHost::didAutoResize(const WebSize& newSize)
 
 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();
 }
 
 WebLayerTreeView* WebViewHost::layerTreeView()