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

Side by Side Diff: blimp/client/compositor/blimp_compositor.cc

Issue 1602343002: compositor-worker: cc->blink mutation plumbing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@compositor-worker-ian-patch
Patch Set: Fix blimp issue Created 4 years, 11 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "blimp/client/compositor/blimp_compositor.h" 5 #include "blimp/client/compositor/blimp_compositor.h"
6 6
7 #include "base/bind_helpers.h" 7 #include "base/bind_helpers.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/numerics/safe_conversions.h" 10 #include "base/numerics/safe_conversions.h"
11 #include "base/single_thread_task_runner.h" 11 #include "base/single_thread_task_runner.h"
12 #include "base/thread_task_runner_handle.h" 12 #include "base/thread_task_runner_handle.h"
13 #include "base/threading/thread.h" 13 #include "base/threading/thread.h"
14 #include "base/threading/thread_local.h" 14 #include "base/threading/thread_local.h"
15 #include "base/threading/thread_restrictions.h" 15 #include "base/threading/thread_restrictions.h"
16 #include "blimp/client/compositor/blimp_context_provider.h" 16 #include "blimp/client/compositor/blimp_context_provider.h"
17 #include "blimp/client/compositor/blimp_layer_tree_settings.h" 17 #include "blimp/client/compositor/blimp_layer_tree_settings.h"
18 #include "blimp/client/compositor/blimp_output_surface.h" 18 #include "blimp/client/compositor/blimp_output_surface.h"
19 #include "blimp/client/compositor/test/dummy_layer_driver.h" 19 #include "blimp/client/compositor/test/dummy_layer_driver.h"
20 #include "blimp/client/session/render_widget_feature.h" 20 #include "blimp/client/session/render_widget_feature.h"
21 #include "blimp/common/compositor/blimp_task_graph_runner.h" 21 #include "blimp/common/compositor/blimp_task_graph_runner.h"
22 #include "cc/animation/layer_tree_mutations.h"
22 #include "cc/layers/layer.h" 23 #include "cc/layers/layer.h"
23 #include "cc/layers/layer_settings.h" 24 #include "cc/layers/layer_settings.h"
24 #include "cc/output/output_surface.h" 25 #include "cc/output/output_surface.h"
25 #include "cc/proto/compositor_message.pb.h" 26 #include "cc/proto/compositor_message.pb.h"
26 #include "cc/trees/layer_tree_host.h" 27 #include "cc/trees/layer_tree_host.h"
27 #include "net/base/net_errors.h" 28 #include "net/base/net_errors.h"
28 #include "ui/gl/gl_surface.h" 29 #include "ui/gl/gl_surface.h"
29 30
30 namespace blimp { 31 namespace blimp {
31 namespace client { 32 namespace client {
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 143
143 void BlimpCompositor::UpdateLayerTreeHost() {} 144 void BlimpCompositor::UpdateLayerTreeHost() {}
144 145
145 void BlimpCompositor::ApplyViewportDeltas( 146 void BlimpCompositor::ApplyViewportDeltas(
146 const gfx::Vector2dF& inner_delta, 147 const gfx::Vector2dF& inner_delta,
147 const gfx::Vector2dF& outer_delta, 148 const gfx::Vector2dF& outer_delta,
148 const gfx::Vector2dF& elastic_overscroll_delta, 149 const gfx::Vector2dF& elastic_overscroll_delta,
149 float page_scale, 150 float page_scale,
150 float top_controls_delta) {} 151 float top_controls_delta) {}
151 152
153 void BlimpCompositor::ApplyMutations(const cc::LayerTreeMutations& mutations) {}
154
152 void BlimpCompositor::RequestNewOutputSurface() { 155 void BlimpCompositor::RequestNewOutputSurface() {
153 output_surface_request_pending_ = true; 156 output_surface_request_pending_ = true;
154 HandlePendingOutputSurfaceRequest(); 157 HandlePendingOutputSurfaceRequest();
155 } 158 }
156 159
157 void BlimpCompositor::DidInitializeOutputSurface() { 160 void BlimpCompositor::DidInitializeOutputSurface() {
158 } 161 }
159 162
160 void BlimpCompositor::DidFailToInitializeOutputSurface() {} 163 void BlimpCompositor::DidFailToInitializeOutputSurface() {}
161 164
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 } 317 }
315 318
316 cc::LayerSettings BlimpCompositor::LayerSettings() { 319 cc::LayerSettings BlimpCompositor::LayerSettings() {
317 cc::LayerSettings settings; 320 cc::LayerSettings settings;
318 settings.use_compositor_animation_timelines = true; 321 settings.use_compositor_animation_timelines = true;
319 return settings; 322 return settings;
320 } 323 }
321 324
322 } // namespace client 325 } // namespace client
323 } // namespace blimp 326 } // namespace blimp
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698