Merge WebKit at r67908: Initial merge by Git

Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972

1 files changed, 11 insertions, 6 deletions

diff --git a/WebKit/chromium/src/FrameLoaderClientImpl.cpp b/WebKit/chromium/src/FrameLoaderClientImpl.cpp
index ea668c7..61d43df 100644
--- a/WebKit/chromium/src/FrameLoaderClientImpl.cpp
+++ b/WebKit/chromium/src/FrameLoaderClientImpl.cpp
@@ -1053,8 +1053,7 @@ void FrameLoaderClientImpl::committedLoad(DocumentLoader* loader, const char* da
 
     // If we are sending data to MediaDocument, we should stop here
     // and cancel the request.
-    if (m_webFrame->frame()->document()
-        && m_webFrame->frame()->document()->isMediaDocument())
+    if (m_webFrame->frame()->document()->isMediaDocument())
         loader->cancelMainResourceLoad(pluginWillHandleLoadError(loader->response()));
 
     // The plugin widget could have been created in the m_webFrame->DidReceiveData
@@ -1207,6 +1206,12 @@ bool FrameLoaderClientImpl::canHandleRequest(const ResourceRequest& request) con
         m_webFrame, WrappedResourceRequest(request));
 }
 
+bool FrameLoaderClientImpl::canShowMIMETypeAsHTML(const String& MIMEType) const
+{
+    notImplemented();
+    return false;
+}
+
 bool FrameLoaderClientImpl::canShowMIMEType(const String& mimeType) const
 {
     // This method is called to determine if the media type can be shown
@@ -1398,12 +1403,12 @@ PassRefPtr<Widget> FrameLoaderClientImpl::createPlugin(
     if (!webPlugin->initialize(container.get()))
         return 0;
 
-    if (m_webFrame->frame()->view()->zoomFactor() != 1) {
+    bool zoomTextOnly = m_webFrame->viewImpl()->zoomTextOnly();
+    float zoomFactor = zoomTextOnly ? m_webFrame->frame()->textZoomFactor() : m_webFrame->frame()->pageZoomFactor();
+    if (zoomFactor != 1) {
         // There's a saved zoom level, so tell the plugin about it since
         // WebViewImpl::setZoomLevel was called before the plugin was created.
-        webPlugin->setZoomFactor(
-            m_webFrame->frame()->view()->zoomFactor(),
-            m_webFrame->frame()->page()->settings()->zoomMode() == ZoomTextOnly);
+        webPlugin->setZoomFactor(zoomFactor, zoomTextOnly);
     }
 
     // The element might have been removed during plugin initialization!