Have a common implementation of cc::OutputSurface

Have a common implementation of cc::OutputSurface instead of multiple duplicated ones.

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=182345

[slavi, 2013-01-24 00:30:49]

This is some clean up work. 

It's a spin off patch of https://codereview.chromium.org/11967033/ to make the
review process easier for reviewers.

[danakj, 2013-01-24 00:42:37]

Why OutputSurfaceImpl? Why not just put that into OutputSurface? Usually you
don't inherit from an "impl" class I thought.

+jamesr cuz I feel he may have opinions about inheriting from a non-virtual
OutputSurface.

[jamesr, 2013-01-24 00:48:50]

The reason for having any virtual stuff associated with
WebCompositorOutputSurface at all is so we can pass one through the WebKit API,
IIUC.  For the content/ embedding of cc, we shouldn't need the trip through
WebKit any more due to
https://src.chromium.org/viewvc/chrome?view=rev&revision=178256, so maybe we can
get rid of that indirection.  Maybe we should do that first?

Figuring out DRT will be tricky, as it always is, but should be solvable.

[slavi, 2013-01-24 00:49:40]

On 2013/01/24 00:42:37, danakj wrote:
> Why OutputSurfaceImpl? Why not just put that into OutputSurface? Usually you
> don't inherit from an "impl" class I thought.
> 
> +jamesr cuz I feel he may have opinions about inheriting from a non-virtual
> OutputSurface.

Because I wanted to keep OutputSurface a pure interface and I didn't want to
enforce a base implementation to implementers of the OutputSurface interface.

At the time of writing, it didn't occur to me that all implementations will end
up to be identical base.

I did something similar to SoftwareOutputDevice and SoftwareOutputDeviceImpl
(see https://codereview.chromium.org/11967033/) since I can imagine an
implementation of SoftwareOutputDevice interface that does it completely
different than the SoftwareOutputDeviceImpl implementation.

[jamesr, 2013-01-24 00:49:45]

What duplicate code is this removing?  It seems to mostly just move things

[nduca, 2013-01-24 00:58:01]

Should cleanups wait until 25 is done?

[slavi, 2013-01-24 01:54:22]

Removed OutputSurfaceImpl.

PTAL

[danakj, 2013-01-24 02:03:06]

https://codereview.chromium.org/12041062/diff/17002/cc/gl_renderer_pixeltest.cc
File cc/gl_renderer_pixeltest.cc (right):

https://codereview.chromium.org/12041062/diff/17002/cc/gl_renderer_pixeltest....
cc/gl_renderer_pixeltest.cc:61: CHECK(context3d.get() == NULL);
You don't need this unless you're trying to verify the behaviour of PassAs() on
the line above :). It will set the local variable to NULL always.

https://codereview.chromium.org/12041062/diff/17002/cc/output_surface.h
File cc/output_surface.h (right):

https://codereview.chromium.org/12041062/diff/17002/cc/output_surface.h#newco...
cc/output_surface.h:46: const Capabilities& Capabilities() const;
make this inline and named capabilities() since it's not virtual now.

https://codereview.chromium.org/12041062/diff/17002/cc/output_surface.h#newco...
cc/output_surface.h:52: WebKit::WebGraphicsContext3D* Context3D() const;
make this inline and named context3d() since not virtual

https://codereview.chromium.org/12041062/diff/17002/cc/output_surface.h#newco...
cc/output_surface.h:53: SoftwareOutputDevice* SoftwareDevice() const;
inline software_device()

https://codereview.chromium.org/12041062/diff/17002/cc/output_surface.h#newco...
cc/output_surface.h:64: virtual void
SendFrameToParentCompositor(CompositorFrame*) {}
Would NOTREACHED() be appropriate here?

https://codereview.chromium.org/12041062/diff/17002/cc/test/fake_output_surfa...
File cc/test/fake_output_surface.cc (left):

