Title: [144015] trunk/Source/WebKit2
Revision
144015
Author
hausm...@webkit.org
Date
2013-02-26 00:28:52 -0800 (Tue, 26 Feb 2013)

Log Message

Unreviewed trivial !ENABLE(NETSCAPE_PLUGIN_API) build fix

Add an intermediate pluginName string variable instead of
accessing plugin.info outside the feature #ifdef.

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

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (144014 => 144015)


--- trunk/Source/WebKit2/ChangeLog	2013-02-26 07:57:27 UTC (rev 144014)
+++ trunk/Source/WebKit2/ChangeLog	2013-02-26 08:28:52 UTC (rev 144015)
@@ -1,3 +1,13 @@
+2013-02-26  Simon Hausmann  <simon.hausm...@digia.com>
+
+        Unreviewed trivial !ENABLE(NETSCAPE_PLUGIN_API) build fix
+
+        Add an intermediate pluginName string variable instead of
+        accessing plugin.info outside the feature #ifdef.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::unavailablePluginButtonClicked):
+
 2013-02-25  Huang Dongsung  <luxte...@company100.net>
 
         Coordinated Graphics: remove redundant update of non compositing layer.

Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (144014 => 144015)


--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2013-02-26 07:57:27 UTC (rev 144014)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2013-02-26 08:28:52 UTC (rev 144015)
@@ -2617,6 +2617,7 @@
 
     String pluginBundleIdentifier;
     String pluginBundleVersion;
+    String pluginName;
     String newMimeType = mimeType;
 #if ENABLE(NETSCAPE_PLUGIN_API)
     PluginModuleInfo plugin = m_process->context()->pluginInfoStore().findPlugin(newMimeType, KURL(KURL(), pluginURLString));
@@ -2624,6 +2625,7 @@
     pluginBundleIdentifier = plugin.bundleIdentifier;
     pluginBundleVersion = plugin.versionString;
 #endif
+    pluginName = plugin.info.name;
 #endif
 
     WKPluginUnavailabilityReason pluginUnavailabilityReason = kWKPluginUnavailabilityReasonPluginMissing;
@@ -2652,7 +2654,7 @@
         ASSERT_NOT_REACHED();
     }
 
-    m_uiClient.unavailablePluginButtonClicked(this, pluginUnavailabilityReason, mimeType, pluginBundleIdentifier, pluginBundleVersion, plugin.info.name, pluginURLString, pluginspageAttributeURLString, frameURLString, pageURLString);
+    m_uiClient.unavailablePluginButtonClicked(this, pluginUnavailabilityReason, mimeType, pluginBundleIdentifier, pluginBundleVersion, pluginName, pluginURLString, pluginspageAttributeURLString, frameURLString, pageURLString);
 }
 
 void WebPageProxy::setToolbarsAreVisible(bool toolbarsAreVisible)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to