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

Side by Side Diff: Source/core/layout/LayerScrollableArea.cpp

Issue 933823004: Revert of Respect the smooth scrolling setting in LayerScrollableArea. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « Source/core/layout/LayerScrollableArea.h ('k') | Source/web/WebPagePopupImpl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
5 * 5 *
6 * Other contributors: 6 * Other contributors:
7 * Robert O'Callahan <roc+@cs.cmu.edu> 7 * Robert O'Callahan <roc+@cs.cmu.edu>
8 * David Baron <dbaron@fas.harvard.edu> 8 * David Baron <dbaron@fas.harvard.edu>
9 * Christian Biesinger <cbiesinger@web.de> 9 * Christian Biesinger <cbiesinger@web.de>
10 * Randall Jesup <rjesup@wgate.com> 10 * Randall Jesup <rjesup@wgate.com>
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 IntSize LayerScrollableArea::overhangAmount() const 478 IntSize LayerScrollableArea::overhangAmount() const
479 { 479 {
480 return IntSize(); 480 return IntSize();
481 } 481 }
482 482
483 IntPoint LayerScrollableArea::lastKnownMousePosition() const 483 IntPoint LayerScrollableArea::lastKnownMousePosition() const
484 { 484 {
485 return box().frame() ? box().frame()->eventHandler().lastKnownMousePosition( ) : IntPoint(); 485 return box().frame() ? box().frame()->eventHandler().lastKnownMousePosition( ) : IntPoint();
486 } 486 }
487 487
488 bool LayerScrollableArea::scrollAnimatorEnabled() const
489 {
490 if (Settings* settings = box().frame()->settings())
491 return settings->scrollAnimatorEnabled();
492 return false;
493 }
494
495 bool LayerScrollableArea::shouldSuspendScrollAnimations() const 488 bool LayerScrollableArea::shouldSuspendScrollAnimations() const
496 { 489 {
497 RenderView* view = box().view(); 490 RenderView* view = box().view();
498 if (!view) 491 if (!view)
499 return true; 492 return true;
500 return view->frameView()->shouldSuspendScrollAnimations(); 493 return view->frameView()->shouldSuspendScrollAnimations();
501 } 494 }
502 495
503 bool LayerScrollableArea::scrollbarsCanBeActive() const 496 bool LayerScrollableArea::scrollbarsCanBeActive() const
504 { 497 {
(...skipping 874 matching lines...) Expand 10 before | Expand all | Expand 10 after
1379 void LayerScrollableArea::setTopmostScrollChild(Layer* scrollChild) 1372 void LayerScrollableArea::setTopmostScrollChild(Layer* scrollChild)
1380 { 1373 {
1381 // We only want to track the topmost scroll child for scrollable areas with 1374 // We only want to track the topmost scroll child for scrollable areas with
1382 // overlay scrollbars. 1375 // overlay scrollbars.
1383 if (!hasOverlayScrollbars()) 1376 if (!hasOverlayScrollbars())
1384 return; 1377 return;
1385 m_nextTopmostScrollChild = scrollChild; 1378 m_nextTopmostScrollChild = scrollChild;
1386 } 1379 }
1387 1380
1388 } // namespace blink 1381 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayerScrollableArea.h ('k') | Source/web/WebPagePopupImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698