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

Side by Side Diff: Source/core/frame/LocalFrame.cpp

Issue 1158673006: Replace various ScrollableArea scroll methods with setScrollPosition (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Build fix 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
« no previous file with comments | « Source/core/frame/LocalDOMWindow.cpp ('k') | Source/core/frame/PinchViewport.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 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Simon Hausmann <hausmann@kde.org> 5 * 2000 Simon Hausmann <hausmann@kde.org>
6 * 2000 Stefan Schimanski <1Stein@gmx.de> 6 * 2000 Stefan Schimanski <1Stein@gmx.de>
7 * 2001 George Staikos <staikos@kde.org> 7 * 2001 George Staikos <staikos@kde.org>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
(...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 if (document->isSVGDocument()) { 527 if (document->isSVGDocument()) {
528 if (!document->accessSVGExtensions().zoomAndPanEnabled()) 528 if (!document->accessSVGExtensions().zoomAndPanEnabled())
529 return; 529 return;
530 } 530 }
531 531
532 if (m_pageZoomFactor != pageZoomFactor) { 532 if (m_pageZoomFactor != pageZoomFactor) {
533 if (FrameView* view = this->view()) { 533 if (FrameView* view = this->view()) {
534 // Update the scroll position when doing a full page zoom, so the co ntent stays in relatively the same position. 534 // Update the scroll position when doing a full page zoom, so the co ntent stays in relatively the same position.
535 LayoutPoint scrollPosition = view->scrollPosition(); 535 LayoutPoint scrollPosition = view->scrollPosition();
536 float percentDifference = (pageZoomFactor / m_pageZoomFactor); 536 float percentDifference = (pageZoomFactor / m_pageZoomFactor);
537 view->setScrollPosition(DoublePoint(scrollPosition.x() * percentDiff erence, scrollPosition.y() * percentDifference)); 537 view->setScrollPosition(
538 DoublePoint(scrollPosition.x() * percentDifference, scrollPositi on.y() * percentDifference),
539 ProgrammaticScroll);
538 } 540 }
539 } 541 }
540 542
541 m_pageZoomFactor = pageZoomFactor; 543 m_pageZoomFactor = pageZoomFactor;
542 m_textZoomFactor = textZoomFactor; 544 m_textZoomFactor = textZoomFactor;
543 545
544 for (RefPtrWillBeRawPtr<Frame> child = tree().firstChild(); child; child = c hild->tree().nextSibling()) { 546 for (RefPtrWillBeRawPtr<Frame> child = tree().firstChild(); child; child = c hild->tree().nextSibling()) {
545 if (child->isLocalFrame()) 547 if (child->isLocalFrame())
546 toLocalFrame(child.get())->setPageAndTextZoomFactors(m_pageZoomFacto r, m_textZoomFactor); 548 toLocalFrame(child.get())->setPageAndTextZoomFactors(m_pageZoomFacto r, m_textZoomFactor);
547 } 549 }
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
825 , m_textZoomFactor(parentTextZoomFactor(this)) 827 , m_textZoomFactor(parentTextZoomFactor(this))
826 , m_inViewSourceMode(false) 828 , m_inViewSourceMode(false)
827 { 829 {
828 if (isLocalRoot()) 830 if (isLocalRoot())
829 m_instrumentingAgents = InstrumentingAgents::create(); 831 m_instrumentingAgents = InstrumentingAgents::create();
830 else 832 else
831 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; 833 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents;
832 } 834 }
833 835
834 } // namespace blink 836 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/LocalDOMWindow.cpp ('k') | Source/core/frame/PinchViewport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698