Title: [143547] trunk
- Revision
- 143547
- Author
- jam...@google.com
- Date
- 2013-02-20 18:09:53 -0800 (Wed, 20 Feb 2013)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/Platform/ChangeLog (143546 => 143547)
--- trunk/Source/Platform/ChangeLog 2013-02-21 02:02:24 UTC (rev 143546)
+++ trunk/Source/Platform/ChangeLog 2013-02-21 02:09:53 UTC (rev 143547)
@@ -1,3 +1,12 @@
+2013-02-14 James Robinson <jam...@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-20 Mark Pilgrim <pilg...@chromium.org>
[Chromium] Move WebKitPlatformSupport declaration to Platform.h
Modified: trunk/Source/Platform/chromium/public/WebUnitTestSupport.h (143546 => 143547)
--- trunk/Source/Platform/chromium/public/WebUnitTestSupport.h 2013-02-21 02:02:24 UTC (rev 143546)
+++ trunk/Source/Platform/chromium/public/WebUnitTestSupport.h 2013-02-21 02:09:53 UTC (rev 143547)
@@ -32,6 +32,7 @@
namespace WebKit {
class WebLayerTreeView;
+class WebLayerTreeViewClient;
class WebURL;
class WebURLResponse;
struct WebURLError;
@@ -55,16 +56,17 @@
virtual WebString webKitRootDir() { return WebString(); }
// Constructs a WebLayerTreeView set up with reasonable defaults for
- // testing. A LayerTreeTypeUnitTest view can initialize and perform most
- // operations, but is not capable of rendering pixels. A
- // LayerTreeTypeLayoutTest view can render.
+ // testing.
+ virtual WebLayerTreeView* createLayerTreeViewForTesting() { return 0; }
+
+ // DEPRECATED, use the version above.
#define HAVE_CREATELAYERTREEVIEWFORTESTING 1
enum TestViewType {
TestViewTypeUnitTest,
TestViewTypeLayoutTest
};
- virtual WebLayerTreeView* createLayerTreeViewForTesting(TestViewType type) { return 0; }
+ virtual WebLayerTreeView* createLayerTreeViewForTesting(TestViewType) { return 0; }
};
}
Modified: trunk/Tools/ChangeLog (143546 => 143547)
--- trunk/Tools/ChangeLog 2013-02-21 02:02:24 UTC (rev 143546)
+++ trunk/Tools/ChangeLog 2013-02-21 02:09:53 UTC (rev 143547)
@@ -1,3 +1,14 @@
+2013-02-14 James Robinson <jam...@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-20 Martin Robinson <mrobin...@igalia.com>
[GTK] Re-enable 3D CSS transforms when using build-webkit
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp (143546 => 143547)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2013-02-21 02:02:24 UTC (rev 143546)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2013-02-21 02:09:53 UTC (rev 143547)
@@ -121,18 +121,6 @@
return webkit_support::CreateSessionStorageNamespace(quota);
}
-WebCompositorOutputSurface* WebViewHost::createOutputSurface()
-{
- if (!webView())
- return 0;
-
- if (m_shell->softwareCompositingEnabled())
- return WebKit::Platform::current()->compositorSupport()->createOutputSurfaceForSoftware();
-
- WebGraphicsContext3D* context = webkit_support::CreateGraphicsContext3D(WebGraphicsContext3D::Attributes(), webView());
- return WebKit::Platform::current()->compositorSupport()->createOutputSurfaceFor3D(context);
-}
-
void WebViewHost::didAddMessageToConsole(const WebConsoleMessage& message, const WebString& sourceName, unsigned sourceLine)
{
}
@@ -276,9 +264,14 @@
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(webkit_support::CreateLayerTreeViewSoftware(client));
+ else
+ m_layerTreeView = adoptPtr(webkit_support::CreateLayerTreeView3d(client));
+
+ ASSERT(m_layerTreeView);
+ m_layerTreeView->setRootLayer(rootLayer);
+ m_layerTreeView->setSurfaceReady();
}
WebLayerTreeView* WebViewHost::layerTreeView()
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.h (143546 => 143547)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2013-02-21 02:02:24 UTC (rev 143546)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2013-02-21 02:09:53 UTC (rev 143547)
@@ -132,7 +132,6 @@
virtual WebKit::WebWidget* createPopupMenu(WebKit::WebPopupType);
virtual WebKit::WebWidget* createPopupMenu(const WebKit::WebPopupMenuInfo&);
virtual WebKit::WebStorageNamespace* createSessionStorageNamespace(unsigned quota);
- virtual WebKit::WebCompositorOutputSurface* createOutputSurface();
virtual void didAddMessageToConsole(const WebKit::WebConsoleMessage&, const WebKit::WebString& sourceName, unsigned sourceLine);
virtual void didStartLoading();
virtual void didStopLoading();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
