summaryrefslogtreecommitdiffstats
path: root/content/renderer
diff options
context:
space:
mode:
authorsimonhong@chromium.org <simonhong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-21 02:52:31 +0000
committersimonhong@chromium.org <simonhong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-21 02:52:31 +0000
commite636734a6ae9e94724876f999cdb18f099bf7f9f (patch)
tree43d1d2e8733a1e8ac97242f6c241ebef63acd1e4 /content/renderer
parent32ae6e62b0c98a700bbee893999d3c66fb42c9e6 (diff)
downloadchromium_src-e636734a6ae9e94724876f999cdb18f099bf7f9f.zip
chromium_src-e636734a6ae9e94724876f999cdb18f099bf7f9f.tar.gz
chromium_src-e636734a6ae9e94724876f999cdb18f099bf7f9f.tar.bz2
Unify the way to access ContextPrivder
This cl unify the way to access context provider via context_provider(). R=piman@chromium.org BUG=NONE TEST=NONE(Non functional change) Review URL: https://codereview.chromium.org/336823005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278905 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
-rw-r--r--content/renderer/gpu/compositor_output_surface.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/content/renderer/gpu/compositor_output_surface.cc b/content/renderer/gpu/compositor_output_surface.cc
index a292964..5215a90 100644
--- a/content/renderer/gpu/compositor_output_surface.cc
+++ b/content/renderer/gpu/compositor_output_surface.cc
@@ -149,11 +149,12 @@ void CompositorOutputSurface::SwapBuffers(cc::CompositorFrame* frame) {
base::Passed(&frame->gl_frame_data),
base::Passed(&frame->software_frame_data));
- if (context_provider_) {
- gpu::gles2::GLES2Interface* context = context_provider_->ContextGL();
+ if (context_provider()) {
+ gpu::gles2::GLES2Interface* context = context_provider()->ContextGL();
context->Flush();
uint32 sync_point = context->InsertSyncPointCHROMIUM();
- context_provider_->ContextSupport()->SignalSyncPoint(sync_point, closure);
+ context_provider()->ContextSupport()->SignalSyncPoint(sync_point,
+ closure);
} else {
base::MessageLoopProxy::current()->PostTask(FROM_HERE, closure);
}
@@ -170,9 +171,9 @@ void CompositorOutputSurface::SwapBuffers(cc::CompositorFrame* frame) {
}
if (frame->gl_frame_data) {
- context_provider_->ContextGL()->ShallowFlushCHROMIUM();
+ context_provider()->ContextGL()->ShallowFlushCHROMIUM();
ContextProviderCommandBuffer* provider_command_buffer =
- static_cast<ContextProviderCommandBuffer*>(context_provider_.get());
+ static_cast<ContextProviderCommandBuffer*>(context_provider().get());
CommandBufferProxyImpl* command_buffer_proxy =
provider_command_buffer->GetCommandBufferProxy();
DCHECK(command_buffer_proxy);