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 <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <cmath> | 9 #include <cmath> |
10 #include <limits> | 10 #include <limits> |
(...skipping 48 matching lines...) Loading... |
59 #include "gpu/command_buffer/service/gpu_switches.h" | 59 #include "gpu/command_buffer/service/gpu_switches.h" |
60 #include "services/ui/public/cpp/gpu/context_provider_command_buffer.h" | 60 #include "services/ui/public/cpp/gpu/context_provider_command_buffer.h" |
61 #include "third_party/WebKit/public/platform/WebCompositeAndReadbackAsyncCallbac
k.h" | 61 #include "third_party/WebKit/public/platform/WebCompositeAndReadbackAsyncCallbac
k.h" |
62 #include "third_party/WebKit/public/platform/WebCompositorMutatorClient.h" | 62 #include "third_party/WebKit/public/platform/WebCompositorMutatorClient.h" |
63 #include "third_party/WebKit/public/platform/WebLayoutAndPaintAsyncCallback.h" | 63 #include "third_party/WebKit/public/platform/WebLayoutAndPaintAsyncCallback.h" |
64 #include "third_party/WebKit/public/platform/WebSize.h" | 64 #include "third_party/WebKit/public/platform/WebSize.h" |
65 #include "third_party/WebKit/public/platform/scheduler/renderer/renderer_schedul
er.h" | 65 #include "third_party/WebKit/public/platform/scheduler/renderer/renderer_schedul
er.h" |
66 #include "third_party/WebKit/public/web/WebKit.h" | 66 #include "third_party/WebKit/public/web/WebKit.h" |
67 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" | 67 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" |
68 #include "third_party/WebKit/public/web/WebSelection.h" | 68 #include "third_party/WebKit/public/web/WebSelection.h" |
| 69 #include "third_party/skia/include/core/SkImage.h" |
69 #include "ui/gl/gl_switches.h" | 70 #include "ui/gl/gl_switches.h" |
70 #include "ui/native_theme/native_theme_switches.h" | 71 #include "ui/native_theme/native_theme_switches.h" |
71 #include "ui/native_theme/overlay_scrollbar_constants_aura.h" | 72 #include "ui/native_theme/overlay_scrollbar_constants_aura.h" |
72 | 73 |
73 namespace base { | 74 namespace base { |
74 class Value; | 75 class Value; |
75 } | 76 } |
76 | 77 |
77 namespace cc { | 78 namespace cc { |
78 class Layer; | 79 class Layer; |
(...skipping 943 matching lines...) Loading... |
1022 } | 1023 } |
1023 | 1024 |
1024 void RenderWidgetCompositor::SetBrowserControlsShownRatio(float ratio) { | 1025 void RenderWidgetCompositor::SetBrowserControlsShownRatio(float ratio) { |
1025 layer_tree_host_->SetBrowserControlsShownRatio(ratio); | 1026 layer_tree_host_->SetBrowserControlsShownRatio(ratio); |
1026 } | 1027 } |
1027 | 1028 |
1028 void RenderWidgetCompositor::setBottomControlsHeight(float height) { | 1029 void RenderWidgetCompositor::setBottomControlsHeight(float height) { |
1029 layer_tree_host_->SetBottomControlsHeight(height); | 1030 layer_tree_host_->SetBottomControlsHeight(height); |
1030 } | 1031 } |
1031 | 1032 |
| 1033 void RenderWidgetCompositor::RequestDecode( |
| 1034 sk_sp<SkImage> image, |
| 1035 const base::Callback<void(bool)>& callback) { |
| 1036 layer_tree_host_->QueueImageDecode(std::move(image), callback); |
| 1037 |
| 1038 // If we're compositing synchronously, the SetNeedsCommit call which will be |
| 1039 // issued by |layer_tree_host_| is not going to cause a commit, due to the |
| 1040 // fact that this would make layout tests slow and cause flakiness. However, |
| 1041 // in this case we actually need a commit to transfer the decode requests to |
| 1042 // the impl side. So, force a commit to happen. |
| 1043 if (CompositeIsSynchronous()) { |
| 1044 base::ThreadTaskRunnerHandle::Get()->PostTask( |
| 1045 FROM_HERE, base::Bind(&RenderWidgetCompositor::SynchronouslyComposite, |
| 1046 weak_factory_.GetWeakPtr())); |
| 1047 } |
| 1048 } |
| 1049 |
1032 void RenderWidgetCompositor::WillBeginMainFrame() { | 1050 void RenderWidgetCompositor::WillBeginMainFrame() { |
1033 delegate_->WillBeginCompositorFrame(); | 1051 delegate_->WillBeginCompositorFrame(); |
1034 } | 1052 } |
1035 | 1053 |
1036 void RenderWidgetCompositor::DidBeginMainFrame() {} | 1054 void RenderWidgetCompositor::DidBeginMainFrame() {} |
1037 | 1055 |
1038 void RenderWidgetCompositor::BeginMainFrame(const cc::BeginFrameArgs& args) { | 1056 void RenderWidgetCompositor::BeginMainFrame(const cc::BeginFrameArgs& args) { |
1039 compositor_deps_->GetRendererScheduler()->WillBeginFrame(args); | 1057 compositor_deps_->GetRendererScheduler()->WillBeginFrame(args); |
1040 double frame_time_sec = (args.frame_time - base::TimeTicks()).InSecondsF(); | 1058 double frame_time_sec = (args.frame_time - base::TimeTicks()).InSecondsF(); |
1041 delegate_->BeginMainFrame(frame_time_sec); | 1059 delegate_->BeginMainFrame(frame_time_sec); |
(...skipping 108 matching lines...) Loading... |
1150 void RenderWidgetCompositor::SetContentSourceId(uint32_t id) { | 1168 void RenderWidgetCompositor::SetContentSourceId(uint32_t id) { |
1151 layer_tree_host_->SetContentSourceId(id); | 1169 layer_tree_host_->SetContentSourceId(id); |
1152 } | 1170 } |
1153 | 1171 |
1154 void RenderWidgetCompositor::SetLocalSurfaceId( | 1172 void RenderWidgetCompositor::SetLocalSurfaceId( |
1155 const cc::LocalSurfaceId& local_surface_id) { | 1173 const cc::LocalSurfaceId& local_surface_id) { |
1156 layer_tree_host_->SetLocalSurfaceId(local_surface_id); | 1174 layer_tree_host_->SetLocalSurfaceId(local_surface_id); |
1157 } | 1175 } |
1158 | 1176 |
1159 } // namespace content | 1177 } // namespace content |
OLD | NEW |