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

Side by Side Diff: cc/blink/web_layer_impl.cc

Issue 2194833002: Overscroll and Elasticity for views::ScrollView Base URL: https://chromium.googlesource.com/chromium/src.git@20160728-MacViews-RouteThroughInputHandler
Patch Set: Restore functionality and fix bugs \o/ Created 4 years, 1 month 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
« no previous file with comments | « cc/blimp/layer_tree_host_remote.cc ('k') | cc/input/input_handler.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
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::WebDoublePoint WebLayerImpl::scrollPositionDouble() const {
225 return blink::WebDoublePoint(layer_->scroll_offset().x(), 225 return blink::WebDoublePoint(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_->SetScrollClipAndCanOverscroll(Layer::INVALID_ID, false);
232 return; 232 return;
233 } 233 }
234 layer_->SetScrollClipLayerId(clip_layer->id()); 234 layer_->SetScrollClipAndCanOverscroll(clip_layer->id(), false);
235 } 235 }
236 236
237 bool WebLayerImpl::scrollable() const { 237 bool WebLayerImpl::scrollable() const {
238 return layer_->scrollable(); 238 return layer_->scrollable();
239 } 239 }
240 240
241 void WebLayerImpl::setUserScrollable(bool horizontal, bool vertical) { 241 void WebLayerImpl::setUserScrollable(bool horizontal, bool vertical) {
242 layer_->SetUserScrollable(horizontal, vertical); 242 layer_->SetUserScrollable(horizontal, vertical);
243 } 243 }
244 244
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
476 476
477 void WebLayerImpl::setPreferredRasterBounds(const WebSize& bounds) { 477 void WebLayerImpl::setPreferredRasterBounds(const WebSize& bounds) {
478 layer_->SetPreferredRasterBounds(bounds); 478 layer_->SetPreferredRasterBounds(bounds);
479 } 479 }
480 480
481 void WebLayerImpl::clearPreferredRasterBounds() { 481 void WebLayerImpl::clearPreferredRasterBounds() {
482 layer_->ClearPreferredRasterBounds(); 482 layer_->ClearPreferredRasterBounds();
483 } 483 }
484 484
485 } // namespace cc_blink 485 } // namespace cc_blink
OLDNEW
« no previous file with comments | « cc/blimp/layer_tree_host_remote.cc ('k') | cc/input/input_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698