← Back to branch summary

~osomon/oxide/ensure-files-exist

« back to all changes in this revision

Viewing changes to shared/browser/compositor/oxide_compositor_utils.cc

  • Committer: Olivier Tilloy
  • Date: 2014-09-25 16:27:09 UTC
  • mfrom: (677.1.95 oxide)
  • Revision ID: olivier.tilloy@canonical.com-20140925162709-h8bai0f1nfaf7cfy
Merge the latest changes from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
shared/browser/compositor/oxide_compositor_utils.cc
95
95
      content::CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE;
96
96
  scoped_refptr<content::GpuChannelHost> gpu_channel_host(
97
97
      content::BrowserGpuChannelHostFactory::instance()->EstablishGpuChannelSync(cause));
98
 
  if (!gpu_channel_host) {
 
98
  if (!gpu_channel_host.get()) {
99
99
    return scoped_ptr<WGC3DCBI>();
100
100
  }
101
101
 
158
158
        sync_point_(sync_point),
159
159
        callback_(callback),
160
160
        task_runner_(task_runner) {
161
 
    DCHECK(task_runner_);
 
161
    DCHECK(task_runner_.get());
162
162
    DCHECK(!callback_.is_null());
163
163
  }
164
164
 
323
323
  // could be dropped on the main thread
324
324
  scoped_refptr<content::ContextProviderCommandBuffer>
325
325
      context_provider = context_provider_;
326
 
  DCHECK(context_provider);
 
326
  DCHECK(context_provider.get());
327
327
 
328
328
  // XXX: Should we assert that we're on the compositor thread?
329
329
  //  That is the only thread context_provider_ should be used on
349
349
}
350
350
 
351
351
gfx::GLSurfaceHandle CompositorUtils::GetSharedSurfaceHandle() {
352
 
  if (!context_provider_) {
 
352
  if (!context_provider_.get()) {
353
353
    return gfx::GLSurfaceHandle();
354
354
  }
355
355