https://codereview.chromium.org/12041062/diff/17002/cc/test/fake_output_surfa...
cc/test/fake_output_surface.cc:25: bool
FakeOutputSurface::BindToClient(OutputSurfaceClient* client) {
Can you keep this function and still call makeContextCurrent() here after
calling the super class. I'm just paranoid about changes in cc/ make tests into
no-ops by changing behaviour over time.

https://codereview.chromium.org/12041062/diff/17002/cc/test/fake_output_surfa...
File cc/test/fake_output_surface.h (right):

https://codereview.chromium.org/12041062/diff/17002/cc/test/fake_output_surfa...
cc/test/fake_output_surface.h:64:
FakeOutputSurface(scoped_ptr<WebKit::WebGraphicsContext3D> context3d,
nit: line wrap at the ( please

https://codereview.chromium.org/12041062/diff/17002/cc/test/fake_output_surfa...
cc/test/fake_output_surface.h:67:
FakeOutputSurface(scoped_ptr<SoftwareOutputDevice> software_device,
same

[nduca, 2013-01-24 02:21:47]

Please see vangelis'  email to chrome-gpu and exercise discretion where possible

[slavi, 2013-01-24 02:41:54]

On 2013/01/24 02:21:47, nduca wrote:
> Please see vangelis'  email to chrome-gpu and exercise discretion where
possible

No worries. I'm not going to land this now.

[slavi, 2013-01-24 02:48:08]

On 2013/01/24 02:03:06, danakj wrote:
>
https://codereview.chromium.org/12041062/diff/17002/cc/gl_renderer_pixeltest.cc
> File cc/gl_renderer_pixeltest.cc (right):
> 
>
https://codereview.chromium.org/12041062/diff/17002/cc/gl_renderer_pixeltest....
> cc/gl_renderer_pixeltest.cc:61: CHECK(context3d.get() == NULL);
> You don't need this unless you're trying to verify the behaviour of PassAs()
on
> the line above :). It will set the local variable to NULL always.

Done. I was indeed debugging something =-)

> https://codereview.chromium.org/12041062/diff/17002/cc/output_surface.h
> File cc/output_surface.h (right):
> 
>
https://codereview.chromium.org/12041062/diff/17002/cc/output_surface.h#newco...
> cc/output_surface.h:46: const Capabilities& Capabilities() const;
> make this inline and named capabilities() since it's not virtual now.

Done. 
> 
>
https://codereview.chromium.org/12041062/diff/17002/cc/output_surface.h#newco...
> cc/output_surface.h:52: WebKit::WebGraphicsContext3D* Context3D() const;
> make this inline and named context3d() since not virtual

Done. 

>
https://codereview.chromium.org/12041062/diff/17002/cc/output_surface.h#newco...
> cc/output_surface.h:53: SoftwareOutputDevice* SoftwareDevice() const;
> inline software_device()

Done. 

>
https://codereview.chromium.org/12041062/diff/17002/cc/output_surface.h#newco...
> cc/output_surface.h:64: virtual void
> SendFrameToParentCompositor(CompositorFrame*) {}
> Would NOTREACHED() be appropriate here?
> 
>
https://codereview.chromium.org/12041062/diff/17002/cc/test/fake_output_surfa...
> File cc/test/fake_output_surface.cc (left):
> 
>
https://codereview.chromium.org/12041062/diff/17002/cc/test/fake_output_surfa...
> cc/test/fake_output_surface.cc:25: bool
> FakeOutputSurface::BindToClient(OutputSurfaceClient* client) {
> Can you keep this function and still call makeContextCurrent() here after
> calling the super class. I'm just paranoid about changes in cc/ make tests
into
> no-ops by changing behaviour over time.

I removed FakeOutputSurface::BindToClient altogether. It uses the implementation
from cc::OutputSurface.

>
https://codereview.chromium.org/12041062/diff/17002/cc/test/fake_output_surfa...
> File cc/test/fake_output_surface.h (right):
> 
>
https://codereview.chromium.org/12041062/diff/17002/cc/test/fake_output_surfa...
> cc/test/fake_output_surface.h:64:
> FakeOutputSurface(scoped_ptr<WebKit::WebGraphicsContext3D> context3d,
> nit: line wrap at the ( please

Done. 

>
https://codereview.chromium.org/12041062/diff/17002/cc/test/fake_output_surfa...
> cc/test/fake_output_surface.h:67:
> FakeOutputSurface(scoped_ptr<SoftwareOutputDevice> software_device,
> same

Done.

[slavi, 2013-01-24 02:56:59]

On 2013/01/24 02:48:08, slavi wrote:
> On 2013/01/24 02:03:06, danakj wrote:
> >
>
https://codereview.chromium.org/12041062/diff/17002/cc/gl_renderer_pixeltest.cc
> > File cc/gl_renderer_pixeltest.cc (right):
> > 
> >
>
https://codereview.chromium.org/12041062/diff/17002/cc/gl_renderer_pixeltest....
> > cc/gl_renderer_pixeltest.cc:61: CHECK(context3d.get() == NULL);
> > You don't need this unless you're trying to verify the behaviour of PassAs()
> on
> > the line above :). It will set the local variable to NULL always.
> 
> Done. I was indeed debugging something =-)
> 
> > https://codereview.chromium.org/12041062/diff/17002/cc/output_surface.h
> > File cc/output_surface.h (right):
> > 
> >
>
https://codereview.chromium.org/12041062/diff/17002/cc/output_surface.h#newco...
> > cc/output_surface.h:46: const Capabilities& Capabilities() const;
> > make this inline and named capabilities() since it's not virtual now.
> 
> Done. 
> > 
> >
>
https://codereview.chromium.org/12041062/diff/17002/cc/output_surface.h#newco...
> > cc/output_surface.h:52: WebKit::WebGraphicsContext3D* Context3D() const;
> > make this inline and named context3d() since not virtual
> 
> Done. 
> 
> >
>
https://codereview.chromium.org/12041062/diff/17002/cc/output_surface.h#newco...
> > cc/output_surface.h:53: SoftwareOutputDevice* SoftwareDevice() const;
> > inline software_device()
> 
> Done. 
> 
> >
>
https://codereview.chromium.org/12041062/diff/17002/cc/output_surface.h#newco...
> > cc/output_surface.h:64: virtual void
> > SendFrameToParentCompositor(CompositorFrame*) {}
> > Would NOTREACHED() be appropriate here?
> > 

Done. Used NOTIMPLENTED() instead of NOTREACHED() though.

> >
>
https://codereview.chromium.org/12041062/diff/17002/cc/test/fake_output_surfa...
> > File cc/test/fake_output_surface.cc (left):
> > 
> >
>
https://codereview.chromium.org/12041062/diff/17002/cc/test/fake_output_surfa...
> > cc/test/fake_output_surface.cc:25: bool
> > FakeOutputSurface::BindToClient(OutputSurfaceClient* client) {
> > Can you keep this function and still call makeContextCurrent() here after
> > calling the super class. I'm just paranoid about changes in cc/ make tests
> into
> > no-ops by changing behaviour over time.
> 
> I removed FakeOutputSurface::BindToClient altogether. It uses the
implementation
> from cc::OutputSurface.

Oops, I misinterpreted what you said. I kept FakeOutputSurface::BindToClient
which is a copy-pasted version of cc::OutputSurface::BindToClient.

> >
>
https://codereview.chromium.org/12041062/diff/17002/cc/test/fake_output_surfa...
> > File cc/test/fake_output_surface.h (right):
> > 
> >
>
https://codereview.chromium.org/12041062/diff/17002/cc/test/fake_output_surfa...
> > cc/test/fake_output_surface.h:64:
> > FakeOutputSurface(scoped_ptr<WebKit::WebGraphicsContext3D> context3d,
> > nit: line wrap at the ( please
> 
> Done. 
> 
> >
>
https://codereview.chromium.org/12041062/diff/17002/cc/test/fake_output_surfa...
> > cc/test/fake_output_surface.h:67:
> > FakeOutputSurface(scoped_ptr<SoftwareOutputDevice> software_device,
> > same
> 
> Done.

[slavi, 2013-02-06 23:39:47]

Nat, Dana PTAL.

From our offline talk, this should be ready to land.

[piman, 2013-02-07 00:00:42]

LGTM, as long as Nat and Dana are happy, and we're ok to land this now.

[no sievers, 2013-02-07 00:03:06]

lgtm for android, thanks!

[nduca, 2013-02-07 00:10:15]

lgtm though i forget the offline talk :)

[commit-bot: I haz the power, 2013-02-07 00:33:03]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/skaslev@chromium.org/12041062/20001

[commit-bot: I haz the power, 2013-02-07 03:31:53]

Retried try job too often on linux_aura for step(s) content_browsertests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_aura...

[commit-bot: I haz the power, 2013-02-11 18:10:36]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/skaslev@chromium.org/12041062/20001

[commit-bot: I haz the power, 2013-02-11 19:05:27]

Retried try job too often on linux_aura for step(s) content_browsertests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_aura...

[commit-bot: I haz the power, 2013-02-11 20:04:08]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/skaslev@chromium.org/12041062/29008

[commit-bot: I haz the power, 2013-02-11 21:00:50]

Retried try job too often on linux_aura for step(s) content_browsertests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_aura...

[commit-bot: I haz the power, 2013-02-12 00:08:17]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/skaslev@chromium.org/12041062/29008

[commit-bot: I haz the power, 2013-02-12 01:28:08]

Retried try job too often on linux_aura for step(s) content_browsertests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_aura...

[commit-bot: I haz the power, 2013-02-12 02:08:31]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/skaslev@chromium.org/12041062/39008

[commit-bot: I haz the power, 2013-02-12 02:08:47]

Failed to apply patch for cc/layer_tree_host_unittest.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file cc/layer_tree_host_unittest.cc
  Hunk #1 FAILED at 1040.
  Hunk #2 FAILED at 1082.
  Hunk #3 FAILED at 1172.
  Hunk #4 FAILED at 1257.
  4 out of 4 hunks FAILED -- saving rejects to file
cc/layer_tree_host_unittest.cc.rej

Patch:       cc/layer_tree_host_unittest.cc
Index: cc/layer_tree_host_unittest.cc
diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc
index
63799bf0579bce80023eab9f5d3674762b14a277..f109131bc051f47d6f5152458f5f8a9116aa99dd
100644
--- a/cc/layer_tree_host_unittest.cc
+++ b/cc/layer_tree_host_unittest.cc
@@ -1040,7 +1040,7 @@ public:
     {
         ASSERT_EQ(0u, m_layerTreeHost->settings().maxPartialTextureUpdates);
 
-        FakeWebGraphicsContext3D* context =
static_cast<FakeWebGraphicsContext3D*>(impl->outputSurface()->Context3D());
+        FakeWebGraphicsContext3D* context =
static_cast<FakeWebGraphicsContext3D*>(impl->outputSurface()->context3d());
 
         switch (impl->activeTree()->source_frame_number()) {
         case 0:
@@ -1082,7 +1082,7 @@ public:
 
     virtual void drawLayersOnThread(LayerTreeHostImpl* impl) OVERRIDE
     {
-        FakeWebGraphicsContext3D* context =
static_cast<FakeWebGraphicsContext3D*>(impl->outputSurface()->Context3D());
+        FakeWebGraphicsContext3D* context =
static_cast<FakeWebGraphicsContext3D*>(impl->outputSurface()->context3d());
 
         // Number of textures used for draw should always be one for each
layer.
         EXPECT_EQ(2, context->NumUsedTextures());
@@ -1172,7 +1172,7 @@ public:
     {
         ASSERT_EQ(1u, m_layerTreeHost->settings().maxPartialTextureUpdates);
 
-        FakeWebGraphicsContext3D* context =
static_cast<FakeWebGraphicsContext3D*>(impl->outputSurface()->Context3D());
+        FakeWebGraphicsContext3D* context =
static_cast<FakeWebGraphicsContext3D*>(impl->outputSurface()->context3d());
 
         switch (impl->activeTree()->source_frame_number()) {
         case 0:
@@ -1257,7 +1257,7 @@ public:
 
     virtual void drawLayersOnThread(LayerTreeHostImpl* impl) OVERRIDE
     {
-        FakeWebGraphicsContext3D* context =
static_cast<FakeWebGraphicsContext3D*>(impl->outputSurface()->Context3D());
+        FakeWebGraphicsContext3D* context =
static_cast<FakeWebGraphicsContext3D*>(impl->outputSurface()->context3d());
 
         // Number of textures used for drawing should one per layer except for
         // frame 3 where the viewport only contains one layer.

[commit-bot: I haz the power, 2013-02-12 02:37:39]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/skaslev@chromium.org/12041062/27010

[commit-bot: I haz the power, 2013-02-12 02:37:51]

Failed to apply patch for cc/layer_tree_host_unittest.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file cc/layer_tree_host_unittest.cc
  Hunk #1 FAILED at 1040.
  Hunk #2 FAILED at 1082.
  Hunk #3 FAILED at 1172.
  Hunk #4 FAILED at 1257.
  4 out of 4 hunks FAILED -- saving rejects to file
cc/layer_tree_host_unittest.cc.rej

Patch:       cc/layer_tree_host_unittest.cc
Index: cc/layer_tree_host_unittest.cc
diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc
index
63799bf0579bce80023eab9f5d3674762b14a277..f109131bc051f47d6f5152458f5f8a9116aa99dd
100644
--- a/cc/layer_tree_host_unittest.cc
+++ b/cc/layer_tree_host_unittest.cc
@@ -1040,7 +1040,7 @@ public:
     {
         ASSERT_EQ(0u, m_layerTreeHost->settings().maxPartialTextureUpdates);
 
-        FakeWebGraphicsContext3D* context =
static_cast<FakeWebGraphicsContext3D*>(impl->outputSurface()->Context3D());
+        FakeWebGraphicsContext3D* context =
static_cast<FakeWebGraphicsContext3D*>(impl->outputSurface()->context3d());
 
         switch (impl->activeTree()->source_frame_number()) {
         case 0:
@@ -1082,7 +1082,7 @@ public:
 
     virtual void drawLayersOnThread(LayerTreeHostImpl* impl) OVERRIDE
     {
-        FakeWebGraphicsContext3D* context =
static_cast<FakeWebGraphicsContext3D*>(impl->outputSurface()->Context3D());
+        FakeWebGraphicsContext3D* context =
static_cast<FakeWebGraphicsContext3D*>(impl->outputSurface()->context3d());
 
         // Number of textures used for draw should always be one for each
layer.
         EXPECT_EQ(2, context->NumUsedTextures());
@@ -1172,7 +1172,7 @@ public:
     {
         ASSERT_EQ(1u, m_layerTreeHost->settings().maxPartialTextureUpdates);
 
-        FakeWebGraphicsContext3D* context =
static_cast<FakeWebGraphicsContext3D*>(impl->outputSurface()->Context3D());
+        FakeWebGraphicsContext3D* context =
static_cast<FakeWebGraphicsContext3D*>(impl->outputSurface()->context3d());
 
         switch (impl->activeTree()->source_frame_number()) {
         case 0:
@@ -1257,7 +1257,7 @@ public:
 
     virtual void drawLayersOnThread(LayerTreeHostImpl* impl) OVERRIDE
     {
-        FakeWebGraphicsContext3D* context =
static_cast<FakeWebGraphicsContext3D*>(impl->outputSurface()->Context3D());
+        FakeWebGraphicsContext3D* context =
static_cast<FakeWebGraphicsContext3D*>(impl->outputSurface()->context3d());
 
         // Number of textures used for drawing should one per layer except for
         // frame 3 where the viewport only contains one layer.

[commit-bot: I haz the power, 2013-02-12 19:01:29]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/skaslev@chromium.org/12041062/22030

[commit-bot: I haz the power, 2013-02-12 19:01:45]

Failed to apply patch for cc/resource_provider.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file cc/resource_provider.cc
  Hunk #1 succeeded at 148 (offset 12 lines).
  Hunk #2 succeeded at 158 (offset 12 lines).
  Hunk #3 FAILED at 193.
  Hunk #4 succeeded at 237 (offset 6 lines).
  Hunk #5 succeeded at 288 (offset 6 lines).
  Hunk #6 succeeded at 345 (offset 6 lines).
  Hunk #7 succeeded at 409 (offset 6 lines).
  Hunk #8 succeeded at 417 (offset 6 lines).
  Hunk #9 succeeded at 436 (offset 6 lines).
  Hunk #10 succeeded at 588 (offset 6 lines).
  Hunk #11 succeeded at 659 (offset 6 lines).
  Hunk #12 succeeded at 680 (offset 6 lines).
  Hunk #13 succeeded at 704 (offset 6 lines).
  Hunk #14 succeeded at 738 (offset 6 lines).
  Hunk #15 succeeded at 762 (offset 6 lines).
  Hunk #16 succeeded at 798 (offset 6 lines).
  Hunk #17 succeeded at 833 (offset 6 lines).
  Hunk #18 succeeded at 864 (offset 6 lines).
  Hunk #19 succeeded at 894 (offset 6 lines).
  Hunk #20 succeeded at 920 (offset 6 lines).
  Hunk #21 succeeded at 957 (offset 6 lines).
  Hunk #22 succeeded at 987 (offset 6 lines).
  Hunk #23 succeeded at 1039 (offset 6 lines).
  Hunk #24 succeeded at 1097 (offset 32 lines).
  1 out of 24 hunks FAILED -- saving rejects to file cc/resource_provider.cc.rej

Patch:       cc/resource_provider.cc
Index: cc/resource_provider.cc
diff --git a/cc/resource_provider.cc b/cc/resource_provider.cc
index
e6983543e480c9770a0e1437f55d97564db36837..0eb3a75cf803b7de5370567ba737e55b8a712c32
100644
--- a/cc/resource_provider.cc
+++ b/cc/resource_provider.cc
@@ -136,7 +136,7 @@ scoped_ptr<ResourceProvider>
ResourceProvider::create(OutputSurface* context)
 
 ResourceProvider::~ResourceProvider()
 {
-    WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
+    WebGraphicsContext3D* context3d = m_outputSurface->context3d();
     if (!context3d || !context3d->makeContextCurrent())
         return;
     m_textureUploader.reset();
@@ -146,7 +146,7 @@ ResourceProvider::~ResourceProvider()
 WebGraphicsContext3D* ResourceProvider::graphicsContext3D()
 {
     DCHECK(m_threadChecker.CalledOnValidThread());
-    return m_outputSurface->Context3D();
+    return m_outputSurface->context3d();
 }
 
 bool ResourceProvider::inUseByConsumer(ResourceId id)
@@ -193,7 +193,7 @@ ResourceProvider::ResourceId
ResourceProvider::createGLTexture(const gfx::Size&
 
     DCHECK(m_threadChecker.CalledOnValidThread());
     unsigned textureId = 0;
-    WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
+    WebGraphicsContext3D* context3d = m_outputSurface->context3d();
     DCHECK(context3d);
     GLC(context3d, textureId = context3d->createTexture());
     GLC(context3d, context3d->bindTexture(GL_TEXTURE_2D, textureId));
@@ -231,7 +231,7 @@ ResourceProvider::ResourceId
ResourceProvider::createResourceFromExternalTexture
 {
     DCHECK(m_threadChecker.CalledOnValidThread());
 
-    WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
+    WebGraphicsContext3D* context3d = m_outputSurface->context3d();
     DCHECK(context3d);
     GLC(context3d, context3d->bindTexture(GL_TEXTURE_2D, textureId));
     GLC(context3d, context3d->texParameteri(GL_TEXTURE_2D,
GL_TEXTURE_MIN_FILTER, GL_LINEAR));
@@ -282,22 +282,22 @@ void
ResourceProvider::deleteResourceInternal(ResourceMap::iterator it)
 {
     Resource* resource = &it->second;
     if (resource->glId && !resource->external) {
-        WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
+        WebGraphicsContext3D* context3d = m_outputSurface->context3d();
         DCHECK(context3d);
         GLC(context3d, context3d->deleteTexture(resource->glId));
     }
     if (resource->glUploadQueryId) {
-        WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
+        WebGraphicsContext3D* context3d = m_outputSurface->context3d();
         DCHECK(context3d);
         GLC(context3d, context3d->deleteQueryEXT(resource->glUploadQueryId));
     }
     if (resource->glPixelBufferId) {
-        WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
+        WebGraphicsContext3D* context3d = m_outputSurface->context3d();
         DCHECK(context3d);
         GLC(context3d, context3d->deleteBuffer(resource->glPixelBufferId));
     }
     if (!resource->mailbox.IsEmpty() && resource->external) {
-        WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
+        WebGraphicsContext3D* context3d = m_outputSurface->context3d();
         DCHECK(context3d);
         unsigned syncPoint = resource->mailbox.sync_point();
         if (resource->glId) {
@@ -339,7 +339,7 @@ void ResourceProvider::setPixels(ResourceId id, const
uint8_t* image, const gfx:
 
     if (resource->glId) {
         DCHECK(!resource->pendingSetPixels);
-        WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
+        WebGraphicsContext3D* context3d = m_outputSurface->context3d();
         DCHECK(context3d);
         DCHECK(m_textureUploader.get());
         context3d->bindTexture(GL_TEXTURE_2D, resource->glId);
@@ -403,7 +403,7 @@ void ResourceProvider::flushUploads()
 void ResourceProvider::flush()
 {
     DCHECK(m_threadChecker.CalledOnValidThread());
-    WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
+    WebGraphicsContext3D* context3d = m_outputSurface->context3d();
     if (context3d)
         context3d->flush();
 }
@@ -411,7 +411,7 @@ void ResourceProvider::flush()
 bool ResourceProvider::shallowFlushIfSupported()
 {
     DCHECK(m_threadChecker.CalledOnValidThread());
-    WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
+    WebGraphicsContext3D* context3d = m_outputSurface->context3d();
     if (!context3d || !m_useShallowFlush)
         return false;
 
@@ -430,7 +430,7 @@ const ResourceProvider::Resource*
ResourceProvider::lockForRead(ResourceId id)
     DCHECK(resource->allocated); // Uninitialized! Call setPixels or
lockForWrite first.
 
     if (!resource->glId && resource->external && !resource->mailbox.IsEmpty())
{
-        WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
+        WebGraphicsContext3D* context3d = m_outputSurface->context3d();
         DCHECK(context3d);
         if (resource->mailbox.sync_point()) {
             GLC(context3d,
context3d->waitSyncPoint(resource->mailbox.sync_point()));
@@ -582,7 +582,7 @@ ResourceProvider::ResourceProvider(OutputSurface* context)
 bool ResourceProvider::initialize()
 {
     DCHECK(m_threadChecker.CalledOnValidThread());
-    WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
+    WebGraphicsContext3D* context3d = m_outputSurface->context3d();
     if (!context3d) {
         m_maxTextureSize = INT_MAX / 2;
         m_bestTextureFormat = GL_RGBA;
@@ -653,7 +653,7 @@ void ResourceProvider::prepareSendToParent(const
ResourceIdArray& resources, Tra
     DCHECK(m_threadChecker.CalledOnValidThread());
     list->sync_point = 0;
     list->resources.clear();
-    WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
+    WebGraphicsContext3D* context3d = m_outputSurface->context3d();
     if (!context3d || !context3d->makeContextCurrent()) {
         // FIXME: Implement this path for software compositing.
         return;
@@ -674,7 +674,7 @@ void ResourceProvider::prepareSendToChild(int child, const
ResourceIdArray& reso
     DCHECK(m_threadChecker.CalledOnValidThread());
     list->sync_point = 0;
     list->resources.clear();
-    WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
+    WebGraphicsContext3D* context3d = m_outputSurface->context3d();
     if (!context3d || !context3d->makeContextCurrent()) {
         // FIXME: Implement this path for software compositing.
         return;
@@ -698,7 +698,7 @@ void ResourceProvider::prepareSendToChild(int child, const
ResourceIdArray& reso
 void ResourceProvider::receiveFromChild(int child, const
TransferableResourceList& resources)
 {
     DCHECK(m_threadChecker.CalledOnValidThread());
-    WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
+    WebGraphicsContext3D* context3d = m_outputSurface->context3d();
     if (!context3d || !context3d->makeContextCurrent()) {
         // FIXME: Implement this path for software compositing.
         return;
@@ -732,7 +732,7 @@ void ResourceProvider::receiveFromChild(int child, const
TransferableResourceLis
 void ResourceProvider::receiveFromParent(const TransferableResourceList&
resources)
 {
     DCHECK(m_threadChecker.CalledOnValidThread());
-    WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
+    WebGraphicsContext3D* context3d = m_outputSurface->context3d();
     if (!context3d || !context3d->makeContextCurrent()) {
         // FIXME: Implement this path for software compositing.
         return;
@@ -756,7 +756,7 @@ void ResourceProvider::receiveFromParent(const
TransferableResourceList& resourc
 bool ResourceProvider::transferResource(WebGraphicsContext3D* context,
ResourceId id, TransferableResource* resource)
 {
     DCHECK(m_threadChecker.CalledOnValidThread());
-    WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
+    WebGraphicsContext3D* context3d = m_outputSurface->context3d();
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
     Resource* source = &it->second;
@@ -792,7 +792,7 @@ void ResourceProvider::acquirePixelBuffer(ResourceId id)
     DCHECK(!resource->exported);
 
     if (resource->glId) {
-        WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
+        WebGraphicsContext3D* context3d = m_outputSurface->context3d();
         DCHECK(context3d);
         if (!resource->glPixelBufferId)
             resource->glPixelBufferId = context3d->createBuffer();
@@ -827,7 +827,7 @@ void ResourceProvider::releasePixelBuffer(ResourceId id)
 
     if (resource->glId) {
         DCHECK(resource->glPixelBufferId);
-        WebGraphicsContext3D* context3d = m_outputSurf…
(message too large)

[commit-bot: I haz the power, 2013-02-12 21:06:15]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/skaslev@chromium.org/12041062/41031

[commit-bot: I haz the power, 2013-02-13 05:34:24]

Retried try job too often on win7_aura for step(s) browser_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win7_aura&...

[commit-bot: I haz the power, 2013-02-13 18:27:13]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/skaslev@chromium.org/12041062/43001

[commit-bot: I haz the power, 2013-02-13 19:28:59]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/skaslev@chromium.org/12041062/43001