Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(162)

Unified Diff: gpu/command_buffer/client/gl_in_process_context.cc

Issue 429863002: Remove GLInProcessContext::CreateContext() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: gpu/command_buffer/client/gl_in_process_context.cc
diff --git a/gpu/command_buffer/client/gl_in_process_context.cc b/gpu/command_buffer/client/gl_in_process_context.cc
index 33d41563dea137e5d8ec58db8bfce92f9368c443..24a3ab4f99acd8a51813274c37b80bc0c1cc9ee5 100644
--- a/gpu/command_buffer/client/gl_in_process_context.cc
+++ b/gpu/command_buffer/client/gl_in_process_context.cc
@@ -56,7 +56,6 @@ class GLInProcessContextImpl
bool is_offscreen,
bool use_global_share_group,
GLInProcessContext* share_context,
- gfx::AcceleratedWidget window,
const gfx::Size& size,
const GLInProcessContextAttribs& attribs,
gfx::GpuPreference gpu_preference,
@@ -124,7 +123,6 @@ bool GLInProcessContextImpl::Initialize(
bool is_offscreen,
bool use_global_share_group,
GLInProcessContext* share_context,
- gfx::AcceleratedWidget window,
boliu 2014/07/31 02:27:22 I don't think you compiled this for android. synch
hj.r.chung 2014/07/31 02:30:33 I removed it because synchronous_compositor_factor
const gfx::Size& size,
const GLInProcessContextAttribs& attribs,
gfx::GpuPreference gpu_preference,
@@ -226,7 +224,7 @@ bool GLInProcessContextImpl::Initialize(
if (!command_buffer_->Initialize(surface,
is_offscreen,
- window,
+ gfx::kNullAcceleratedWidget,
boliu 2014/07/31 02:35:32 You can clean up in in_process_command_buffer as w
hj.r.chung 2014/07/31 08:35:35 sorry for the confusion, window is still needed
size,
attrib_vector,
gpu_preference,
@@ -312,36 +310,10 @@ GLInProcessContextAttribs::GLInProcessContextAttribs()
fail_if_major_perf_caveat(-1),
lose_context_when_out_of_memory(-1) {}
-// static
-GLInProcessContext* GLInProcessContext::CreateContext(
- bool is_offscreen,
- gfx::AcceleratedWidget window,
- const gfx::Size& size,
- bool share_resources,
- const GLInProcessContextAttribs& attribs,
- gfx::GpuPreference gpu_preference) {
- scoped_ptr<GLInProcessContextImpl> context(
- new GLInProcessContextImpl());
- if (!context->Initialize(
- NULL /* surface */,
- is_offscreen,
- share_resources,
- NULL,
- window,
- size,
- attribs,
- gpu_preference,
- scoped_refptr<InProcessCommandBuffer::Service>()))
- return NULL;
-
- return context.release();
-}
-
GLInProcessContext* GLInProcessContext::Create(
scoped_refptr<gpu::InProcessCommandBuffer::Service> service,
scoped_refptr<gfx::GLSurface> surface,
bool is_offscreen,
- gfx::AcceleratedWidget window,
const gfx::Size& size,
GLInProcessContext* share_context,
bool use_global_share_group,
@@ -351,7 +323,6 @@ GLInProcessContext* GLInProcessContext::Create(
if (surface.get()) {
DCHECK_EQ(surface->IsOffscreen(), is_offscreen);
DCHECK(surface->GetSize() == size);
- DCHECK_EQ(gfx::kNullAcceleratedWidget, window);
}
scoped_ptr<GLInProcessContextImpl> context(new GLInProcessContextImpl());
@@ -359,7 +330,6 @@ GLInProcessContext* GLInProcessContext::Create(
is_offscreen,
use_global_share_group,
share_context,
- gfx::kNullAcceleratedWidget,
size,
attribs,
gpu_preference,

Powered by Google App Engine
This is Rietveld 408576698