OLD | NEW |
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 "components/html_viewer/web_layer_tree_view_impl.h" | 5 #include "components/html_viewer/web_layer_tree_view_impl.h" |
6 | 6 |
7 #include "base/message_loop/message_loop_proxy.h" | 7 #include "base/message_loop/message_loop_proxy.h" |
8 #include "cc/blink/web_layer_impl.h" | 8 #include "cc/blink/web_layer_impl.h" |
9 #include "cc/layers/layer.h" | 9 #include "cc/layers/layer.h" |
10 #include "cc/output/begin_frame_args.h" | 10 #include "cc/output/begin_frame_args.h" |
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
172 | 172 |
173 void WebLayerTreeViewImpl::setPageScaleFactorAndLimits(float page_scale_factor, | 173 void WebLayerTreeViewImpl::setPageScaleFactorAndLimits(float page_scale_factor, |
174 float minimum, | 174 float minimum, |
175 float maximum) { | 175 float maximum) { |
176 layer_tree_host_->SetPageScaleFactorAndLimits( | 176 layer_tree_host_->SetPageScaleFactorAndLimits( |
177 page_scale_factor, minimum, maximum); | 177 page_scale_factor, minimum, maximum); |
178 } | 178 } |
179 | 179 |
180 void WebLayerTreeViewImpl::registerForAnimations(blink::WebLayer* layer) { | 180 void WebLayerTreeViewImpl::registerForAnimations(blink::WebLayer* layer) { |
181 cc::Layer* cc_layer = static_cast<cc_blink::WebLayerImpl*>(layer)->layer(); | 181 cc::Layer* cc_layer = static_cast<cc_blink::WebLayerImpl*>(layer)->layer(); |
182 cc_layer->layer_animation_controller()->SetAnimationRegistrar( | 182 cc_layer->RegisterForAnimations(layer_tree_host_->animation_registrar()); |
183 layer_tree_host_->animation_registrar()); | |
184 } | 183 } |
185 | 184 |
186 void WebLayerTreeViewImpl::registerViewportLayers( | 185 void WebLayerTreeViewImpl::registerViewportLayers( |
187 const blink::WebLayer* overscrollElasticityLayer, | 186 const blink::WebLayer* overscrollElasticityLayer, |
188 const blink::WebLayer* pageScaleLayer, | 187 const blink::WebLayer* pageScaleLayer, |
189 const blink::WebLayer* innerViewportScrollLayer, | 188 const blink::WebLayer* innerViewportScrollLayer, |
190 const blink::WebLayer* outerViewportScrollLayer) { | 189 const blink::WebLayer* outerViewportScrollLayer) { |
191 layer_tree_host_->RegisterViewportLayers( | 190 layer_tree_host_->RegisterViewportLayers( |
192 // The scroll elasticity layer will only exist when using pinch virtual | 191 // The scroll elasticity layer will only exist when using pinch virtual |
193 // viewports. | 192 // viewports. |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
245 base::Bind(&WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread, | 244 base::Bind(&WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread, |
246 main_thread_bound_weak_ptr_, | 245 main_thread_bound_weak_ptr_, |
247 id)); | 246 id)); |
248 } | 247 } |
249 | 248 |
250 void WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread(cc::SurfaceId id) { | 249 void WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread(cc::SurfaceId id) { |
251 view_->SetSurfaceId(mojo::SurfaceId::From(id)); | 250 view_->SetSurfaceId(mojo::SurfaceId::From(id)); |
252 } | 251 } |
253 | 252 |
254 } // namespace html_viewer | 253 } // namespace html_viewer |
OLD | NEW |