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

Side by Side Diff: Source/core/page/Page.cpp

Issue 1173053003: Remove ScrollableArea::notifyScrollPositionChanged and cleanup scroll animators. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase + remove updateScrollbars from FrameView::setScrollPosition Created 5 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All R ights Reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All R ights Reserved.
3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 310
311 if (scale != viewport.scale()) { 311 if (scale != viewport.scale()) {
312 viewport.setScale(scale); 312 viewport.setScale(scale);
313 313
314 chromeClient().pageScaleFactorChanged(); 314 chromeClient().pageScaleFactorChanged();
315 315
316 deprecatedLocalMainFrame()->loader().saveScrollState(); 316 deprecatedLocalMainFrame()->loader().saveScrollState();
317 } 317 }
318 318
319 if (view && view->scrollPosition() != origin) 319 if (view && view->scrollPosition() != origin)
320 view->notifyScrollPositionChanged(origin); 320 view->setScrollPosition(origin, ProgrammaticScroll);
321 } 321 }
322 322
323 float Page::pageScaleFactor() const 323 float Page::pageScaleFactor() const
324 { 324 {
325 return frameHost().pinchViewport().scale(); 325 return frameHost().pinchViewport().scale();
326 } 326 }
327 327
328 void Page::setDeviceScaleFactor(float scaleFactor) 328 void Page::setDeviceScaleFactor(float scaleFactor)
329 { 329 {
330 if (m_deviceScaleFactor == scaleFactor) 330 if (m_deviceScaleFactor == scaleFactor)
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 { 594 {
595 } 595 }
596 596
597 Page::PageClients::~PageClients() 597 Page::PageClients::~PageClients()
598 { 598 {
599 } 599 }
600 600
601 template class CORE_TEMPLATE_EXPORT WillBeHeapSupplement<Page>; 601 template class CORE_TEMPLATE_EXPORT WillBeHeapSupplement<Page>;
602 602
603 } // namespace blink 603 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/loader/FrameLoader.cpp ('k') | Source/core/paint/DeprecatedPaintLayerScrollableArea.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698