OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/renderer/gpu/render_widget_compositor.h" | 5 #include "content/renderer/gpu/render_widget_compositor.h" |
6 | 6 |
7 #include <limits> | 7 #include <limits> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 23 matching lines...) Expand all Loading... |
34 #include "content/public/common/content_switches.h" | 34 #include "content/public/common/content_switches.h" |
35 #include "content/renderer/input/input_handler_manager.h" | 35 #include "content/renderer/input/input_handler_manager.h" |
36 #include "content/renderer/scheduler/renderer_scheduler.h" | 36 #include "content/renderer/scheduler/renderer_scheduler.h" |
37 #include "gpu/command_buffer/client/gles2_interface.h" | 37 #include "gpu/command_buffer/client/gles2_interface.h" |
38 #include "third_party/WebKit/public/platform/WebCompositeAndReadbackAsyncCallbac
k.h" | 38 #include "third_party/WebKit/public/platform/WebCompositeAndReadbackAsyncCallbac
k.h" |
39 #include "third_party/WebKit/public/platform/WebSelectionBound.h" | 39 #include "third_party/WebKit/public/platform/WebSelectionBound.h" |
40 #include "third_party/WebKit/public/platform/WebSize.h" | 40 #include "third_party/WebKit/public/platform/WebSize.h" |
41 #include "third_party/WebKit/public/web/WebKit.h" | 41 #include "third_party/WebKit/public/web/WebKit.h" |
42 #include "third_party/WebKit/public/web/WebWidget.h" | 42 #include "third_party/WebKit/public/web/WebWidget.h" |
43 #include "ui/gfx/frame_time.h" | 43 #include "ui/gfx/frame_time.h" |
| 44 #include "ui/gfx/hud_font.h" |
44 #include "ui/gl/gl_switches.h" | 45 #include "ui/gl/gl_switches.h" |
45 #include "ui/native_theme/native_theme_switches.h" | 46 #include "ui/native_theme/native_theme_switches.h" |
46 | 47 |
47 #if defined(OS_ANDROID) | 48 #if defined(OS_ANDROID) |
48 #include "content/renderer/android/synchronous_compositor_factory.h" | 49 #include "content/renderer/android/synchronous_compositor_factory.h" |
49 #include "ui/gfx/android/device_display_info.h" | 50 #include "ui/gfx/android/device_display_info.h" |
50 #endif | 51 #endif |
51 | 52 |
52 namespace base { | 53 namespace base { |
53 class Value; | 54 class Value; |
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
424 compositor_deps_->GetSharedBitmapManager(); | 425 compositor_deps_->GetSharedBitmapManager(); |
425 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager = | 426 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager = |
426 compositor_deps_->GetGpuMemoryBufferManager(); | 427 compositor_deps_->GetGpuMemoryBufferManager(); |
427 | 428 |
428 scoped_ptr<cc::BeginFrameSource> external_begin_frame_source; | 429 scoped_ptr<cc::BeginFrameSource> external_begin_frame_source; |
429 if (settings.use_external_begin_frame_source) { | 430 if (settings.use_external_begin_frame_source) { |
430 external_begin_frame_source = | 431 external_begin_frame_source = |
431 compositor_deps_->CreateExternalBeginFrameSource(widget_->routing_id()); | 432 compositor_deps_->CreateExternalBeginFrameSource(widget_->routing_id()); |
432 } | 433 } |
433 | 434 |
| 435 settings.hud_typeface = ui::GetHudTypeface(); |
| 436 |
434 if (compositor_thread_task_runner.get()) { | 437 if (compositor_thread_task_runner.get()) { |
435 layer_tree_host_ = cc::LayerTreeHost::CreateThreaded( | 438 layer_tree_host_ = cc::LayerTreeHost::CreateThreaded( |
436 this, shared_bitmap_manager, gpu_memory_buffer_manager, settings, | 439 this, shared_bitmap_manager, gpu_memory_buffer_manager, settings, |
437 main_thread_compositor_task_runner, compositor_thread_task_runner, | 440 main_thread_compositor_task_runner, compositor_thread_task_runner, |
438 external_begin_frame_source.Pass()); | 441 external_begin_frame_source.Pass()); |
439 } else { | 442 } else { |
440 layer_tree_host_ = cc::LayerTreeHost::CreateSingleThreaded( | 443 layer_tree_host_ = cc::LayerTreeHost::CreateSingleThreaded( |
441 this, this, shared_bitmap_manager, gpu_memory_buffer_manager, settings, | 444 this, this, shared_bitmap_manager, gpu_memory_buffer_manager, settings, |
442 main_thread_compositor_task_runner, external_begin_frame_source.Pass()); | 445 main_thread_compositor_task_runner, external_begin_frame_source.Pass()); |
443 } | 446 } |
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
877 widget_->OnSwapBuffersAborted(); | 880 widget_->OnSwapBuffersAborted(); |
878 } | 881 } |
879 | 882 |
880 void RenderWidgetCompositor::RateLimitSharedMainThreadContext() { | 883 void RenderWidgetCompositor::RateLimitSharedMainThreadContext() { |
881 cc::ContextProvider* provider = | 884 cc::ContextProvider* provider = |
882 compositor_deps_->GetSharedMainThreadContextProvider(); | 885 compositor_deps_->GetSharedMainThreadContextProvider(); |
883 provider->ContextGL()->RateLimitOffscreenContextCHROMIUM(); | 886 provider->ContextGL()->RateLimitOffscreenContextCHROMIUM(); |
884 } | 887 } |
885 | 888 |
886 } // namespace content | 889 } // namespace content |
OLD | NEW |