| 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 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 220 layer_->SetScrollOffset(gfx::ScrollOffset(position.x, position.y)); | 220 layer_->SetScrollOffset(gfx::ScrollOffset(position.x, position.y)); |
| 221 } | 221 } |
| 222 | 222 |
| 223 blink::WebDoublePoint WebLayerImpl::scrollPositionDouble() const { | 223 blink::WebDoublePoint WebLayerImpl::scrollPositionDouble() const { |
| 224 return blink::WebDoublePoint(layer_->scroll_offset().x(), | 224 return blink::WebDoublePoint(layer_->scroll_offset().x(), |
| 225 layer_->scroll_offset().y()); | 225 layer_->scroll_offset().y()); |
| 226 } | 226 } |
| 227 | 227 |
| 228 void WebLayerImpl::setScrollClipLayer(WebLayer* clip_layer) { | 228 void WebLayerImpl::setScrollClipLayer(WebLayer* clip_layer) { |
| 229 if (!clip_layer) { | 229 if (!clip_layer) { |
| 230 layer_->SetScrollClipLayerId(Layer::INVALID_ID); | 230 layer_->SetScrollClipAndCanOverscroll(Layer::INVALID_ID, false); |
| 231 return; | 231 return; |
| 232 } | 232 } |
| 233 layer_->SetScrollClipLayerId(clip_layer->id()); | 233 layer_->SetScrollClipAndCanOverscroll(clip_layer->id(), false); |
| 234 } | 234 } |
| 235 | 235 |
| 236 bool WebLayerImpl::scrollable() const { | 236 bool WebLayerImpl::scrollable() const { |
| 237 return layer_->scrollable(); | 237 return layer_->scrollable(); |
| 238 } | 238 } |
| 239 | 239 |
| 240 void WebLayerImpl::setUserScrollable(bool horizontal, bool vertical) { | 240 void WebLayerImpl::setUserScrollable(bool horizontal, bool vertical) { |
| 241 layer_->SetUserScrollable(horizontal, vertical); | 241 layer_->SetUserScrollable(horizontal, vertical); |
| 242 } | 242 } |
| 243 | 243 |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 416 | 416 |
| 417 void WebLayerImpl::SetContentsOpaqueIsFixed(bool fixed) { | 417 void WebLayerImpl::SetContentsOpaqueIsFixed(bool fixed) { |
| 418 contents_opaque_is_fixed_ = fixed; | 418 contents_opaque_is_fixed_ = fixed; |
| 419 } | 419 } |
| 420 | 420 |
| 421 void WebLayerImpl::setHasWillChangeTransformHint(bool has_will_change) { | 421 void WebLayerImpl::setHasWillChangeTransformHint(bool has_will_change) { |
| 422 layer_->SetHasWillChangeTransformHint(has_will_change); | 422 layer_->SetHasWillChangeTransformHint(has_will_change); |
| 423 } | 423 } |
| 424 | 424 |
| 425 } // namespace cc_blink | 425 } // namespace cc_blink |
| OLD | NEW |