| OLD | NEW |
| 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 680 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 691 frame->document()->mediaVolumeDidChange(); | 691 frame->document()->mediaVolumeDidChange(); |
| 692 } | 692 } |
| 693 } | 693 } |
| 694 | 694 |
| 695 void Page::setPageScaleFactor(float scale, const IntPoint& origin) | 695 void Page::setPageScaleFactor(float scale, const IntPoint& origin) |
| 696 { | 696 { |
| 697 Document* document = mainFrame()->document(); | 697 Document* document = mainFrame()->document(); |
| 698 FrameView* view = document->view(); | 698 FrameView* view = document->view(); |
| 699 | 699 |
| 700 if (scale == m_pageScaleFactor) { | 700 if (scale == m_pageScaleFactor) { |
| 701 if (view && (view->scrollPosition() != origin || view->delegatesScrollin
g())) | 701 if (view && view->scrollPosition() != origin) |
| 702 view->setScrollPosition(origin); | 702 view->setScrollPosition(origin); |
| 703 return; | 703 return; |
| 704 } | 704 } |
| 705 | 705 |
| 706 m_pageScaleFactor = scale; | 706 m_pageScaleFactor = scale; |
| 707 | 707 |
| 708 #if USE(ACCELERATED_COMPOSITING) | 708 #if USE(ACCELERATED_COMPOSITING) |
| 709 mainFrame()->deviceOrPageScaleFactorChanged(); | 709 mainFrame()->deviceOrPageScaleFactorChanged(); |
| 710 #endif | 710 #endif |
| 711 | 711 |
| (...skipping 642 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1354 , plugInClient(0) | 1354 , plugInClient(0) |
| 1355 , validationMessageClient(0) | 1355 , validationMessageClient(0) |
| 1356 { | 1356 { |
| 1357 } | 1357 } |
| 1358 | 1358 |
| 1359 Page::PageClients::~PageClients() | 1359 Page::PageClients::~PageClients() |
| 1360 { | 1360 { |
| 1361 } | 1361 } |
| 1362 | 1362 |
| 1363 } // namespace WebCore | 1363 } // namespace WebCore |
| OLD | NEW |