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

Side by Side Diff: android_webview/browser/hardware_renderer.cc

Issue 1143433005: Remove gfx::FrameTime for a single clock source (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Handling patch for mac files Created 5 years, 7 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 "android_webview/browser/hardware_renderer.h" 5 #include "android_webview/browser/hardware_renderer.h"
6 6
7 #include "android_webview/browser/aw_gl_surface.h" 7 #include "android_webview/browser/aw_gl_surface.h"
8 #include "android_webview/browser/aw_render_thread_context_provider.h" 8 #include "android_webview/browser/aw_render_thread_context_provider.h"
9 #include "android_webview/browser/child_frame.h" 9 #include "android_webview/browser/child_frame.h"
10 #include "android_webview/browser/deferred_gpu_command_service.h" 10 #include "android_webview/browser/deferred_gpu_command_service.h"
11 #include "android_webview/browser/parent_compositor_draw_constraints.h" 11 #include "android_webview/browser/parent_compositor_draw_constraints.h"
12 #include "android_webview/browser/parent_output_surface.h" 12 #include "android_webview/browser/parent_output_surface.h"
13 #include "android_webview/browser/shared_renderer_state.h" 13 #include "android_webview/browser/shared_renderer_state.h"
14 #include "android_webview/public/browser/draw_gl.h" 14 #include "android_webview/public/browser/draw_gl.h"
15 #include "base/auto_reset.h" 15 #include "base/auto_reset.h"
16 #include "base/strings/string_number_conversions.h" 16 #include "base/strings/string_number_conversions.h"
17 #include "base/trace_event/trace_event.h" 17 #include "base/trace_event/trace_event.h"
18 #include "cc/layers/delegated_frame_provider.h" 18 #include "cc/layers/delegated_frame_provider.h"
19 #include "cc/layers/delegated_renderer_layer.h" 19 #include "cc/layers/delegated_renderer_layer.h"
20 #include "cc/layers/layer.h" 20 #include "cc/layers/layer.h"
21 #include "cc/output/compositor_frame.h" 21 #include "cc/output/compositor_frame.h"
22 #include "cc/output/output_surface.h" 22 #include "cc/output/output_surface.h"
23 #include "cc/scheduler/begin_frame_source.h" 23 #include "cc/scheduler/begin_frame_source.h"
24 #include "cc/trees/layer_tree_host.h" 24 #include "cc/trees/layer_tree_host.h"
25 #include "cc/trees/layer_tree_settings.h" 25 #include "cc/trees/layer_tree_settings.h"
26 #include "gpu/command_buffer/client/gl_in_process_context.h" 26 #include "gpu/command_buffer/client/gl_in_process_context.h"
27 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 27 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
28 #include "ui/gfx/frame_time.h"
29 #include "ui/gfx/geometry/rect_conversions.h" 28 #include "ui/gfx/geometry/rect_conversions.h"
30 #include "ui/gfx/geometry/rect_f.h" 29 #include "ui/gfx/geometry/rect_f.h"
31 #include "ui/gfx/transform.h" 30 #include "ui/gfx/transform.h"
32 #include "ui/gl/gl_bindings.h" 31 #include "ui/gl/gl_bindings.h"
33 32
34 namespace android_webview { 33 namespace android_webview {
35 34
36 HardwareRenderer::HardwareRenderer(SharedRendererState* state) 35 HardwareRenderer::HardwareRenderer(SharedRendererState* state)
37 : shared_renderer_state_(state), 36 : shared_renderer_state_(state),
38 last_egl_context_(eglGetCurrentContext()), 37 last_egl_context_(eglGetCurrentContext()),
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 draw_info->clip_bottom - draw_info->clip_top); 182 draw_info->clip_bottom - draw_info->clip_top);
184 stencil_enabled_ = stencil_enabled; 183 stencil_enabled_ = stencil_enabled;
185 184
186 delegated_layer_->SetTransform(transform); 185 delegated_layer_->SetTransform(transform);
187 186
188 gl_surface_->SetBackingFrameBufferObject(framebuffer_binding_ext); 187 gl_surface_->SetBackingFrameBufferObject(framebuffer_binding_ext);
189 { 188 {
190 base::AutoReset<bool> frame_resetter(&viewport_clip_valid_for_dcheck_, 189 base::AutoReset<bool> frame_resetter(&viewport_clip_valid_for_dcheck_,
191 true); 190 true);
192 layer_tree_host_->SetNeedsRedrawRect(clip_); 191 layer_tree_host_->SetNeedsRedrawRect(clip_);
193 layer_tree_host_->Composite(gfx::FrameTime::Now()); 192 layer_tree_host_->Composite(base::TimeTicks::Now());
194 } 193 }
195 gl_surface_->ResetBackingFrameBufferObject(); 194 gl_surface_->ResetBackingFrameBufferObject();
196 } 195 }
197 196
198 void HardwareRenderer::RequestNewOutputSurface() { 197 void HardwareRenderer::RequestNewOutputSurface() {
199 scoped_refptr<cc::ContextProvider> context_provider = 198 scoped_refptr<cc::ContextProvider> context_provider =
200 AwRenderThreadContextProvider::Create( 199 AwRenderThreadContextProvider::Create(
201 gl_surface_, DeferredGpuCommandService::GetInstance()); 200 gl_surface_, DeferredGpuCommandService::GetInstance());
202 scoped_ptr<ParentOutputSurface> output_surface_holder( 201 scoped_ptr<ParentOutputSurface> output_surface_holder(
203 new ParentOutputSurface(context_provider)); 202 new ParentOutputSurface(context_provider));
204 output_surface_ = output_surface_holder.get(); 203 output_surface_ = output_surface_holder.get();
205 layer_tree_host_->SetOutputSurface(output_surface_holder.Pass()); 204 layer_tree_host_->SetOutputSurface(output_surface_holder.Pass());
206 } 205 }
207 206
208 void HardwareRenderer::DidFailToInitializeOutputSurface() { 207 void HardwareRenderer::DidFailToInitializeOutputSurface() {
209 RequestNewOutputSurface(); 208 RequestNewOutputSurface();
210 } 209 }
211 210
212 void HardwareRenderer::UnusedResourcesAreAvailable() { 211 void HardwareRenderer::UnusedResourcesAreAvailable() {
213 cc::ReturnedResourceArray returned_resources; 212 cc::ReturnedResourceArray returned_resources;
214 resource_collection_->TakeUnusedResourcesForChildCompositor( 213 resource_collection_->TakeUnusedResourcesForChildCompositor(
215 &returned_resources); 214 &returned_resources);
216 shared_renderer_state_->InsertReturnedResourcesOnRT(returned_resources); 215 shared_renderer_state_->InsertReturnedResourcesOnRT(returned_resources);
217 } 216 }
218 217
219 } // namespace android_webview 218 } // namespace android_webview
OLDNEW
« no previous file with comments | « AUTHORS ('k') | cc/input/top_controls_manager.cc » ('j') | cc/scheduler/begin_frame_source.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698