[chromium] Enable threaded compositing via CCThreadProxy::hasThread only
authornduca@chromium.org <nduca@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Nov 2011 02:09:26 +0000 (02:09 +0000)
committernduca@chromium.org <nduca@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Nov 2011 02:09:26 +0000 (02:09 +0000)
commitd961349e49edbf03980ca463a43f689704c9ad22
tree849cfb0d39829a90ae52df73f3eb14b09d20117a
parent1408e6e038828da2234cbc2202fb0714b4012e28
[chromium] Enable threaded compositing via CCThreadProxy::hasThread only
https://bugs.webkit.org/show_bug.cgi?id=70838

Reviewed by James Robinson.

Source/WebCore:

* platform/graphics/chromium/LayerRendererChromium.cpp:
(WebCore::LayerRendererChromium::initialize):
* platform/graphics/chromium/WebGLLayerChromium.cpp:
(WebCore::WebGLLayerChromium::layerRendererContext):
* platform/graphics/chromium/cc/CCHeadsUpDisplay.cpp:
(WebCore::CCHeadsUpDisplay::enabled):
* platform/graphics/chromium/cc/CCLayerTreeHost.cpp:
(WebCore::CCLayerTreeHost::initialize):
(WebCore::CCLayerTreeHost::context):
(WebCore::CCLayerTreeHost::setNeedsAnimate):
(WebCore::CCLayerTreeHost::setNeedsCommit):
(WebCore::CCLayerTreeHost::setNeedsRedraw):
(WebCore::CCLayerTreeHost::composite):
* platform/graphics/chromium/cc/CCLayerTreeHost.h:
(WebCore::CCSettings::CCSettings):
* platform/graphics/chromium/cc/CCProxy.cpp:
(WebCore::CCProxy::isMainThread):
(WebCore::CCProxy::isImplThread):
(WebCore::CCProxy::setMainThreadIsImplThread):
* platform/graphics/chromium/cc/CCProxy.h:
* platform/graphics/chromium/cc/CCSingleThreadProxy.h:
(WebCore::DebugScopedSetImplThread::DebugScopedSetImplThread):
(WebCore::DebugScopedSetImplThread::~DebugScopedSetImplThread):

Source/WebKit/chromium:

* public/WebCompositor.h:
* public/WebLayerTreeView.h:
(WebKit::WebLayerTreeView::Settings::Settings):
* public/WebSettings.h:
* src/WebCompositorImpl.cpp:
(WebKit::WebCompositor::initialize):
(WebKit::WebCompositor::shutdown):
(WebKit::WebCompositor::fromIdentifier):
* src/WebKit.cpp:
(WebKit::initializeWithoutV8):
* src/WebLayerTreeView.cpp:
(WebKit::WebLayerTreeView::Settings::operator CCSettings):
(WebKit::WebLayerTreeView::composite):
* src/WebLayerTreeViewImpl.cpp:
(WebKit::WebLayerTreeViewImpl::createLayerTreeHostContext3D):
* src/WebSettingsImpl.cpp:
(WebKit::WebSettingsImpl::WebSettingsImpl):
* src/WebSettingsImpl.h:
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::animate):
(WebKit::WebViewImpl::composite):
(WebKit::WebViewImpl::scheduleAnimation):
(WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
(WebKit::WebViewImpl::createLayerTreeHostContext3D):
(WebKit::WebViewImpl::scheduleComposite):
(WebKit::WebViewImpl::graphicsContext3D):
* tests/CCLayerTreeHostTest.cpp:
(WTF::CCLayerTreeHostTest::CCLayerTreeHostTest):
(WTF::CCLayerTreeHostTest::runTest):

Tools:

* DumpRenderTree/chromium/TestShell.cpp:
(TestShell::resetWebSettings):
* DumpRenderTree/chromium/TestShell.h:
(TestShell::threadedCompositingEnabled):
* DumpRenderTree/chromium/WebPreferences.cpp:
(WebPreferences::reset):
(WebPreferences::applyTo):
* DumpRenderTree/chromium/WebPreferences.h:
* DumpRenderTree/chromium/WebViewHost.cpp:
(WebViewHost::WebViewHost):
(WebViewHost::~WebViewHost):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@101440 268f45cc-cd09-0410-ab3c-d52691b4dbfc
36 files changed:
Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp
Source/WebCore/platform/graphics/chromium/WebGLLayerChromium.cpp
Source/WebCore/platform/graphics/chromium/cc/CCHeadsUpDisplay.cpp
Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp
Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h
Source/WebCore/platform/graphics/chromium/cc/CCProxy.cpp
Source/WebCore/platform/graphics/chromium/cc/CCProxy.h
Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.h
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/WebKit.gyp
Source/WebKit/chromium/WebKit.gypi
Source/WebKit/chromium/public/WebCompositor.h
Source/WebKit/chromium/public/WebCompositorClient.h
Source/WebKit/chromium/public/WebCompositorInputHandler.h [new file with mode: 0644]
Source/WebKit/chromium/public/WebCompositorInputHandlerClient.h [new file with mode: 0644]
Source/WebKit/chromium/public/WebLayerTreeView.h
Source/WebKit/chromium/public/WebSettings.h
Source/WebKit/chromium/src/WebCompositorImpl.cpp
Source/WebKit/chromium/src/WebCompositorImpl.h
Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.cpp [new file with mode: 0644]
Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.h [new file with mode: 0644]
Source/WebKit/chromium/src/WebKit.cpp
Source/WebKit/chromium/src/WebLayerTreeView.cpp
Source/WebKit/chromium/src/WebLayerTreeViewImpl.cpp
Source/WebKit/chromium/src/WebSettingsImpl.cpp
Source/WebKit/chromium/src/WebSettingsImpl.h
Source/WebKit/chromium/src/WebViewImpl.cpp
Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp
Source/WebKit/chromium/tests/WebCompositorInputHandlerImplTest.cpp [moved from Source/WebKit/chromium/tests/WebCompositorImplTest.cpp with 63% similarity]
Tools/ChangeLog
Tools/DumpRenderTree/chromium/TestShell.cpp
Tools/DumpRenderTree/chromium/TestShell.h
Tools/DumpRenderTree/chromium/WebPreferences.cpp
Tools/DumpRenderTree/chromium/WebPreferences.h
Tools/DumpRenderTree/chromium/WebViewHost.cpp