diff options
Diffstat (limited to 'Source/WebKit/chromium/src/ChromeClientImpl.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/ChromeClientImpl.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/WebKit/chromium/src/ChromeClientImpl.cpp b/Source/WebKit/chromium/src/ChromeClientImpl.cpp index 70d565c2e..bc3061fb8 100644 --- a/Source/WebKit/chromium/src/ChromeClientImpl.cpp +++ b/Source/WebKit/chromium/src/ChromeClientImpl.cpp @@ -665,14 +665,14 @@ void ChromeClientImpl::dispatchViewportPropertiesDidChange(const ViewportArgumen int layoutHeight = computed.layoutSize.height(); m_webView->setFixedLayoutSize(IntSize(layoutWidth, layoutHeight)); - // FIXME: Investigate the impact this has on layout/rendering if any. - // This exposes the correct device scale to javascript and media queries. + bool needInitializePageScale = !m_webView->isPageScaleFactorSet(); if (useDefaultDeviceScaleFactor && settings->defaultDeviceScaleFactor()) m_webView->setDeviceScaleFactor(settings->defaultDeviceScaleFactor()); else m_webView->setDeviceScaleFactor(computed.devicePixelRatio); m_webView->setPageScaleFactorLimits(computed.minimumScale, computed.maximumScale); - m_webView->setPageScaleFactorPreservingScrollOffset(computed.initialScale * computed.devicePixelRatio); + if (needInitializePageScale) + m_webView->setPageScaleFactorPreservingScrollOffset(computed.initialScale * computed.devicePixelRatio); #endif } @@ -725,7 +725,8 @@ void ChromeClientImpl::runOpenPanel(Frame* frame, PassRefPtr<FileChooser> fileCh #else params.directory = false; #endif - params.acceptMIMETypes = fileChooser->settings().acceptMIMETypes; + params.acceptTypes = fileChooser->settings().acceptMIMETypes; + params.acceptMIMETypes = fileChooser->settings().acceptMIMETypes; // FIXME: Remove this once https://chromiumcodereview.appspot.com/10414085 lands. params.selectedFiles = fileChooser->settings().selectedFiles; if (params.selectedFiles.size() > 0) params.initialValue = params.selectedFiles[0]; |