Move attributes and context type out to ContextProviderCommandBuffer.

Move attributes and context type out to ContextProviderCommandBuffer.

Remove these members from WebGraphicsContext3DCommandBufferImpl, and
just pass them in to InitializeOnCurrentThread() instead.

TBR=pfeldman
BUG=584497
R=piman@chromium.org, sievers

Committed: https://crrev.com/c3983553471d676d73be493eebc5dcf8aa6dc67e
Cr-Commit-Position: refs/heads/master@{#391111}

[danakj, 2016-04-29 23:46:39]

The CQ bit was checked by danakj@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-04-29 23:46:59]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1936773002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1936773002/1

[danakj, 2016-04-29 23:47:19]

https://codereview.chromium.org/1936773002/diff/1/content/common/gpu/client/c...
File content/common/gpu/client/command_buffer_metrics.h (right):

https://codereview.chromium.org/1936773002/diff/1/content/common/gpu/client/c...
content/common/gpu/client/command_buffer_metrics.h:13: namespace
command_buffer_metrics {
I put this file into a namespace cuz it was hard to find these functions, they
look like member methods or local statics or something. And the style guide says
to use a namespace not a class to do this.

[commit-bot: I haz the power, 2016-04-29 23:58:35]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-04-29 23:58:36]

Dry run: Try jobs failed on following builders:
  cast_shell_android on tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/cast_shell_a...)

[danakj, 2016-04-30 01:17:10]

The CQ bit was checked by danakj@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-04-30 01:17:23]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1936773002/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1936773002/40001

[danakj, 2016-04-30 01:30:45]

https://codereview.chromium.org/1936773002/diff/80001/content/renderer/render...
File content/renderer/renderer_blink_platform_impl.cc (right):

https://codereview.chromium.org/1936773002/diff/80001/content/renderer/render...
content/renderer/renderer_blink_platform_impl.cc:1082:
command_buffer_metrics::OFFSCREEN_CONTEXT_FOR_WEBGL));
The changes in this file are a bit subtle and change behaviour a bit.

What happened before is that WGC3DCBI would pick a type for itself in its
constructor based on the attributes.context_type. From here that meant:

- If webGLVersion was set, it would use OFFSCREEN_CONTEXT_FOR_WEBGL.
- Otherwise, it would use CONTEXT_TYPE_UNKNOWN.

That's the type that would be reported during initialization failures to UMA.

Then after initialization succeeded, ContextProviderCommandBuffer would
overwrite the type on the WGC3DCBImpl with the type we passed in here which was
RENDERER_MAINTHREAD_CONTEXT.

So any lost context events would be reported as RENDERER_MAINTHREAD_CONTEXT.
This seems like a bug, so I have made it always use OFFSCREEN_CONTEXT_FOR_WEBGL
instead.

Also, the only callers of this methods are:

1) WebGL
2) TestPlugin

WebGL always sets a webGLVersion, so I made TestPlugin set a webGLVersion to 1,
and stopped trying to branch/handle the case where webGLVersion was 0, so we
don't have to support CONTEXT_TYPE_UNKNOWN/RENDERER_MAINTHREAD_CONTEXT in here,
which are both weird.

[danakj, 2016-04-30 01:31:00]

danakj@chromium.org changed reviewers:
+ pfeldman@chromium.org

[danakj, 2016-04-30 01:31:01]

+pfeldman for components (will TBR)

[danakj, 2016-04-30 01:32:40]

Description was changed from

==========
Move attributes and context type out to ContextProviderCommandBuffer.

Remove these members from WebGraphicsContext3DCommandBufferImpl, and
just pass them in to InitializeOnCurrentThread() instead.

BUG=584497
R=piman@chromium.org, sievers
==========

to

==========
Move attributes and context type out to ContextProviderCommandBuffer.

Remove these members from WebGraphicsContext3DCommandBufferImpl, and
just pass them in to InitializeOnCurrentThread() instead.

