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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/loader/HistoryItem.cpp ('k') | Source/web/WebHistoryItem.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/Page.cpp
diff --git a/Source/core/page/Page.cpp b/Source/core/page/Page.cpp
index a2ed7e811190fc2ec7002063bc1ada32cb1130c0..568c7435a784e31c022ccb4bdab02da84249846c 100644
--- a/Source/core/page/Page.cpp
+++ b/Source/core/page/Page.cpp
@@ -323,7 +323,7 @@ void Page::setPageScaleFactor(float scale, const IntPoint& origin)
if (scale != viewport.scale()) {
viewport.setScale(scale);
- if (view)
+ if (view && !settings().pinchVirtualViewportEnabled())
view->setVisibleContentScaleFactor(scale);
mainFrame()->deviceOrPageScaleFactorChanged();
« 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