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

Side by Side Diff: content/browser/compositor/gpu_browser_compositor_output_surface.cc

Issue 161413002: Revert of Read compositor VSync information from platform, when possible (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/compositor/gpu_browser_compositor_output_surface.h" 5 #include "content/browser/compositor/gpu_browser_compositor_output_surface.h"
6 6
7 #include "cc/output/compositor_frame.h" 7 #include "cc/output/compositor_frame.h"
8 #include "content/browser/compositor/reflector_impl.h" 8 #include "content/browser/compositor/reflector_impl.h"
9 #include "content/common/gpu/client/context_provider_command_buffer.h" 9 #include "content/common/gpu/client/context_provider_command_buffer.h"
10 #include "gpu/command_buffer/client/gles2_interface.h" 10 #include "gpu/command_buffer/client/gles2_interface.h"
11 11
12 namespace content { 12 namespace content {
13 13
14 GpuBrowserCompositorOutputSurface::GpuBrowserCompositorOutputSurface( 14 GpuBrowserCompositorOutputSurface::GpuBrowserCompositorOutputSurface(
15 const scoped_refptr<ContextProviderCommandBuffer>& context, 15 const scoped_refptr<ContextProviderCommandBuffer>& context,
16 int surface_id, 16 int surface_id,
17 IDMap<BrowserCompositorOutputSurface>* output_surface_map, 17 IDMap<BrowserCompositorOutputSurface>* output_surface_map,
18 const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager) 18 base::MessageLoopProxy* compositor_message_loop,
19 base::WeakPtr<ui::Compositor> compositor)
19 : BrowserCompositorOutputSurface(context, 20 : BrowserCompositorOutputSurface(context,
20 surface_id, 21 surface_id,
21 output_surface_map, 22 output_surface_map,
22 vsync_manager) {} 23 compositor_message_loop,
24 compositor) {}
23 25
24 GpuBrowserCompositorOutputSurface::~GpuBrowserCompositorOutputSurface() {} 26 GpuBrowserCompositorOutputSurface::~GpuBrowserCompositorOutputSurface() {}
25 27
26 void GpuBrowserCompositorOutputSurface::SwapBuffers( 28 void GpuBrowserCompositorOutputSurface::SwapBuffers(
27 cc::CompositorFrame* frame) { 29 cc::CompositorFrame* frame) {
28 DCHECK(frame->gl_frame_data); 30 DCHECK(frame->gl_frame_data);
29 31
30 ContextProviderCommandBuffer* provider_command_buffer = 32 ContextProviderCommandBuffer* provider_command_buffer =
31 static_cast<ContextProviderCommandBuffer*>(context_provider_.get()); 33 static_cast<ContextProviderCommandBuffer*>(context_provider_.get());
32 CommandBufferProxyImpl* command_buffer_proxy = 34 CommandBufferProxyImpl* command_buffer_proxy =
33 provider_command_buffer->GetCommandBufferProxy(); 35 provider_command_buffer->GetCommandBufferProxy();
34 DCHECK(command_buffer_proxy); 36 DCHECK(command_buffer_proxy);
35 context_provider_->ContextGL()->ShallowFlushCHROMIUM(); 37 context_provider_->ContextGL()->ShallowFlushCHROMIUM();
36 command_buffer_proxy->SetLatencyInfo(frame->metadata.latency_info); 38 command_buffer_proxy->SetLatencyInfo(frame->metadata.latency_info);
37 39
38 if (reflector_.get()) { 40 if (reflector_.get()) {
39 if (frame->gl_frame_data->sub_buffer_rect == 41 if (frame->gl_frame_data->sub_buffer_rect ==
40 gfx::Rect(frame->gl_frame_data->size)) 42 gfx::Rect(frame->gl_frame_data->size))
41 reflector_->OnSwapBuffers(); 43 reflector_->OnSwapBuffers();
42 else 44 else
43 reflector_->OnPostSubBuffer(frame->gl_frame_data->sub_buffer_rect); 45 reflector_->OnPostSubBuffer(frame->gl_frame_data->sub_buffer_rect);
44 } 46 }
45 47
46 OutputSurface::SwapBuffers(frame); 48 OutputSurface::SwapBuffers(frame);
47 } 49 }
48 50
49 } // namespace content 51 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698