Title: [144680] trunk/Source/WebKit2
- Revision
- 144680
- Author
- [email protected]
- Date
- 2013-03-04 14:44:20 -0800 (Mon, 04 Mar 2013)
Log Message
Unreviewed build fix: wrap references to PluginInfoStore with
guards for platforms which do not enable NETSCAPE_PLUGIN_AP.
* UIProcess/WebContext.cpp:
(WebKit::WebContext::WebContext):
(WebKit::WebContext::~WebContext):
* UIProcess/WebContext.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (144679 => 144680)
--- trunk/Source/WebKit2/ChangeLog 2013-03-04 22:41:13 UTC (rev 144679)
+++ trunk/Source/WebKit2/ChangeLog 2013-03-04 22:44:20 UTC (rev 144680)
@@ -1,3 +1,13 @@
+2013-03-04 Jer Noble <[email protected]>
+
+ Unreviewed build fix: wrap references to PluginInfoStore with
+ guards for platforms which do not enable NETSCAPE_PLUGIN_AP.
+
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::WebContext):
+ (WebKit::WebContext::~WebContext):
+ * UIProcess/WebContext.h:
+
2013-03-04 Anders Carlsson <[email protected]>
Create and destroy storage areas in the UI process
Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (144679 => 144680)
--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2013-03-04 22:41:13 UTC (rev 144679)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2013-03-04 22:44:20 UTC (rev 144680)
@@ -189,7 +189,9 @@
WebKit::initializeLogChannelsIfNecessary();
#endif // !LOG_DISABLED
+#if ENABLE(NETSCAPE_PLUGIN_API)
m_pluginInfoStore.setClient(this);
+#endif
#ifndef NDEBUG
webContextCounter.increment();
@@ -240,7 +242,9 @@
platformInvalidateContext();
+#if ENABLE(NETSCAPE_PLUGIN_API)
m_pluginInfoStore.setClient(0);
+#endif
#ifndef NDEBUG
webContextCounter.decrement();
@@ -1191,6 +1195,7 @@
}
#endif
+#if ENABLE(NETSCAPE_PLUGIN_API)
void WebContext::pluginInfoStoreDidLoadPlugins(PluginInfoStore* store)
{
ASSERT(store == &m_pluginInfoStore);
@@ -1219,5 +1224,6 @@
m_client.plugInInformationBecameAvailable(this, ImmutableArray::adopt(pluginArray).leakRef());
}
+#endif
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (144679 => 144680)
--- trunk/Source/WebKit2/UIProcess/WebContext.h 2013-03-04 22:41:13 UTC (rev 144679)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2013-03-04 22:44:20 UTC (rev 144680)
@@ -84,7 +84,11 @@
extern NSString *SchemeForCustomProtocolUnregisteredNotificationName;
#endif
-class WebContext : public APIObject, private PluginInfoStoreClient, private CoreIPC::MessageReceiver {
+class WebContext : public APIObject, private CoreIPC::MessageReceiver
+#if ENABLE(NETSCAPE_PLUGIN_API)
+ , private PluginInfoStoreClient
+#endif
+ {
public:
static const Type APIType = TypeContext;
@@ -371,8 +375,10 @@
void addPlugInAutoStartOriginHash(const String& pageOrigin, unsigned plugInOriginHash);
void plugInDidReceiveUserInteraction(unsigned plugInOriginHash);
+#if ENABLE(NETSCAPE_PLUGIN_API)
// PluginInfoStoreClient:
virtual void pluginInfoStoreDidLoadPlugins(PluginInfoStore*) OVERRIDE;
+#endif
CoreIPC::MessageReceiverMap m_messageReceiverMap;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
