| Index: cc/software_renderer.cc
|
| diff --git a/cc/software_renderer.cc b/cc/software_renderer.cc
|
| index 05b7a11225255a96894dfcdccc2da475c8f3d05f..8714b39ec1eaadf036765f1651559511a563db7d 100644
|
| --- a/cc/software_renderer.cc
|
| +++ b/cc/software_renderer.cc
|
| @@ -65,13 +65,14 @@ bool isScaleAndTranslate(const SkMatrix& matrix)
|
|
|
| } // anonymous namespace
|
|
|
| -scoped_ptr<SoftwareRenderer> SoftwareRenderer::create(RendererClient* client, ResourceProvider* resourceProvider, WebCompositorSoftwareOutputDevice* outputDevice)
|
| +scoped_ptr<SoftwareRenderer> SoftwareRenderer::create(RendererClient* client, ResourceProvider* resourceProvider, WebCompositorSoftwareOutputDevice* outputDevice, bool hasImplThread)
|
| {
|
| - return make_scoped_ptr(new SoftwareRenderer(client, resourceProvider, outputDevice));
|
| + return make_scoped_ptr(new SoftwareRenderer(client, resourceProvider, outputDevice, hasImplThread));
|
| }
|
|
|
| -SoftwareRenderer::SoftwareRenderer(RendererClient* client, ResourceProvider* resourceProvider, WebCompositorSoftwareOutputDevice* outputDevice)
|
| +SoftwareRenderer::SoftwareRenderer(RendererClient* client, ResourceProvider* resourceProvider, WebCompositorSoftwareOutputDevice* outputDevice, bool hasImplThread)
|
| : DirectRenderer(client, resourceProvider)
|
| + , m_hasImplThread(hasImplThread)
|
| , m_visible(true)
|
| , m_outputDevice(outputDevice)
|
| , m_skCurrentCanvas(0)
|
| @@ -333,7 +334,7 @@ void SoftwareRenderer::drawUnsupportedQuad(const DrawingFrame& frame, const Draw
|
|
|
| bool SoftwareRenderer::swapBuffers()
|
| {
|
| - if (Proxy::hasImplThread())
|
| + if (m_hasImplThread)
|
| m_client->onSwapBuffersComplete();
|
| return true;
|
| }
|
|
|