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

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

Issue 610423004: Preserve fractional scroll offset for JS scrolling API (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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) 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 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 if (document->isSVGDocument()) { 544 if (document->isSVGDocument()) {
545 if (!document->accessSVGExtensions().zoomAndPanEnabled()) 545 if (!document->accessSVGExtensions().zoomAndPanEnabled())
546 return; 546 return;
547 } 547 }
548 548
549 if (m_pageZoomFactor != pageZoomFactor) { 549 if (m_pageZoomFactor != pageZoomFactor) {
550 if (FrameView* view = this->view()) { 550 if (FrameView* view = this->view()) {
551 // Update the scroll position when doing a full page zoom, so the co ntent stays in relatively the same position. 551 // Update the scroll position when doing a full page zoom, so the co ntent stays in relatively the same position.
552 LayoutPoint scrollPosition = view->scrollPosition(); 552 LayoutPoint scrollPosition = view->scrollPosition();
553 float percentDifference = (pageZoomFactor / m_pageZoomFactor); 553 float percentDifference = (pageZoomFactor / m_pageZoomFactor);
554 view->setScrollPosition(IntPoint(scrollPosition.x() * percentDiffere nce, scrollPosition.y() * percentDifference)); 554 view->setScrollPosition(DoublePoint(scrollPosition.x() * percentDiff erence, scrollPosition.y() * percentDifference));
555 } 555 }
556 } 556 }
557 557
558 m_pageZoomFactor = pageZoomFactor; 558 m_pageZoomFactor = pageZoomFactor;
559 m_textZoomFactor = textZoomFactor; 559 m_textZoomFactor = textZoomFactor;
560 560
561 for (RefPtrWillBeRawPtr<Frame> child = tree().firstChild(); child; child = c hild->tree().nextSibling()) { 561 for (RefPtrWillBeRawPtr<Frame> child = tree().firstChild(); child; child = c hild->tree().nextSibling()) {
562 if (child->isLocalFrame()) 562 if (child->isLocalFrame())
563 toLocalFrame(child.get())->setPageAndTextZoomFactors(m_pageZoomFacto r, m_textZoomFactor); 563 toLocalFrame(child.get())->setPageAndTextZoomFactors(m_pageZoomFacto r, m_textZoomFactor);
564 } 564 }
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
731 731
732 return curFrame; 732 return curFrame;
733 } 733 }
734 734
735 void LocalFrame::setPagePopupOwner(Element& owner) 735 void LocalFrame::setPagePopupOwner(Element& owner)
736 { 736 {
737 m_pagePopupOwner = &owner; 737 m_pagePopupOwner = &owner;
738 } 738 }
739 739
740 } // namespace blink 740 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698