Title: [175031] releases/WebKitGTK/webkit-2.4/Source/WebCore
- Revision
- 175031
- Author
- [email protected]
- Date
- 2014-10-22 02:48:54 -0700 (Wed, 22 Oct 2014)
Log Message
Merge r174502 - [GTK] Netscape plugin API symbol used outside feature guards
https://bugs.webkit.org/show_bug.cgi?id=137385
Patch by Philip Chimento <[email protected]> on 2014-10-09
Reviewed by Philippe Normand.
* plugins/PluginPackage.cpp:
(WebCore::PluginPackage::unload): Add guards for Netscape Plugin
API around symbol, so that it compiles OK when the API is not
available.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (175030 => 175031)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-10-22 09:45:25 UTC (rev 175030)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-10-22 09:48:54 UTC (rev 175031)
@@ -1,3 +1,15 @@
+2014-10-09 Philip Chimento <[email protected]>
+
+ [GTK] Netscape plugin API symbol used outside feature guards
+ https://bugs.webkit.org/show_bug.cgi?id=137385
+
+ Reviewed by Philippe Normand.
+
+ * plugins/PluginPackage.cpp:
+ (WebCore::PluginPackage::unload): Add guards for Netscape Plugin
+ API around symbol, so that it compiles OK when the API is not
+ available.
+
2014-09-26 Carlos Garcia Campos <[email protected]>
Unreviewed. Fix make distcheck.
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/plugins/PluginPackage.cpp (175030 => 175031)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/plugins/PluginPackage.cpp 2014-10-22 09:45:25 UTC (rev 175030)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/plugins/PluginPackage.cpp 2014-10-22 09:48:54 UTC (rev 175031)
@@ -127,7 +127,9 @@
if (--m_loadCount > 0)
return;
+#if ENABLE(NETSCAPE_PLUGIN_API)
m_NPP_Shutdown();
+#endif
unloadWithoutShutdown();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
