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

Side by Side Diff: content/renderer/gpu/render_widget_compositor.cc

Issue 1895873006: compositor-worker: Initialize CW machinery plumbing to compositor and fire CW rAF callbacks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Include WebCompositorMutatorClient from WebLayerTreeView to allow unique_ptr usage. Created 4 years, 6 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 (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 <stddef.h> 7 #include <stddef.h>
8 #include <limits> 8 #include <limits>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
11 11
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/location.h" 13 #include "base/location.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/numerics/safe_conversions.h" 15 #include "base/numerics/safe_conversions.h"
16 #include "base/single_thread_task_runner.h" 16 #include "base/single_thread_task_runner.h"
17 #include "base/strings/string_number_conversions.h" 17 #include "base/strings/string_number_conversions.h"
18 #include "base/synchronization/lock.h" 18 #include "base/synchronization/lock.h"
19 #include "base/sys_info.h" 19 #include "base/sys_info.h"
20 #include "base/threading/thread_task_runner_handle.h" 20 #include "base/threading/thread_task_runner_handle.h"
21 #include "base/time/time.h" 21 #include "base/time/time.h"
22 #include "base/values.h" 22 #include "base/values.h"
23 #include "build/build_config.h" 23 #include "build/build_config.h"
24 #include "cc/animation/animation_host.h" 24 #include "cc/animation/animation_host.h"
25 #include "cc/animation/animation_timeline.h" 25 #include "cc/animation/animation_timeline.h"
26 #include "cc/animation/layer_tree_mutator.h"
26 #include "cc/base/switches.h" 27 #include "cc/base/switches.h"
27 #include "cc/blink/web_layer_impl.h" 28 #include "cc/blink/web_layer_impl.h"
28 #include "cc/debug/layer_tree_debug_state.h" 29 #include "cc/debug/layer_tree_debug_state.h"
29 #include "cc/debug/micro_benchmark.h" 30 #include "cc/debug/micro_benchmark.h"
30 #include "cc/input/layer_selection_bound.h" 31 #include "cc/input/layer_selection_bound.h"
31 #include "cc/layers/layer.h" 32 #include "cc/layers/layer.h"
32 #include "cc/output/begin_frame_args.h" 33 #include "cc/output/begin_frame_args.h"
33 #include "cc/output/copy_output_request.h" 34 #include "cc/output/copy_output_request.h"
34 #include "cc/output/copy_output_result.h" 35 #include "cc/output/copy_output_result.h"
35 #include "cc/output/latency_info_swap_promise.h" 36 #include "cc/output/latency_info_swap_promise.h"
36 #include "cc/output/swap_promise.h" 37 #include "cc/output/swap_promise.h"
37 #include "cc/proto/compositor_message.pb.h" 38 #include "cc/proto/compositor_message.pb.h"
38 #include "cc/resources/single_release_callback.h" 39 #include "cc/resources/single_release_callback.h"
39 #include "cc/scheduler/begin_frame_source.h" 40 #include "cc/scheduler/begin_frame_source.h"
40 #include "cc/trees/latency_info_swap_promise_monitor.h" 41 #include "cc/trees/latency_info_swap_promise_monitor.h"
41 #include "cc/trees/layer_tree_host.h" 42 #include "cc/trees/layer_tree_host.h"
42 #include "cc/trees/remote_proto_channel.h" 43 #include "cc/trees/remote_proto_channel.h"
43 #include "components/scheduler/renderer/renderer_scheduler.h" 44 #include "components/scheduler/renderer/renderer_scheduler.h"
44 #include "content/common/content_switches_internal.h" 45 #include "content/common/content_switches_internal.h"
45 #include "content/common/gpu/client/context_provider_command_buffer.h" 46 #include "content/common/gpu/client/context_provider_command_buffer.h"
46 #include "content/common/input/input_event_utils.h" 47 #include "content/common/input/input_event_utils.h"
47 #include "content/public/common/content_client.h" 48 #include "content/public/common/content_client.h"
48 #include "content/public/common/content_switches.h" 49 #include "content/public/common/content_switches.h"
49 #include "content/renderer/gpu/render_widget_compositor_delegate.h" 50 #include "content/renderer/gpu/render_widget_compositor_delegate.h"
50 #include "content/renderer/input/input_handler_manager.h" 51 #include "content/renderer/input/input_handler_manager.h"
51 #include "gpu/command_buffer/client/gles2_interface.h" 52 #include "gpu/command_buffer/client/gles2_interface.h"
52 #include "gpu/command_buffer/service/gpu_switches.h" 53 #include "gpu/command_buffer/service/gpu_switches.h"
53 #include "third_party/WebKit/public/platform/WebCompositeAndReadbackAsyncCallbac k.h" 54 #include "third_party/WebKit/public/platform/WebCompositeAndReadbackAsyncCallbac k.h"
55 #include "third_party/WebKit/public/platform/WebCompositorMutatorClient.h"
54 #include "third_party/WebKit/public/platform/WebLayoutAndPaintAsyncCallback.h" 56 #include "third_party/WebKit/public/platform/WebLayoutAndPaintAsyncCallback.h"
55 #include "third_party/WebKit/public/platform/WebSize.h" 57 #include "third_party/WebKit/public/platform/WebSize.h"
56 #include "third_party/WebKit/public/web/WebKit.h" 58 #include "third_party/WebKit/public/web/WebKit.h"
57 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" 59 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
58 #include "third_party/WebKit/public/web/WebSelection.h" 60 #include "third_party/WebKit/public/web/WebSelection.h"
59 #include "ui/gl/gl_switches.h" 61 #include "ui/gl/gl_switches.h"
60 #include "ui/native_theme/native_theme_switches.h" 62 #include "ui/native_theme/native_theme_switches.h"
61 63
62 #if defined(OS_ANDROID) 64 #if defined(OS_ANDROID)
63 #include "base/android/build_info.h" 65 #include "base/android/build_info.h"
(...skipping 657 matching lines...) Expand 10 before | Expand all | Expand 10 after
721 void RenderWidgetCompositor::registerSelection( 723 void RenderWidgetCompositor::registerSelection(
722 const blink::WebSelection& selection) { 724 const blink::WebSelection& selection) {
723 layer_tree_host_->RegisterSelection(ConvertWebSelection(selection)); 725 layer_tree_host_->RegisterSelection(ConvertWebSelection(selection));
724 } 726 }
725 727
726 void RenderWidgetCompositor::clearSelection() { 728 void RenderWidgetCompositor::clearSelection() {
727 cc::LayerSelection empty_selection; 729 cc::LayerSelection empty_selection;
728 layer_tree_host_->RegisterSelection(empty_selection); 730 layer_tree_host_->RegisterSelection(empty_selection);
729 } 731 }
730 732
733 void RenderWidgetCompositor::setMutatorClient(
734 std::unique_ptr<blink::WebCompositorMutatorClient> client) {
735 TRACE_EVENT0("compositor-worker", "RenderWidgetCompositor::setMutatorClient");
736 layer_tree_host_->SetLayerTreeMutator(std::move(client));
737 }
738
731 static_assert(static_cast<cc::EventListenerClass>( 739 static_assert(static_cast<cc::EventListenerClass>(
732 blink::WebEventListenerClass::TouchStartOrMove) == 740 blink::WebEventListenerClass::TouchStartOrMove) ==
733 cc::EventListenerClass::kTouchStartOrMove, 741 cc::EventListenerClass::kTouchStartOrMove,
734 "EventListenerClass and WebEventListenerClass enums must match"); 742 "EventListenerClass and WebEventListenerClass enums must match");
735 static_assert(static_cast<cc::EventListenerClass>( 743 static_assert(static_cast<cc::EventListenerClass>(
736 blink::WebEventListenerClass::MouseWheel) == 744 blink::WebEventListenerClass::MouseWheel) ==
737 cc::EventListenerClass::kMouseWheel, 745 cc::EventListenerClass::kMouseWheel,
738 "EventListenerClass and WebEventListenerClass enums must match"); 746 "EventListenerClass and WebEventListenerClass enums must match");
739 747
740 static_assert(static_cast<cc::EventListenerProperties>( 748 static_assert(static_cast<cc::EventListenerProperties>(
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
1133 #endif 1141 #endif
1134 return actual; 1142 return actual;
1135 } 1143 }
1136 1144
1137 void RenderWidgetCompositor::SetPaintedDeviceScaleFactor( 1145 void RenderWidgetCompositor::SetPaintedDeviceScaleFactor(
1138 float device_scale) { 1146 float device_scale) {
1139 layer_tree_host_->SetPaintedDeviceScaleFactor(device_scale); 1147 layer_tree_host_->SetPaintedDeviceScaleFactor(device_scale);
1140 } 1148 }
1141 1149
1142 } // namespace content 1150 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/gpu/render_widget_compositor.h ('k') | third_party/WebKit/Source/core/dom/CompositorProxyClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698