From: philn@webkit.org <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri, 18 May 2012 04:41:07 +0000 (+0000)
Subject: Unreviewed, WebKit2 GTK/Qt build fix attempt after r117516.
X-Git-Tag: 070512121124~4015
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3bc4f42b8482fd75f43ab193c3a8a578b9282e83;p=profile%2Fivi%2Fwebkit-efl.git

Unreviewed, WebKit2 GTK/Qt build fix attempt after r117516.

* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didBlockInsecurePluginVersion):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@117539 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index d66e04f..9b3b379 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-17  Philippe Normand  <pnormand@igalia.com>
+
+        Unreviewed, WebKit2 GTK/Qt build fix attempt after r117516.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::didBlockInsecurePluginVersion):
+
 2012-05-17  Anders Carlsson  <andersca@apple.com>
 
         Plug-ins blacklist mechanism can tell clients about plug-in with null identifier
diff --git a/Source/WebKit2/UIProcess/WebPageProxy.cpp b/Source/WebKit2/UIProcess/WebPageProxy.cpp
index bcc748b..e11daf1 100644
--- a/Source/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/Source/WebKit2/UIProcess/WebPageProxy.cpp
@@ -3627,9 +3627,9 @@ void WebPageProxy::didBlockInsecurePluginVersion(const String& mimeType, const S
 {
     String pluginIdentifier;
     String pluginVersion;
+    String newMimeType = mimeType;
 
 #if PLATFORM(MAC)
-    String newMimeType = mimeType;
     PluginModuleInfo plugin = m_process->context()->pluginInfoStore().findPlugin(newMimeType, KURL(KURL(), urlString));
 
     pluginIdentifier = plugin.bundleIdentifier;