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 "cc/blink/web_layer_impl.h" | 5 #include "cc/blink/web_layer_impl.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <utility> | 10 #include <utility> |
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
210 } | 210 } |
211 | 211 |
212 void WebLayerImpl::setBackgroundFilters(const cc::FilterOperations& filters) { | 212 void WebLayerImpl::setBackgroundFilters(const cc::FilterOperations& filters) { |
213 layer_->SetBackgroundFilters(filters); | 213 layer_->SetBackgroundFilters(filters); |
214 } | 214 } |
215 | 215 |
216 bool WebLayerImpl::hasTickingAnimationForTesting() { | 216 bool WebLayerImpl::hasTickingAnimationForTesting() { |
217 return layer_->HasTickingAnimationForTesting(); | 217 return layer_->HasTickingAnimationForTesting(); |
218 } | 218 } |
219 | 219 |
220 void WebLayerImpl::setScrollPositionDouble(blink::WebDoublePoint position) { | 220 void WebLayerImpl::setScrollPosition(blink::WebFloatPoint position) { |
221 layer_->SetScrollOffset(gfx::ScrollOffset(position.x, position.y)); | 221 layer_->SetScrollOffset(gfx::ScrollOffset(position.x, position.y)); |
222 } | 222 } |
223 | 223 |
224 blink::WebDoublePoint WebLayerImpl::scrollPositionDouble() const { | 224 blink::WebFloatPoint WebLayerImpl::scrollPosition() const { |
225 return blink::WebDoublePoint(layer_->scroll_offset().x(), | 225 return blink::WebFloatPoint(layer_->scroll_offset().x(), |
226 layer_->scroll_offset().y()); | 226 layer_->scroll_offset().y()); |
227 } | 227 } |
228 | 228 |
229 void WebLayerImpl::setScrollClipLayer(WebLayer* clip_layer) { | 229 void WebLayerImpl::setScrollClipLayer(WebLayer* clip_layer) { |
230 if (!clip_layer) { | 230 if (!clip_layer) { |
231 layer_->SetScrollClipLayerId(Layer::INVALID_ID); | 231 layer_->SetScrollClipLayerId(Layer::INVALID_ID); |
232 return; | 232 return; |
233 } | 233 } |
234 layer_->SetScrollClipLayerId(clip_layer->id()); | 234 layer_->SetScrollClipLayerId(clip_layer->id()); |
235 } | 235 } |
236 | 236 |
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
409 return ToWebLayerStickyPositionConstraint( | 409 return ToWebLayerStickyPositionConstraint( |
410 layer_->sticky_position_constraint()); | 410 layer_->sticky_position_constraint()); |
411 } | 411 } |
412 | 412 |
413 void WebLayerImpl::setScrollClient(blink::WebLayerScrollClient* scroll_client) { | 413 void WebLayerImpl::setScrollClient(blink::WebLayerScrollClient* scroll_client) { |
414 if (scroll_client) { | 414 if (scroll_client) { |
415 layer_->set_did_scroll_callback( | 415 layer_->set_did_scroll_callback( |
416 base::Bind(&blink::WebLayerScrollClient::didScroll, | 416 base::Bind(&blink::WebLayerScrollClient::didScroll, |
417 base::Unretained(scroll_client))); | 417 base::Unretained(scroll_client))); |
418 } else { | 418 } else { |
419 layer_->set_did_scroll_callback(base::Closure()); | 419 layer_->set_did_scroll_callback( |
| 420 base::Callback<void(const gfx::ScrollOffset&)>()); |
420 } | 421 } |
421 } | 422 } |
422 | 423 |
423 void WebLayerImpl::setLayerClient(cc::LayerClient* client) { | 424 void WebLayerImpl::setLayerClient(cc::LayerClient* client) { |
424 layer_->SetLayerClient(client); | 425 layer_->SetLayerClient(client); |
425 } | 426 } |
426 | 427 |
427 const cc::Layer* WebLayerImpl::ccLayer() const { | 428 const cc::Layer* WebLayerImpl::ccLayer() const { |
428 return layer_.get(); | 429 return layer_.get(); |
429 } | 430 } |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
476 | 477 |
477 void WebLayerImpl::setPreferredRasterBounds(const WebSize& bounds) { | 478 void WebLayerImpl::setPreferredRasterBounds(const WebSize& bounds) { |
478 layer_->SetPreferredRasterBounds(bounds); | 479 layer_->SetPreferredRasterBounds(bounds); |
479 } | 480 } |
480 | 481 |
481 void WebLayerImpl::clearPreferredRasterBounds() { | 482 void WebLayerImpl::clearPreferredRasterBounds() { |
482 layer_->ClearPreferredRasterBounds(); | 483 layer_->ClearPreferredRasterBounds(); |
483 } | 484 } |
484 | 485 |
485 } // namespace cc_blink | 486 } // namespace cc_blink |
OLD | NEW |