TBR=pfeldman
BUG=584497
R=piman@chromium.org, sievers
==========

[danakj, 2016-04-30 01:32:46]

The CQ bit was checked by danakj@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-04-30 01:32:51]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1936773002/80001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1936773002/80001

[commit-bot: I haz the power, 2016-04-30 01:40:16]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-04-30 01:40:17]

Dry run: Try jobs failed on following builders:
  linux_android_rel_ng on tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...)

[piman, 2016-05-02 20:36:08]

lgtm

[danakj, 2016-05-02 20:41:08]

The CQ bit was checked by danakj@chromium.org

[commit-bot: I haz the power, 2016-05-02 20:41:42]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1936773002/100001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1936773002/100001

[commit-bot: I haz the power, 2016-05-02 22:23:14]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-05-02 22:23:15]

Failed to apply patch for content/browser/gpu/gpu_ipc_browsertests.cc:
While running git apply --index -3 -p1;
  error: patch failed: content/browser/gpu/gpu_ipc_browsertests.cc:22
  Falling back to three-way merge...
  Applied patch to 'content/browser/gpu/gpu_ipc_browsertests.cc' with conflicts.
  U content/browser/gpu/gpu_ipc_browsertests.cc

Patch:       content/browser/gpu/gpu_ipc_browsertests.cc
Index: content/browser/gpu/gpu_ipc_browsertests.cc
diff --git a/content/browser/gpu/gpu_ipc_browsertests.cc
b/content/browser/gpu/gpu_ipc_browsertests.cc
index
03a7a1f6f0edaf658f932f65483108b2fd20ad5f..149690193d047c5b6f9fafa771e84f09e0b48997
100644
--- a/content/browser/gpu/gpu_ipc_browsertests.cc
+++ b/content/browser/gpu/gpu_ipc_browsertests.cc
@@ -22,13 +22,11 @@
 
 namespace {
 
-using content::WebGraphicsContext3DCommandBufferImpl;
-
 const content::CauseForGpuLaunch kInitCause =
     content::
         CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE;
 
-std::unique_ptr<WebGraphicsContext3DCommandBufferImpl> CreateContext(
+scoped_refptr<content::ContextProviderCommandBuffer> CreateContext(
     gpu::GpuChannelHost* gpu_channel_host) {
   // This is for an offscreen context, so the default framebuffer doesn't need
   // any alpha, depth, stencil, antialiasing.
@@ -40,9 +38,12 @@ std::unique_ptr<WebGraphicsContext3DCommandBufferImpl>
CreateContext(
   attributes.sample_buffers = 0;
   attributes.bind_generates_resource = false;
   bool automatic_flushes = false;
-  return base::WrapUnique(new WebGraphicsContext3DCommandBufferImpl(
-      gpu::kNullSurfaceHandle, GURL(), gpu_channel_host, attributes,
-      gfx::PreferIntegratedGpu, automatic_flushes));
+  return make_scoped_refptr(new content::ContextProviderCommandBuffer(
+      base::WrapUnique(new content::WebGraphicsContext3DCommandBufferImpl(
+          gpu::kNullSurfaceHandle, GURL(), gpu_channel_host,
+          gfx::PreferIntegratedGpu, automatic_flushes)),
+      gpu::SharedMemoryLimits(), attributes, nullptr,
+      content::command_buffer_metrics::OFFSCREEN_CONTEXT_FOR_TESTING));
 }
 
 class ContextTestBase : public content::ContentBrowserTest {
@@ -66,9 +67,7 @@ class ContextTestBase : public content::ContentBrowserTest {
         factory->GetGpuChannel());
     CHECK(gpu_channel_host);
 
-    provider_ = new content::ContextProviderCommandBuffer(
-        CreateContext(gpu_channel_host.get()), gpu::SharedMemoryLimits(),
-        nullptr, content::OFFSCREEN_CONTEXT_FOR_TESTING);
+    provider_ = CreateContext(gpu_channel_host.get());
     bool bound = provider_->BindToCurrentThread();
     CHECK(bound);
     gl_ = provider_->ContextGL();
@@ -225,9 +224,7 @@ IN_PROC_BROWSER_TEST_F(BrowserGpuChannelHostFactoryTest,
   // Step 2: verify that holding onto the provider's GrContext will
   // retain the host after provider is destroyed.
   scoped_refptr<ContextProviderCommandBuffer> provider =
-      new ContextProviderCommandBuffer(CreateContext(GetGpuChannel()),
-                                       gpu::SharedMemoryLimits(), nullptr,
-                                       OFFSCREEN_CONTEXT_FOR_TESTING);
+      CreateContext(GetGpuChannel());
   EXPECT_TRUE(provider->BindToCurrentThread());
 
   sk_sp<GrContext> gr_context = sk_ref_sp(provider->GrContext());
@@ -274,9 +271,7 @@ IN_PROC_BROWSER_TEST_F(BrowserGpuChannelHostFactoryTest,
   scoped_refptr<gpu::GpuChannelHost> host = GetGpuChannel();
 
   scoped_refptr<ContextProviderCommandBuffer> provider =
-      new ContextProviderCommandBuffer(CreateContext(GetGpuChannel()),
-                                       gpu::SharedMemoryLimits(), nullptr,
-                                       OFFSCREEN_CONTEXT_FOR_TESTING);
+      CreateContext(GetGpuChannel());
   base::RunLoop run_loop;
   int counter = 0;
   provider->SetLostContextCallback(

[commit-bot: I haz the power, 2016-05-02 22:23:28]

The CQ bit was unchecked by commit-bot@chromium.org

[danakj, 2016-05-02 22:33:48]

The CQ bit was checked by danakj@chromium.org

[danakj, 2016-05-02 22:33:48]

The patchset sent to the CQ was uploaded after l-g-t-m from piman@chromium.org
Link to the patchset: https://codereview.chromium.org/1936773002/#ps120001
(title: "attributes: rebase")

[commit-bot: I haz the power, 2016-05-02 22:34:37]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1936773002/120001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1936773002/120001

[commit-bot: I haz the power, 2016-05-03 00:04:48]

Description was changed from

==========
Move attributes and context type out to ContextProviderCommandBuffer.

Remove these members from WebGraphicsContext3DCommandBufferImpl, and
just pass them in to InitializeOnCurrentThread() instead.

TBR=pfeldman
BUG=584497
R=piman@chromium.org, sievers
==========

to

==========
Move attributes and context type out to ContextProviderCommandBuffer.

Remove these members from WebGraphicsContext3DCommandBufferImpl, and
just pass them in to InitializeOnCurrentThread() instead.

TBR=pfeldman
BUG=584497
R=piman@chromium.org, sievers
==========

[commit-bot: I haz the power, 2016-05-03 00:04:49]

Committed patchset #7 (id:120001)

[commit-bot: I haz the power, 2016-05-03 00:06:06]

Description was changed from

==========
Move attributes and context type out to ContextProviderCommandBuffer.

Remove these members from WebGraphicsContext3DCommandBufferImpl, and
just pass them in to InitializeOnCurrentThread() instead.

TBR=pfeldman
BUG=584497
R=piman@chromium.org, sievers
==========

to

==========
Move attributes and context type out to ContextProviderCommandBuffer.

Remove these members from WebGraphicsContext3DCommandBufferImpl, and
just pass them in to InitializeOnCurrentThread() instead.

TBR=pfeldman
BUG=584497
R=piman@chromium.org, sievers

Committed: https://crrev.com/c3983553471d676d73be493eebc5dcf8aa6dc67e
Cr-Commit-Position: refs/heads/master@{#391111}
==========

[commit-bot: I haz the power, 2016-05-03 00:06:08]

Patchset 7 (id:??) landed as
https://crrev.com/c3983553471d676d73be493eebc5dcf8aa6dc67e
Cr-Commit-Position: refs/heads/master@{#391111}