diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-02 10:43:26 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-02 10:44:03 +0200 |
| commit | bb91a70e24ac49fd21c1d7c8c91a216961da1e2d (patch) | |
| tree | 4c2497e0b093c7b0a25d48e72659dca21a50569a /chromium/third_party/WebKit/Source/web/WebViewImpl.cpp | |
| parent | 1ec92e71bb67445775ce64cb081ed25c3d7481f1 (diff) | |
| parent | b92421879c003a0857b2074f7e05b3bbbb326569 (diff) | |
| download | qtwebengine-chromium-bb91a70e24ac49fd21c1d7c8c91a216961da1e2d.tar.gz | |
Merge branch 'upstream-master' into 51-based
Change-Id: I08d36e04494c3bb0c04641ad7c8e53bf418975db
Diffstat (limited to 'chromium/third_party/WebKit/Source/web/WebViewImpl.cpp')
| -rw-r--r-- | chromium/third_party/WebKit/Source/web/WebViewImpl.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/chromium/third_party/WebKit/Source/web/WebViewImpl.cpp b/chromium/third_party/WebKit/Source/web/WebViewImpl.cpp index e906bb7b5a1..22c0a1e4dd6 100644 --- a/chromium/third_party/WebKit/Source/web/WebViewImpl.cpp +++ b/chromium/third_party/WebKit/Source/web/WebViewImpl.cpp @@ -3467,7 +3467,6 @@ float WebViewImpl::maximumPageScaleFactor() const void WebViewImpl::resetScaleStateImmediately() { - page()->frameHost().visualViewport().setScale(1); pageScaleConstraintsSet().setNeedsReset(true); } |