Title: [144705] trunk/Tools
- Revision
- 144705
- Author
- [email protected]
- Date
- 2013-03-04 18:34:27 -0800 (Mon, 04 Mar 2013)
Log Message
[chromium] Switch to new webkit_support::CreateLayerTreeView interface
https://bugs.webkit.org/show_bug.cgi?id=111285
Patch by James Robinson <[email protected]> on 2013-03-04
Reviewed by Adrienne Walker.
This removes the need for WebCompositorSupport::initialize and exposes
slightly fewer entry points across the repository boundary.
* DumpRenderTree/chromium/TestShell.cpp:
(TestShell::initialize):
* DumpRenderTree/chromium/TestShell.h:
(TestShell::webCompositorThread):
(TestShell):
* DumpRenderTree/chromium/WebViewHost.cpp:
(WebViewHost::initializeLayerTreeView):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (144704 => 144705)
--- trunk/Tools/ChangeLog 2013-03-05 01:58:41 UTC (rev 144704)
+++ trunk/Tools/ChangeLog 2013-03-05 02:34:27 UTC (rev 144705)
@@ -1,3 +1,21 @@
+2013-03-04 James Robinson <[email protected]>
+
+ [chromium] Switch to new webkit_support::CreateLayerTreeView interface
+ https://bugs.webkit.org/show_bug.cgi?id=111285
+
+ Reviewed by Adrienne Walker.
+
+ This removes the need for WebCompositorSupport::initialize and exposes
+ slightly fewer entry points across the repository boundary.
+
+ * DumpRenderTree/chromium/TestShell.cpp:
+ (TestShell::initialize):
+ * DumpRenderTree/chromium/TestShell.h:
+ (TestShell::webCompositorThread):
+ (TestShell):
+ * DumpRenderTree/chromium/WebViewHost.cpp:
+ (WebViewHost::initializeLayerTreeView):
+
2013-03-04 Roger Fong <[email protected]>
Unreviewed. Get rid of some AppleWin VS2010 build warnings.
Modified: trunk/Tools/DumpRenderTree/chromium/TestShell.cpp (144704 => 144705)
--- trunk/Tools/DumpRenderTree/chromium/TestShell.cpp 2013-03-05 01:58:41 UTC (rev 144704)
+++ trunk/Tools/DumpRenderTree/chromium/TestShell.cpp 2013-03-05 02:34:27 UTC (rev 144705)
@@ -145,7 +145,6 @@
if (m_threadedCompositingEnabled)
m_webCompositorThread = adoptPtr(WebKit::Platform::current()->createThread("Compositor"));
- WebKit::Platform::current()->compositorSupport()->initialize(m_webCompositorThread.get());
createMainWindow();
}
Modified: trunk/Tools/DumpRenderTree/chromium/TestShell.h (144704 => 144705)
--- trunk/Tools/DumpRenderTree/chromium/TestShell.h 2013-03-05 01:58:41 UTC (rev 144704)
+++ trunk/Tools/DumpRenderTree/chromium/TestShell.h 2013-03-05 02:34:27 UTC (rev 144705)
@@ -175,6 +175,8 @@
typedef Vector<WebViewHost*> WindowList;
WindowList windowList() const { return m_windowList; }
+ WebKit::WebThread* webCompositorThread() const { return m_webCompositorThread.get(); }
+
private:
WebViewHost* createNewWindow(const WebKit::WebURL&, DRTDevToolsAgent*, WebTestRunner::WebTestInterfaces*);
void createMainWindow();
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp (144704 => 144705)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2013-03-05 01:58:41 UTC (rev 144704)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2013-03-05 02:34:27 UTC (rev 144705)
@@ -278,10 +278,17 @@
void WebViewHost::initializeLayerTreeView(WebLayerTreeViewClient* client, const WebLayer& rootLayer, const WebLayerTreeView::Settings& settings)
{
m_layerTreeViewClient = adoptPtr(new WebViewHostDRTLayerTreeViewClient(this));
- if (m_shell->softwareCompositingEnabled())
- m_layerTreeView = adoptPtr(webkit_support::CreateLayerTreeViewSoftware(m_layerTreeViewClient.get()));
- else
- m_layerTreeView = adoptPtr(webkit_support::CreateLayerTreeView3d(m_layerTreeViewClient.get()));
+ if (m_shell->softwareCompositingEnabled()) {
+ m_layerTreeView = adoptPtr(webkit_support::CreateLayerTreeView(
+ webkit_support::SOFTWARE_CONTEXT,
+ m_layerTreeViewClient.get(),
+ m_shell->webCompositorThread()));
+ } else {
+ m_layerTreeView = adoptPtr(webkit_support::CreateLayerTreeView(
+ webkit_support::MESA_CONTEXT,
+ m_layerTreeViewClient.get(),
+ m_shell->webCompositorThread()));
+ }
ASSERT(m_layerTreeView);
updateViewportSize();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
