Changeset 71173 in webkit
- Timestamp:
- Nov 2, 2010 2:54:41 PM (13 years ago)
- Location:
- trunk/WebKit2
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit2/ChangeLog
r71171 r71173 1 2010-11-02 Anders Carlsson <andersca@apple.com> 2 3 Reviewed by Sam Weinig. 4 5 Implement PluginProxy::pluginScriptableNPObject 6 https://bugs.webkit.org/show_bug.cgi?id=48874 7 8 * PluginProcess/PluginControllerProxy.cpp: 9 (WebKit::PluginControllerProxy::getPluginScriptableNPObject): 10 Ask the plug-in for its scriptable NPObject, register it with the map and return its object ID. 11 12 * PluginProcess/PluginControllerProxy.messages.in: 13 Add GetPluginScriptableNPObject message. 14 15 * WebProcess/Plugins/PluginProxy.cpp: 16 (WebKit::PluginProxy::pluginScriptableNPObject): 17 Send the GetPluginScriptableNPObject message. 18 1 19 2010-11-02 Anders Carlsson <andersca@apple.com> 2 20 -
trunk/WebKit2/PluginProcess/PluginControllerProxy.cpp
r71081 r71173 31 31 #include "DataReference.h" 32 32 #include "NPRemoteObjectMap.h" 33 #include "NPRuntimeUtilities.h" 33 34 #include "NetscapePlugin.h" 34 35 #include "NotImplemented.h" … … 314 315 } 315 316 317 void PluginControllerProxy::getPluginScriptableNPObject(uint64_t& pluginScriptableNPObjectID) 318 { 319 NPObject* pluginScriptableNPObject = m_plugin->pluginScriptableNPObject(); 320 if (!pluginScriptableNPObject) { 321 pluginScriptableNPObjectID = 0; 322 return; 323 } 324 325 pluginScriptableNPObjectID = m_connection->npRemoteObjectMap()->registerNPObject(pluginScriptableNPObject); 326 releaseNPObject(pluginScriptableNPObject); 327 } 328 316 329 #if PLATFORM(MAC) 317 330 void PluginControllerProxy::windowFocusChanged(bool hasFocus) -
trunk/WebKit2/PluginProcess/PluginControllerProxy.h
r70162 r71173 98 98 void setFocus(bool); 99 99 void didUpdate(); 100 void getPluginScriptableNPObject(uint64_t& pluginScriptableNPObjectID); 101 100 102 #if PLATFORM(MAC) 101 103 void windowFocusChanged(bool); -
trunk/WebKit2/PluginProcess/PluginControllerProxy.messages.in
r70162 r71173 65 65 # Paint the entire plug-in. 66 66 PaintEntirePlugin() -> () 67 67 68 # Get a reference to the plug-in's scriptable NPObject. 69 GetPluginScriptableNPObject() -> (uint64_t pluginScriptableNPObjectID) 70 68 71 #if PLATFORM(MAC) 69 72 # Sent when the containing NSWindow's focus changes -
trunk/WebKit2/WebProcess/Plugins/PluginProxy.cpp
r71081 r71173 296 296 NPObject* PluginProxy::pluginScriptableNPObject() 297 297 { 298 notImplemented(); 299 return 0; 298 uint64_t pluginScriptableNPObjectID = 0; 299 300 if (!m_connection->connection()->sendSync(Messages::PluginControllerProxy::GetPluginScriptableNPObject(), Messages::PluginControllerProxy::GetPluginScriptableNPObject::Reply(pluginScriptableNPObjectID), m_pluginInstanceID)) 301 return 0; 302 303 if (!pluginScriptableNPObjectID) 304 return 0; 305 306 return m_connection->npRemoteObjectMap()->createNPObjectProxy(pluginScriptableNPObjectID); 300 307 } 301 308
Note: See TracChangeset
for help on using the changeset viewer.