Diff
Modified: branches/safari-537.43-branch/Source/WebKit2/ChangeLog (151077 => 151078)
--- branches/safari-537.43-branch/Source/WebKit2/ChangeLog 2013-06-01 23:31:58 UTC (rev 151077)
+++ branches/safari-537.43-branch/Source/WebKit2/ChangeLog 2013-06-01 23:41:23 UTC (rev 151078)
@@ -1,5 +1,46 @@
2013-06-01 Jessie Berlin <[email protected]>
+ Merge r151054
+
+ 2013-05-31 Jessie Berlin <[email protected]>
+
+ Need the ability to get the information for a plug-in with a particular process id that may
+ be running on a page
+ https://bugs.webkit.org/show_bug.cgi?id=117090
+
+ Rubber-stamped by Anders Carlsson.
+
+ Follow-up to r151043 incorprating some feedback I got from Darin after I had already
+ committed the patch.
+
+ * UIProcess/API/C/mac/WKPagePrivateMac.cpp:
+ (callGetPlugInInformationBlockAndDispose):
+ Renamed to be less wordy.
+ (WKPageGetPlugInInformation):
+ Ditto.
+ * UIProcess/API/C/mac/WKPagePrivateMac.h:
+ Ditto.
+
+ * UIProcess/Plugins/PluginProcessManager.h:
+ * UIProcess/Plugins/mac/PluginProcessManagerMac.mm:
+ (WebKit::PluginProcessManager::findPlugInProcessByID):
+ Renamed to not use "Cocoa method style" in non-Cocoa functions.
+ (WebKit::PluginProcessManager::findPlugInProcessByToken):
+ Ditto.
+
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/mac/WebPageProxyMac.mm:
+ (WebKit::WebPageProxy::getPlugInInformation):
+ Reduce ref count churn and fix a variable name.
+ Updated for the change to findPlugInProcessByID.
+ (WebKit::WebPageProxy::containsPlugInCallback):
+ Updated for the change to findPlugInProcessByToken.
+
+ * WebProcess/Plugins/PDF/SimplePDFPlugin.h:
+ Move the override of a virtual function to the private section.
+
+2013-06-01 Jessie Berlin <[email protected]>
+
Merge r151043
2013-05-31 Jessie Berlin <[email protected]>
Modified: branches/safari-537.43-branch/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.cpp (151077 => 151078)
--- branches/safari-537.43-branch/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.cpp 2013-06-01 23:31:58 UTC (rev 151077)
+++ branches/safari-537.43-branch/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.cpp 2013-06-01 23:41:23 UTC (rev 151078)
@@ -36,14 +36,14 @@
return toImpl(pageRef)->processIdentifier();
}
-static void callGetInformationForPlugInWithProcessIDBlockAndDispose(WKDictionaryRef resultValue, WKErrorRef error, void* context)
+static void callGetPlugInInformationBlockAndDispose(WKDictionaryRef resultValue, WKErrorRef error, void* context)
{
- WKPageGetInformationForPlugInWithProcessIDBlock block = (WKPageGetInformationForPlugInWithProcessIDBlock)context;
+ WKPageGetPlugInInformationBlock block = (WKPageGetPlugInInformationBlock)context;
block(resultValue, error);
Block_release(block);
}
-void WKPageGetInformationForPlugInWithProcessID(WKPageRef pageRef, pid_t plugInProcessID, WKPageGetInformationForPlugInWithProcessIDBlock block)
+void WKPageGetPlugInInformation(WKPageRef pageRef, pid_t plugInProcessID, WKPageGetPlugInInformationBlock block)
{
- toImpl(pageRef)->getInformationForPlugInWithProcessID(plugInProcessID, DictionaryCallback::create(Block_copy(block), callGetInformationForPlugInWithProcessIDBlockAndDispose));
+ toImpl(pageRef)->getPlugInInformation(plugInProcessID, DictionaryCallback::create(Block_copy(block), callGetPlugInInformationBlockAndDispose));
}
Modified: branches/safari-537.43-branch/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h (151077 => 151078)
--- branches/safari-537.43-branch/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h 2013-06-01 23:31:58 UTC (rev 151077)
+++ branches/safari-537.43-branch/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h 2013-06-01 23:41:23 UTC (rev 151078)
@@ -34,8 +34,8 @@
WK_EXPORT pid_t WKPageGetProcessIdentifier(WKPageRef page);
-typedef void (^WKPageGetInformationForPlugInWithProcessIDBlock)(WKDictionaryRef, WKErrorRef);
-WK_EXPORT void WKPageGetInformationForPlugInWithProcessID(WKPageRef, pid_t plugInProcessID, WKPageGetInformationForPlugInWithProcessIDBlock);
+typedef void (^WKPageGetPlugInInformationBlock)(WKDictionaryRef, WKErrorRef);
+WK_EXPORT void WKPageGetPlugInInformation(WKPageRef, pid_t plugInProcessID, WKPageGetPlugInInformationBlock);
#ifdef __cplusplus
}
Modified: branches/safari-537.43-branch/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h (151077 => 151078)
--- branches/safari-537.43-branch/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h 2013-06-01 23:31:58 UTC (rev 151077)
+++ branches/safari-537.43-branch/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h 2013-06-01 23:41:23 UTC (rev 151078)
@@ -63,8 +63,8 @@
#if PLATFORM(MAC)
void setProcessSuppressionEnabled(bool);
- PluginProcessProxy* plugInProcessWithProcessID(pid_t plugInProcessID) const;
- PluginProcessProxy* plugInProcessWithToken(uint64_t plugInProcessToken) const;
+ PluginProcessProxy* findPlugInProcessByID(pid_t plugInProcessID) const;
+ PluginProcessProxy* findPlugInProcessByToken(uint64_t plugInProcessToken) const;
#endif
private:
Modified: branches/safari-537.43-branch/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessManagerMac.mm (151077 => 151078)
--- branches/safari-537.43-branch/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessManagerMac.mm 2013-06-01 23:31:58 UTC (rev 151077)
+++ branches/safari-537.43-branch/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessManagerMac.mm 2013-06-01 23:41:23 UTC (rev 151078)
@@ -39,7 +39,7 @@
m_pluginProcesses[i]->setProcessSuppressionEnabled(processSuppressionEnabled);
}
-PluginProcessProxy* PluginProcessManager::plugInProcessWithProcessID(pid_t plugInProcessID) const
+PluginProcessProxy* PluginProcessManager::findPlugInProcessByID(pid_t plugInProcessID) const
{
for (size_t i = 0; i < m_pluginProcesses.size(); ++i) {
if (m_pluginProcesses[i]->processIdentifier() == plugInProcessID)
@@ -48,7 +48,7 @@
return 0;
}
-PluginProcessProxy* PluginProcessManager::plugInProcessWithToken(uint64_t plugInProcessToken) const
+PluginProcessProxy* PluginProcessManager::findPlugInProcessByToken(uint64_t plugInProcessToken) const
{
for (size_t i = 0; i < m_pluginProcesses.size(); ++i) {
if (m_pluginProcesses[i]->pluginProcessToken() == plugInProcessToken)
Modified: branches/safari-537.43-branch/Source/WebKit2/UIProcess/WebPageProxy.h (151077 => 151078)
--- branches/safari-537.43-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2013-06-01 23:31:58 UTC (rev 151077)
+++ branches/safari-537.43-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2013-06-01 23:41:23 UTC (rev 151078)
@@ -538,7 +538,7 @@
ColorSpaceData colorSpace();
- void getInformationForPlugInWithProcessID(pid_t plugInProcessID, PassRefPtr<DictionaryCallback>);
+ void getPlugInInformation(pid_t plugInProcessID, PassRefPtr<DictionaryCallback>);
void containsPlugInCallback(bool containsPlugIn, uint64_t plugInToken, uint64_t callbackID);
#endif
Modified: branches/safari-537.43-branch/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm (151077 => 151078)
--- branches/safari-537.43-branch/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2013-06-01 23:31:58 UTC (rev 151077)
+++ branches/safari-537.43-branch/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2013-06-01 23:41:23 UTC (rev 151078)
@@ -459,7 +459,7 @@
m_pageClient->setPluginComplexTextInputState(pluginComplexTextInputIdentifier, static_cast<PluginComplexTextInputState>(pluginComplexTextInputState));
}
-void WebPageProxy::getInformationForPlugInWithProcessID(pid_t plugInProcessID, PassRefPtr<DictionaryCallback> prpCallback)
+void WebPageProxy::getPlugInInformation(pid_t plugInProcessID, PassRefPtr<DictionaryCallback> prpCallback)
{
RefPtr<DictionaryCallback> callback = prpCallback;
if (!isValid()) {
@@ -467,13 +467,13 @@
return;
}
- PluginProcessProxy* pluginProcessProxy = PluginProcessManager::shared().plugInProcessWithProcessID(plugInProcessID);
- if (!pluginProcessProxy)
+ PluginProcessProxy* plugInProcessProxy = PluginProcessManager::shared().findPlugInProcessByID(plugInProcessID);
+ if (!plugInProcessProxy)
callback->performCallbackWithReturnValue(0);
uint64_t callbackID = callback->callbackID();
- m_plugInInformationCallbacks.set(callbackID, callback.get());
- m_process->send(Messages::WebPage::ContainsPluginViewsWithPluginProcessToken(pluginProcessProxy->pluginProcessToken(), callbackID), m_pageID);
+ m_plugInInformationCallbacks.set(callbackID, callback.release());
+ m_process->send(Messages::WebPage::ContainsPluginViewsWithPluginProcessToken(plugInProcessProxy->pluginProcessToken(), callbackID), m_pageID);
}
void WebPageProxy::containsPlugInCallback(bool containsPlugIn, uint64_t plugInToken, uint64_t callbackID)
@@ -489,7 +489,7 @@
return;
}
- PluginProcessProxy* plugInProcessProxy = PluginProcessManager::shared().plugInProcessWithToken(plugInToken);
+ PluginProcessProxy* plugInProcessProxy = PluginProcessManager::shared().findPlugInProcessByToken(plugInToken);
ASSERT(plugInProcessProxy);
ImmutableDictionary::MapType map;
Modified: branches/safari-537.43-branch/Source/WebKit2/WebProcess/Plugins/PDF/SimplePDFPlugin.h (151077 => 151078)
--- branches/safari-537.43-branch/Source/WebKit2/WebProcess/Plugins/PDF/SimplePDFPlugin.h 2013-06-01 23:31:58 UTC (rev 151077)
+++ branches/safari-537.43-branch/Source/WebKit2/WebProcess/Plugins/PDF/SimplePDFPlugin.h 2013-06-01 23:41:23 UTC (rev 151078)
@@ -191,8 +191,6 @@
virtual String getSelectionString() const OVERRIDE { return String(); }
- virtual uint64_t plugInProcessToken() const OVERRIDE { return 0; }
-
WebCore::IntSize m_scrollOffset;
private:
@@ -204,6 +202,8 @@
virtual bool shouldAlwaysAutoStart() const OVERRIDE { return true; }
+ virtual uint64_t plugInProcessToken() const OVERRIDE { return 0; }
+
WebCore::IntSize m_size;
WebCore::KURL m_sourceURL;
