| 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 365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 376 return; | 376 return; |
| 377 | 377 |
| 378 Page* page = this->page(); | 378 Page* page = this->page(); |
| 379 if (!page) | 379 if (!page) |
| 380 return; | 380 return; |
| 381 | 381 |
| 382 Document* document = this->document(); | 382 Document* document = this->document(); |
| 383 if (!document) | 383 if (!document) |
| 384 return; | 384 return; |
| 385 | 385 |
| 386 if (m_pageZoomFactor != pageZoomFactor) { | |
| 387 if (FrameView* view = this->view()) { | |
| 388 // Update the scroll position when doing a full page zoom, so the co
ntent stays in relatively the same position. | |
| 389 LayoutPoint scrollPosition = view->scrollPosition(); | |
| 390 float percentDifference = (pageZoomFactor / m_pageZoomFactor); | |
| 391 view->setScrollPosition(IntPoint(scrollPosition.x() * percentDiffere
nce, scrollPosition.y() * percentDifference)); | |
| 392 } | |
| 393 } | |
| 394 | |
| 395 m_pageZoomFactor = pageZoomFactor; | 386 m_pageZoomFactor = pageZoomFactor; |
| 396 m_textZoomFactor = textZoomFactor; | 387 m_textZoomFactor = textZoomFactor; |
| 397 | 388 |
| 398 document->setNeedsStyleRecalc(SubtreeStyleChange); | 389 document->setNeedsStyleRecalc(SubtreeStyleChange); |
| 399 document->updateLayoutIgnorePendingStylesheets(); | 390 document->updateLayoutIgnorePendingStylesheets(); |
| 400 } | 391 } |
| 401 | 392 |
| 402 void LocalFrame::deviceOrPageScaleFactorChanged() | 393 void LocalFrame::deviceOrPageScaleFactorChanged() |
| 403 { | 394 { |
| 404 document()->mediaQueryAffectingValueChanged(); | 395 document()->mediaQueryAffectingValueChanged(); |
| (...skipping 25 matching lines...) Expand all Loading... |
| 430 { | 421 { |
| 431 if (!m_host) | 422 if (!m_host) |
| 432 return 0; | 423 return 0; |
| 433 | 424 |
| 434 double ratio = m_host->deviceScaleFactor(); | 425 double ratio = m_host->deviceScaleFactor(); |
| 435 ratio *= pageZoomFactor(); | 426 ratio *= pageZoomFactor(); |
| 436 return ratio; | 427 return ratio; |
| 437 } | 428 } |
| 438 | 429 |
| 439 } // namespace blink | 430 } // namespace blink |
| OLD | NEW |