| OLD | NEW |
| 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 543 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 554 if (document->isSVGDocument()) { | 554 if (document->isSVGDocument()) { |
| 555 if (!document->accessSVGExtensions().zoomAndPanEnabled()) | 555 if (!document->accessSVGExtensions().zoomAndPanEnabled()) |
| 556 return; | 556 return; |
| 557 } | 557 } |
| 558 | 558 |
| 559 if (m_pageZoomFactor != pageZoomFactor) { | 559 if (m_pageZoomFactor != pageZoomFactor) { |
| 560 if (FrameView* view = this->view()) { | 560 if (FrameView* view = this->view()) { |
| 561 // Update the scroll position when doing a full page zoom, so the co
ntent stays in relatively the same position. | 561 // Update the scroll position when doing a full page zoom, so the co
ntent stays in relatively the same position. |
| 562 LayoutPoint scrollPosition = view->scrollPosition(); | 562 LayoutPoint scrollPosition = view->scrollPosition(); |
| 563 float percentDifference = (pageZoomFactor / m_pageZoomFactor); | 563 float percentDifference = (pageZoomFactor / m_pageZoomFactor); |
| 564 view->setScrollPosition(IntPoint(scrollPosition.x() * percentDiffere
nce, scrollPosition.y() * percentDifference)); | 564 view->setScrollPosition(DoublePoint(scrollPosition.x() * percentDiff
erence, scrollPosition.y() * percentDifference)); |
| 565 } | 565 } |
| 566 } | 566 } |
| 567 | 567 |
| 568 m_pageZoomFactor = pageZoomFactor; | 568 m_pageZoomFactor = pageZoomFactor; |
| 569 m_textZoomFactor = textZoomFactor; | 569 m_textZoomFactor = textZoomFactor; |
| 570 | 570 |
| 571 for (RefPtrWillBeRawPtr<Frame> child = tree().firstChild(); child; child = c
hild->tree().nextSibling()) { | 571 for (RefPtrWillBeRawPtr<Frame> child = tree().firstChild(); child; child = c
hild->tree().nextSibling()) { |
| 572 if (child->isLocalFrame()) | 572 if (child->isLocalFrame()) |
| 573 toLocalFrame(child.get())->setPageAndTextZoomFactors(m_pageZoomFacto
r, m_textZoomFactor); | 573 toLocalFrame(child.get())->setPageAndTextZoomFactors(m_pageZoomFacto
r, m_textZoomFactor); |
| 574 } | 574 } |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 741 | 741 |
| 742 return curFrame; | 742 return curFrame; |
| 743 } | 743 } |
| 744 | 744 |
| 745 void LocalFrame::setPagePopupOwner(Element& owner) | 745 void LocalFrame::setPagePopupOwner(Element& owner) |
| 746 { | 746 { |
| 747 m_pagePopupOwner = &owner; | 747 m_pagePopupOwner = &owner; |
| 748 } | 748 } |
| 749 | 749 |
| 750 } // namespace blink | 750 } // namespace blink |
| OLD | NEW |