[chromium] Fix CCLayerTreeHostTest
authorjamesr@google.com <jamesr@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 Sep 2011 18:43:37 +0000 (18:43 +0000)
committerjamesr@google.com <jamesr@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 Sep 2011 18:43:37 +0000 (18:43 +0000)
commitf71b264450d3e23c44cef43d6e10811a41c07397
treec6b01db498e9da9a225f6f6f4a9e7132c5baf7ee
parent46b8278c02c39dfe26cf31b59370027319256e83
[chromium] Fix CCLayerTreeHostTest
https://bugs.webkit.org/show_bug.cgi?id=67418

Source/WebCore:

This is a minimal set of changes to get CCLayerTreeHostTest
compiling, running and passing with USE_THREADED_COMPOSITING
enabled.

Patch by Iain Merrick <husky@google.com> on 2011-09-16
Reviewed by James Robinson.

* platform/graphics/chromium/ContentLayerChromium.cpp:
(WebCore::ContentLayerChromium::createTextureUpdater):
* platform/graphics/chromium/LayerRendererChromium.cpp:
(WebCore::LayerRendererChromium::LayerRendererChromium):
* platform/graphics/chromium/cc/CCLayerTreeHost.cpp:
(WebCore::CCLayerTreeHost::createLayerTreeHostImpl):
* platform/graphics/chromium/cc/CCLayerTreeHost.h:
* platform/graphics/chromium/cc/CCLayerTreeHostImpl.h:
* platform/graphics/chromium/cc/CCThreadProxy.cpp:
(WebCore::CCThreadProxy::context):
(WebCore::CCThreadProxy::beginFrameAndCommitOnCCThread):
(WebCore::CCThreadProxy::setNeedsCommitAndRedrawOnCCThread):
(WebCore::CCThreadProxy::setNeedsRedrawOnCCThread):

Source/WebKit/chromium:

Fixes needed to compile and link with USE_THREADED_COMPOSITING
enabled, and to pass the basic unit test.

Patch by Iain Merrick <husky@google.com> on 2011-09-16
Reviewed by James Robinson.

* src/GraphicsContext3DChromium.cpp:
(WebCore::GraphicsContext3DPrivate::GraphicsContext3DPrivate):
(WebCore::GraphicsContext3DPrivate::platformLayer):
* src/GraphicsContext3DPrivate.h:
* tests/CCLayerTreeHostTest.cpp:
(TestHooks::beginCommitOnCCThread):
(TestHooks::commitCompleteOnCCThread):
(TestHooks::drawLayersOnCCThread):
(MockLayerTreeHostImpl::MockLayerTreeHostImpl):
(MockLayerTreeHostImpl::beginCommit):
(MockLayerTreeHostImpl::commitComplete):
(MockLayerTreeHostImpl::drawLayers):
(MockLayerTreeHost::MockLayerTreeHost):
(MockLayerTreeHost::createLayerTreeHostImpl):
(CompositorMockWebGraphicsContext3D::makeContextCurrent):
(CompositorMockWebGraphicsContext3D::createProgram):
(CompositorMockWebGraphicsContext3D::createShader):
(CompositorMockWebGraphicsContext3D::getShaderiv):
(CompositorMockWebGraphicsContext3D::getProgramiv):
(MockLayerTreeHostClient::MockLayerTreeHostClient):
(MockLayerTreeHostClient::animateAndLayout):
(MockLayerTreeHostClient::createCompositorThread):
(MockLayerTreeHostClient::createLayerTreeHostContext3D):
(MockLayerTreeHostClient::createRootLayerPainter):
(MockLayerTreeHostClient::didRecreateGraphicsContext):
(CCLayerTreeHostTest::postSetNeedsCommitToMainThread):
(CCLayerTreeHostTest::postSetNeedsRedrawToMainThread):
(CCLayerTreeHostTest::onEndTest):
(CCLayerTreeHostTest::dispatchSetNeedsCommit):
(CCLayerTreeHostTest::dispatchSetNeedsRedraw):
(CCLayerTreeHostTest::runTest):
(CCLayerTreeHostTest::doBeginTest):
(CCLayerTreeHostTestShortlived2::beginTest):
(CCLayerTreeHostTestShortlived3::beginTest):
(CCLayerTreeHostTestCommitingWithContinuousRedraw::beginTest):
(CCLayerTreeHostTestCommitingWithContinuousRedraw::commitCompleteOnCCThread):
(CCLayerTreeHostTestCommitingWithContinuousRedraw::drawLayersOnCCThread):
(CCLayerTreeHostTestSetNeedsCommit1::beginTest):
(CCLayerTreeHostTestSetNeedsCommit1::drawLayersOnCCThread):
(CCLayerTreeHostTestSetNeedsCommit1::commitCompleteOnCCThread):
(CCLayerTreeHostTestSetNeedsCommit2::beginTest):
(CCLayerTreeHostTestSetNeedsCommit2::drawLayersOnCCThread):
(CCLayerTreeHostTestSetNeedsCommit2::commitCompleteOnCCThread):
(CCLayerTreeHostTestSetNeedsRedraw::beginTest):
(CCLayerTreeHostTestSetNeedsRedraw::drawLayersOnCCThread):
(CCLayerTreeHostTestSetNeedsRedraw::commitCompleteOnCCThread):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@95309 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp
Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp
Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h
Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h
Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp