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

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

Issue 1040813002: Revert of Enable BeginFrame scheduling on aura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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
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 "cc/output/output_surface_client.h" 8 #include "cc/output/output_surface_client.h"
9 #include "content/browser/compositor/reflector_impl.h" 9 #include "content/browser/compositor/reflector_impl.h"
10 #include "content/browser/renderer_host/render_widget_host_impl.h" 10 #include "content/browser/renderer_host/render_widget_host_impl.h"
11 #include "content/common/gpu/client/context_provider_command_buffer.h" 11 #include "content/common/gpu/client/context_provider_command_buffer.h"
12 #include "content/public/browser/browser_thread.h" 12 #include "content/public/browser/browser_thread.h"
13 #include "gpu/command_buffer/client/context_support.h" 13 #include "gpu/command_buffer/client/context_support.h"
14 #include "gpu/command_buffer/client/gles2_interface.h" 14 #include "gpu/command_buffer/client/gles2_interface.h"
15 15
16 namespace content { 16 namespace content {
17 17
18 GpuBrowserCompositorOutputSurface::GpuBrowserCompositorOutputSurface( 18 GpuBrowserCompositorOutputSurface::GpuBrowserCompositorOutputSurface(
19 const scoped_refptr<ContextProviderCommandBuffer>& context, 19 const scoped_refptr<ContextProviderCommandBuffer>& context,
20 const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager,
20 scoped_ptr<cc::OverlayCandidateValidator> overlay_candidate_validator) 21 scoped_ptr<cc::OverlayCandidateValidator> overlay_candidate_validator)
21 : BrowserCompositorOutputSurface(context), 22 : BrowserCompositorOutputSurface(context,
23 vsync_manager),
22 #if defined(OS_MACOSX) 24 #if defined(OS_MACOSX)
23 should_not_show_frames_(false), 25 should_not_show_frames_(false),
24 #endif 26 #endif
25 swap_buffers_completion_callback_( 27 swap_buffers_completion_callback_(
26 base::Bind(&GpuBrowserCompositorOutputSurface::OnSwapBuffersCompleted, 28 base::Bind(&GpuBrowserCompositorOutputSurface::OnSwapBuffersCompleted,
27 base::Unretained(this))), 29 base::Unretained(this))),
28 update_vsync_parameters_callback_(base::Bind( 30 update_vsync_parameters_callback_(base::Bind(
29 &BrowserCompositorOutputSurface::OnUpdateVSyncParametersFromGpu, 31 &BrowserCompositorOutputSurface::OnUpdateVSyncParametersFromGpu,
30 base::Unretained(this))) { 32 base::Unretained(this))) {
31 overlay_candidate_validator_ = overlay_candidate_validator.Pass(); 33 overlay_candidate_validator_ = overlay_candidate_validator.Pass();
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 should_not_show_frames_ = true; 128 should_not_show_frames_ = true;
127 } 129 }
128 130
129 bool GpuBrowserCompositorOutputSurface::ShouldNotShowFramesAfterRecycle() 131 bool GpuBrowserCompositorOutputSurface::ShouldNotShowFramesAfterRecycle()
130 const { 132 const {
131 return should_not_show_frames_; 133 return should_not_show_frames_;
132 } 134 }
133 #endif 135 #endif
134 136
135 } // namespace content 137 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698