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

Side by Side Diff: Source/core/page/Page.cpp

Issue 263853008: Added pinch viewport offset to history item. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 7 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/loader/HistoryItem.cpp ('k') | Source/web/WebHistoryItem.cpp » ('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) 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 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 } 316 }
317 317
318 void Page::setPageScaleFactor(float scale, const IntPoint& origin) 318 void Page::setPageScaleFactor(float scale, const IntPoint& origin)
319 { 319 {
320 FrameView* view = mainFrame()->view(); 320 FrameView* view = mainFrame()->view();
321 PinchViewport& viewport = frameHost().pinchViewport(); 321 PinchViewport& viewport = frameHost().pinchViewport();
322 322
323 if (scale != viewport.scale()) { 323 if (scale != viewport.scale()) {
324 viewport.setScale(scale); 324 viewport.setScale(scale);
325 325
326 if (view) 326 if (view && !settings().pinchVirtualViewportEnabled())
327 view->setVisibleContentScaleFactor(scale); 327 view->setVisibleContentScaleFactor(scale);
328 328
329 mainFrame()->deviceOrPageScaleFactorChanged(); 329 mainFrame()->deviceOrPageScaleFactorChanged();
330 m_chrome->client().deviceOrPageScaleFactorChanged(); 330 m_chrome->client().deviceOrPageScaleFactorChanged();
331 331
332 if (view) 332 if (view)
333 view->viewportConstrainedVisibleContentSizeChanged(true, true); 333 view->viewportConstrainedVisibleContentSizeChanged(true, true);
334 334
335 mainFrame()->loader().saveScrollState(); 335 mainFrame()->loader().saveScrollState();
336 } 336 }
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
584 , spellCheckerClient(0) 584 , spellCheckerClient(0)
585 , storageClient(0) 585 , storageClient(0)
586 { 586 {
587 } 587 }
588 588
589 Page::PageClients::~PageClients() 589 Page::PageClients::~PageClients()
590 { 590 {
591 } 591 }
592 592
593 } // namespace WebCore 593 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/loader/HistoryItem.cpp ('k') | Source/web/WebHistoryItem.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698