Diff
Modified: trunk/Source/WebCore/ChangeLog (116732 => 116733)
--- trunk/Source/WebCore/ChangeLog 2012-05-11 06:56:59 UTC (rev 116732)
+++ trunk/Source/WebCore/ChangeLog 2012-05-11 07:00:46 UTC (rev 116733)
@@ -1,3 +1,46 @@
+2012-05-11 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r116731.
+ http://trac.webkit.org/changeset/116731
+ https://bugs.webkit.org/show_bug.cgi?id=86178
+
+ Build failure on Chromium-mac (Requested by tkent on #webkit).
+
+ * platform/graphics/chromium/LayerRendererChromium.cpp:
+ (WebCore::LayerRendererChromium::create):
+ (WebCore::LayerRendererChromium::LayerRendererChromium):
+ (WebCore::LayerRendererChromium::initializeSharedObjects):
+ * platform/graphics/chromium/LayerRendererChromium.h:
+ (LayerRendererChromium):
+ * platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
+ (WebCore::CCLayerTreeHostImpl::initializeLayerRenderer):
+ * platform/graphics/chromium/cc/CCLayerTreeHostImpl.h:
+ (CCLayerTreeHostImpl):
+ * platform/graphics/chromium/cc/CCSingleThreadProxy.cpp:
+ (UnthrottledTextureUploader):
+ (WebCore::UnthrottledTextureUploader::create):
+ (WebCore::UnthrottledTextureUploader::~UnthrottledTextureUploader):
+ (WebCore::UnthrottledTextureUploader::isBusy):
+ (WebCore::UnthrottledTextureUploader::beginUploads):
+ (WebCore::UnthrottledTextureUploader::endUploads):
+ (WebCore::UnthrottledTextureUploader::uploadTexture):
+ (WebCore::UnthrottledTextureUploader::UnthrottledTextureUploader):
+ (WebCore):
+ (WebCore::CCSingleThreadProxy::initializeLayerRenderer):
+ (WebCore::CCSingleThreadProxy::recreateContext):
+ * platform/graphics/chromium/cc/CCThreadProxy.cpp:
+ (WebCore):
+ (UnthrottledTextureUploader):
+ (WebCore::UnthrottledTextureUploader::create):
+ (WebCore::UnthrottledTextureUploader::~UnthrottledTextureUploader):
+ (WebCore::UnthrottledTextureUploader::isBusy):
+ (WebCore::UnthrottledTextureUploader::beginUploads):
+ (WebCore::UnthrottledTextureUploader::endUploads):
+ (WebCore::UnthrottledTextureUploader::uploadTexture):
+ (WebCore::UnthrottledTextureUploader::UnthrottledTextureUploader):
+ (WebCore::CCThreadProxy::initializeLayerRendererOnImplThread):
+ (WebCore::CCThreadProxy::recreateContextOnImplThread):
+
2012-05-10 David Reveman <reve...@chromium.org>
[Chromium] Move instantiation of texture uploader to LayerRendererChromium.
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp (116732 => 116733)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2012-05-11 06:56:59 UTC (rev 116732)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2012-05-11 07:00:46 UTC (rev 116733)
@@ -143,24 +143,6 @@
#endif
}
-class UnthrottledTextureUploader : public TextureUploader {
- WTF_MAKE_NONCOPYABLE(UnthrottledTextureUploader);
-public:
- static PassOwnPtr<UnthrottledTextureUploader> create()
- {
- return adoptPtr(new UnthrottledTextureUploader());
- }
- virtual ~UnthrottledTextureUploader() { }
-
- virtual bool isBusy() { return false; }
- virtual void beginUploads() { }
- virtual void endUploads() { }
- virtual void uploadTexture(GraphicsContext3D* context, LayerTextureUpdater::Texture* texture, TextureAllocator* allocator, const IntRect sourceRect, const IntRect destRect) { texture->updateRect(context, allocator, sourceRect, destRect); }
-
-protected:
- UnthrottledTextureUploader() { }
-};
-
} // anonymous namespace
class LayerRendererSwapBuffersCompleteCallbackAdapter : public Extensions3DChromium::SwapBuffersCompleteCallbackCHROMIUM {
@@ -212,9 +194,9 @@
};
-PassOwnPtr<LayerRendererChromium> LayerRendererChromium::create(LayerRendererChromiumClient* client, PassRefPtr<GraphicsContext3D> context, TextureUploaderOption textureUploaderSetting)
+PassOwnPtr<LayerRendererChromium> LayerRendererChromium::create(LayerRendererChromiumClient* client, PassRefPtr<GraphicsContext3D> context, PassOwnPtr<TextureUploader> uploader)
{
- OwnPtr<LayerRendererChromium> layerRenderer(adoptPtr(new LayerRendererChromium(client, context, textureUploaderSetting)));
+ OwnPtr<LayerRendererChromium> layerRenderer(adoptPtr(new LayerRendererChromium(client, context, uploader)));
if (!layerRenderer->initialize())
return nullptr;
@@ -223,17 +205,17 @@
LayerRendererChromium::LayerRendererChromium(LayerRendererChromiumClient* client,
PassRefPtr<GraphicsContext3D> context,
- TextureUploaderOption textureUploaderSetting)
+ PassOwnPtr<TextureUploader> uploader)
: m_client(client)
, m_currentRenderSurface(0)
, m_currentManagedTexture(0)
, m_offscreenFramebufferId(0)
+ , m_textureUploader(uploader)
, m_context(context)
, m_defaultRenderSurface(0)
, m_sharedGeometryQuad(FloatRect(-0.5f, -0.5f, 1.0f, 1.0f))
, m_isViewportChanged(false)
, m_isFramebufferDiscarded(false)
- , m_textureUploaderSetting(m_textureUploaderSetting)
{
}
@@ -1400,10 +1382,6 @@
TextureManager::reclaimLimitBytes(viewportSize()),
m_capabilities.maxTextureSize);
m_textureCopier = AcceleratedTextureCopier::create(m_context.get());
- if (m_textureUploaderSetting == ThrottledUploader)
- m_textureUploader = ThrottledTextureUploader::create(m_context.get());
- else
- m_textureUploader = UnthrottledTextureUploader::create();
m_contentsTextureAllocator = TrackingTextureAllocator::create(m_context.get());
m_renderSurfaceTextureAllocator = TrackingTextureAllocator::create(m_context.get());
if (m_capabilities.usingTextureUsageHint)
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h (116732 => 116733)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h 2012-05-11 06:56:59 UTC (rev 116732)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h 2012-05-11 07:00:46 UTC (rev 116733)
@@ -74,13 +74,11 @@
virtual void setContentsMemoryAllocationLimitBytes(size_t) = 0;
};
-enum TextureUploaderOption { ThrottledUploader, UnthrottledUploader };
-
// Class that handles drawing of composited render layers using GL.
class LayerRendererChromium {
WTF_MAKE_NONCOPYABLE(LayerRendererChromium);
public:
- static PassOwnPtr<LayerRendererChromium> create(LayerRendererChromiumClient*, PassRefPtr<GraphicsContext3D>, TextureUploaderOption);
+ static PassOwnPtr<LayerRendererChromium> create(LayerRendererChromiumClient*, PassRefPtr<GraphicsContext3D>, PassOwnPtr<TextureUploader>);
~LayerRendererChromium();
@@ -146,7 +144,7 @@
void ensureFramebuffer();
bool isFramebufferDiscarded() const { return m_isFramebufferDiscarded; }
- LayerRendererChromium(LayerRendererChromiumClient*, PassRefPtr<GraphicsContext3D>, TextureUploaderOption);
+ LayerRendererChromium(LayerRendererChromiumClient*, PassRefPtr<GraphicsContext3D>, PassOwnPtr<TextureUploader>);
bool initialize();
private:
@@ -300,7 +298,6 @@
bool m_isViewportChanged;
bool m_isFramebufferDiscarded;
- TextureUploaderOption m_textureUploaderSetting;
};
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp (116732 => 116733)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp 2012-05-11 06:56:59 UTC (rev 116732)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp 2012-05-11 07:00:46 UTC (rev 116733)
@@ -526,10 +526,10 @@
m_timeSourceClientAdapter->setActive(shouldTickInBackground);
}
-bool CCLayerTreeHostImpl::initializeLayerRenderer(PassRefPtr<GraphicsContext3D> context, TextureUploaderOption textureUploader)
+bool CCLayerTreeHostImpl::initializeLayerRenderer(PassRefPtr<GraphicsContext3D> context, PassOwnPtr<TextureUploader> uploader)
{
OwnPtr<LayerRendererChromium> layerRenderer;
- layerRenderer = LayerRendererChromium::create(this, context, textureUploader);
+ layerRenderer = LayerRendererChromium::create(this, context, uploader);
// Since we now have a new context/layerRenderer, we cannot continue to use the old
// resources (i.e. renderSurfaces and texture IDs).
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h (116732 => 116733)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h 2012-05-11 06:56:59 UTC (rev 116732)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h 2012-05-11 07:00:46 UTC (rev 116733)
@@ -122,7 +122,7 @@
void finishAllRendering();
int frameNumber() const { return m_frameNumber; }
- bool initializeLayerRenderer(PassRefPtr<GraphicsContext3D>, TextureUploaderOption);
+ bool initializeLayerRenderer(PassRefPtr<GraphicsContext3D>, PassOwnPtr<TextureUploader>);
bool isContextLost();
LayerRendererChromium* layerRenderer() { return m_layerRenderer.get(); }
const LayerRendererCapabilities& layerRendererCapabilities() const;
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp (116732 => 116733)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp 2012-05-11 06:56:59 UTC (rev 116732)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp 2012-05-11 07:00:46 UTC (rev 116733)
@@ -38,6 +38,24 @@
namespace WebCore {
+class UnthrottledTextureUploader : public TextureUploader {
+ WTF_MAKE_NONCOPYABLE(UnthrottledTextureUploader);
+public:
+ static PassOwnPtr<UnthrottledTextureUploader> create()
+ {
+ return adoptPtr(new UnthrottledTextureUploader());
+ }
+ virtual ~UnthrottledTextureUploader() { }
+
+ virtual bool isBusy() { return false; }
+ virtual void beginUploads() { }
+ virtual void endUploads() { }
+ virtual void uploadTexture(GraphicsContext3D* context, LayerTextureUpdater::Texture* texture, TextureAllocator* allocator, const IntRect sourceRect, const IntRect destRect) { texture->updateRect(context, allocator, sourceRect, destRect); }
+
+protected:
+ UnthrottledTextureUploader() { }
+};
+
PassOwnPtr<CCProxy> CCSingleThreadProxy::create(CCLayerTreeHost* layerTreeHost)
{
return adoptPtr(new CCSingleThreadProxy(layerTreeHost));
@@ -137,7 +155,7 @@
ASSERT(m_contextBeforeInitialization);
{
DebugScopedSetImplThread impl;
- bool ok = m_layerTreeHostImpl->initializeLayerRenderer(m_contextBeforeInitialization.release(), UnthrottledUploader);
+ bool ok = m_layerTreeHostImpl->initializeLayerRenderer(m_contextBeforeInitialization.release(), UnthrottledTextureUploader::create());
if (ok) {
m_layerRendererInitialized = true;
m_layerRendererCapabilitiesForMainThread = m_layerTreeHostImpl->layerRendererCapabilities();
@@ -161,7 +179,7 @@
{
DebugScopedSetImplThread impl;
m_layerTreeHost->deleteContentsTexturesOnImplThread(m_layerTreeHostImpl->contentsTextureAllocator());
- initialized = m_layerTreeHostImpl->initializeLayerRenderer(context, UnthrottledUploader);
+ initialized = m_layerTreeHostImpl->initializeLayerRenderer(context, UnthrottledTextureUploader::create());
if (initialized) {
m_layerRendererCapabilitiesForMainThread = m_layerTreeHostImpl->layerRendererCapabilities();
}
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp (116732 => 116733)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp 2012-05-11 06:56:59 UTC (rev 116732)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp 2012-05-11 07:00:46 UTC (rev 116733)
@@ -57,12 +57,24 @@
namespace WebCore {
-namespace {
+// FIXME: remove when ThrottledTextureUploader is ready to be used.
+class UnthrottledTextureUploader : public TextureUploader {
+ WTF_MAKE_NONCOPYABLE(UnthrottledTextureUploader);
+public:
+ static PassOwnPtr<UnthrottledTextureUploader> create(PassRefPtr<GraphicsContext3D> context)
+ {
+ return adoptPtr(new UnthrottledTextureUploader(context));
+ }
+ virtual ~UnthrottledTextureUploader() { }
-// FIXME: Use ThrottledUploader by default.
-static TextureUploaderOption textureUploader = UnthrottledUploader;
+ virtual bool isBusy() { return false; }
+ virtual void beginUploads() { }
+ virtual void endUploads() { }
+ virtual void uploadTexture(GraphicsContext3D* context, LayerTextureUpdater::Texture* texture, TextureAllocator* allocator, const IntRect sourceRect, const IntRect destRect) { texture->updateRect(context, allocator, sourceRect, destRect); }
-} // anonymous namespace
+protected:
+ explicit UnthrottledTextureUploader(PassRefPtr<GraphicsContext3D>) { }
+};
PassOwnPtr<CCProxy> CCThreadProxy::create(CCLayerTreeHost* layerTreeHost)
{
@@ -822,7 +834,8 @@
TRACE_EVENT("CCThreadProxy::initializeLayerRendererOnImplThread", this, 0);
ASSERT(isImplThread());
ASSERT(m_contextBeforeInitializationOnImplThread);
- *initializeSucceeded = m_layerTreeHostImpl->initializeLayerRenderer(m_contextBeforeInitializationOnImplThread.release(), textureUploader);
+ OwnPtr<TextureUploader> uploader = UnthrottledTextureUploader::create(m_contextBeforeInitializationOnImplThread.get());
+ *initializeSucceeded = m_layerTreeHostImpl->initializeLayerRenderer(m_contextBeforeInitializationOnImplThread.release(), uploader.release());
if (*initializeSucceeded) {
*capabilities = m_layerTreeHostImpl->layerRendererCapabilities();
if (capabilities->usingSwapCompleteCallback)
@@ -872,7 +885,8 @@
TRACE_EVENT0("cc", "CCThreadProxy::recreateContextOnImplThread");
ASSERT(isImplThread());
m_layerTreeHost->deleteContentsTexturesOnImplThread(m_layerTreeHostImpl->contentsTextureAllocator());
- *recreateSucceeded = m_layerTreeHostImpl->initializeLayerRenderer(adoptRef(contextPtr), textureUploader);
+ OwnPtr<TextureUploader> uploader = UnthrottledTextureUploader::create(contextPtr);
+ *recreateSucceeded = m_layerTreeHostImpl->initializeLayerRenderer(adoptRef(contextPtr), uploader.release());
if (*recreateSucceeded) {
*capabilities = m_layerTreeHostImpl->layerRendererCapabilities();
m_schedulerOnImplThread->didRecreateContext();
Modified: trunk/Source/WebKit/chromium/ChangeLog (116732 => 116733)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-05-11 06:56:59 UTC (rev 116732)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-05-11 07:00:46 UTC (rev 116733)
@@ -1,3 +1,19 @@
+2012-05-11 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r116731.
+ http://trac.webkit.org/changeset/116731
+ https://bugs.webkit.org/show_bug.cgi?id=86178
+
+ Build failure on Chromium-mac (Requested by tkent on #webkit).
+
+ * tests/CCLayerTreeHostImplTest.cpp:
+ (WebKitTests::CCLayerTreeHostImplTest::CCLayerTreeHostImplTest):
+ (WebKitTests::TEST_F):
+ * tests/LayerRendererChromiumTest.cpp:
+ (FakeLayerRendererChromium::FakeLayerRendererChromium):
+ (LayerRendererChromiumTest::LayerRendererChromiumTest):
+ (TEST):
+
2012-05-10 David Reveman <reve...@chromium.org>
[Chromium] Move instantiation of texture uploader to LayerRendererChromium.
Modified: trunk/Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp (116732 => 116733)
--- trunk/Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp 2012-05-11 06:56:59 UTC (rev 116732)
+++ trunk/Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp 2012-05-11 07:00:46 UTC (rev 116733)
@@ -28,6 +28,7 @@
#include "CCAnimationTestCommon.h"
#include "CCLayerTestCommon.h"
+#include "CCTiledLayerTestCommon.h"
#include "FakeWebGraphicsContext3D.h"
#include "GraphicsContext3DPrivate.h"
#include "LayerRendererChromium.h"
@@ -59,7 +60,7 @@
{
CCSettings settings;
m_hostImpl = CCLayerTreeHostImpl::create(settings, this);
- m_hostImpl->initializeLayerRenderer(createContext(), UnthrottledUploader);
+ m_hostImpl->initializeLayerRenderer(createContext(), adoptPtr(new FakeTextureUploader));
m_hostImpl->setViewportSize(IntSize(10, 10));
}
@@ -875,7 +876,7 @@
TEST_F(CCLayerTreeHostImplTest, viewportCovered)
{
- m_hostImpl->initializeLayerRenderer(createContext(), UnthrottledUploader);
+ m_hostImpl->initializeLayerRenderer(createContext(), adoptPtr(new FakeTextureUploader));
m_hostImpl->setBackgroundColor(Color::gray);
IntSize viewportSize(1000, 1000);
@@ -986,7 +987,7 @@
{
ReshapeTrackerContext* reshapeTracker = new ReshapeTrackerContext();
RefPtr<GraphicsContext3D> context = GraphicsContext3DPrivate::createGraphicsContextFromWebContext(adoptPtr(reshapeTracker), GraphicsContext3D::RenderDirectlyToHostWindow);
- m_hostImpl->initializeLayerRenderer(context, UnthrottledUploader);
+ m_hostImpl->initializeLayerRenderer(context, adoptPtr(new FakeTextureUploader));
CCLayerImpl* root = new FakeDrawableCCLayerImpl(1);
root->setAnchorPoint(FloatPoint(0, 0));
@@ -1035,7 +1036,7 @@
CCSettings settings;
settings.partialSwapEnabled = true;
OwnPtr<CCLayerTreeHostImpl> layerTreeHostImpl = CCLayerTreeHostImpl::create(settings, this);
- layerTreeHostImpl->initializeLayerRenderer(context, UnthrottledUploader);
+ layerTreeHostImpl->initializeLayerRenderer(context, adoptPtr(new FakeTextureUploader()));
layerTreeHostImpl->setViewportSize(IntSize(500, 500));
CCLayerImpl* root = new FakeDrawableCCLayerImpl(1);
@@ -1134,7 +1135,7 @@
EXPECT_FALSE(layer1->didLoseContextCalled());
EXPECT_FALSE(layer2->didLoseContextCalled());
- m_hostImpl->initializeLayerRenderer(createContext(), UnthrottledUploader);
+ m_hostImpl->initializeLayerRenderer(createContext(), adoptPtr(new FakeTextureUploader));
EXPECT_TRUE(root->didLoseContextCalled());
EXPECT_TRUE(layer1->didLoseContextCalled());
@@ -1149,7 +1150,7 @@
TEST_F(CCLayerTreeHostImplTest, finishAllRenderingAfterContextLost)
{
// The context initialization will fail, but we should still be able to call finishAllRendering() without any ill effects.
- m_hostImpl->initializeLayerRenderer(GraphicsContext3DPrivate::createGraphicsContextFromWebContext(adoptPtr(new FakeWebGraphicsContext3DMakeCurrentFails), GraphicsContext3D::RenderDirectlyToHostWindow), UnthrottledUploader);
+ m_hostImpl->initializeLayerRenderer(GraphicsContext3DPrivate::createGraphicsContextFromWebContext(adoptPtr(new FakeWebGraphicsContext3DMakeCurrentFails), GraphicsContext3D::RenderDirectlyToHostWindow), adoptPtr(new FakeTextureUploader));
m_hostImpl->finishAllRendering();
}
@@ -1179,7 +1180,7 @@
// Scrollbar layer should always generate quads, even after lost context
EXPECT_GT(renderPass->quadList().size(), 0u);
m_hostImpl->didDrawAllLayers(frame);
- m_hostImpl->initializeLayerRenderer(createContext(), UnthrottledUploader);
+ m_hostImpl->initializeLayerRenderer(createContext(), adoptPtr(new FakeTextureUploader));
}
}
@@ -1354,7 +1355,7 @@
// Lose the context, replacing it with a StrictWebGraphicsContext3D, that
// will warn if any resource from the previous context gets used.
- m_hostImpl->initializeLayerRenderer(StrictWebGraphicsContext3D::createGraphicsContext(), UnthrottledUploader);
+ m_hostImpl->initializeLayerRenderer(StrictWebGraphicsContext3D::createGraphicsContext(), adoptPtr(new FakeTextureUploader));
EXPECT_TRUE(m_hostImpl->prepareToDraw(frame));
m_hostImpl->drawLayers(frame);
m_hostImpl->didDrawAllLayers(frame);
Modified: trunk/Source/WebKit/chromium/tests/LayerRendererChromiumTest.cpp (116732 => 116733)
--- trunk/Source/WebKit/chromium/tests/LayerRendererChromiumTest.cpp 2012-05-11 06:56:59 UTC (rev 116732)
+++ trunk/Source/WebKit/chromium/tests/LayerRendererChromiumTest.cpp 2012-05-11 07:00:46 UTC (rev 116733)
@@ -25,6 +25,7 @@
#include "config.h"
#include "LayerRendererChromium.h"
+#include "CCTiledLayerTestCommon.h"
#include "FakeWebGraphicsContext3D.h"
#include "GraphicsContext3D.h"
#include "GraphicsContext3DPrivate.h"
@@ -35,6 +36,7 @@
using namespace WebCore;
using namespace WebKit;
+using namespace WebKitTests;
class FrameCountingMemoryAllocationSettingContext : public FakeWebGraphicsContext3D {
public:
@@ -91,7 +93,7 @@
class FakeLayerRendererChromium : public LayerRendererChromium {
public:
- FakeLayerRendererChromium(LayerRendererChromiumClient* client, PassRefPtr<GraphicsContext3D> context) : LayerRendererChromium(client, context, UnthrottledUploader) { }
+ FakeLayerRendererChromium(LayerRendererChromiumClient* client, PassRefPtr<GraphicsContext3D> context, PassOwnPtr<TextureUploader> uploader) : LayerRendererChromium(client, context, uploader) { }
// LayerRendererChromium methods.
@@ -107,7 +109,7 @@
, m_suggestHaveBackbufferNo(1, false)
, m_context(GraphicsContext3DPrivate::createGraphicsContextFromWebContext(adoptPtr(new FrameCountingMemoryAllocationSettingContext()), GraphicsContext3D::RenderDirectlyToHostWindow))
, m_mockContext(*static_cast<FrameCountingMemoryAllocationSettingContext*>(GraphicsContext3DPrivate::extractWebGraphicsContext3D(m_context.get())))
- , m_layerRendererChromium(&m_mockClient, m_context.release())
+ , m_layerRendererChromium(&m_mockClient, m_context.release(), adoptPtr(new FakeTextureUploader()))
{
}
@@ -271,7 +273,7 @@
TEST(LayerRendererChromiumTest2, initializationDoesNotMakeSynchronousCalls)
{
FakeLayerRendererChromiumClient mockClient;
- FakeLayerRendererChromium layerRendererChromium(&mockClient, GraphicsContext3DPrivate::createGraphicsContextFromWebContext(adoptPtr(new ForbidSynchronousCallContext), GraphicsContext3D::RenderDirectlyToHostWindow));
+ FakeLayerRendererChromium layerRendererChromium(&mockClient, GraphicsContext3DPrivate::createGraphicsContextFromWebContext(adoptPtr(new ForbidSynchronousCallContext), GraphicsContext3D::RenderDirectlyToHostWindow), adoptPtr(new FakeTextureUploader()));
EXPECT_TRUE(layerRendererChromium.initialize());
}
