Changeset 147489 in webkit
- Timestamp:
- Apr 2, 2013 1:00:25 PM (11 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r147485 r147489 1 2013-04-02 Anders Carlsson <andersca@apple.com> 2 3 Add WKContextSetInvalidMessageFunction 4 https://bugs.webkit.org/show_bug.cgi?id=113820 5 <rdar://problem/12679817> 6 7 Reviewed by Tim Horton. 8 9 * UIProcess/API/C/WKContext.cpp: 10 (WKContextSetInvalidMessageFunction): 11 Call WebContext::didReceiveInvalidMessage. 12 13 * UIProcess/API/C/WKContextPrivate.h: 14 * UIProcess/WebContext.cpp: 15 (WebKit::WebContext::setInvalidMessageCallback): 16 Set the global variable. 17 18 (WebKit::WebContext::didReceiveInvalidMessage): 19 Construct a message name string and call the invalid message callback. 20 21 * UIProcess/WebProcessProxy.cpp: 22 (WebKit::WebProcessProxy::didReceiveInvalidMessage): 23 Call WebContext::didReceiveInvalidMessage. 24 1 25 2013-04-02 Alexey Proskuryakov <ap@apple.com> 2 26 -
trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp
r146823 r147489 374 374 } 375 375 376 void WKContextSetInvalidMessageFunction(WKContextInvalidMessageFunction invalidMessageFunction) 377 { 378 WebContext::setInvalidMessageCallback(invalidMessageFunction); 379 } 380 376 381 // Deprecated functions. 377 382 void _WKContextSetAdditionalPluginsDirectory(WKContextRef context, WKStringRef pluginsDirectory) -
trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h
r137967 r147489 79 79 WK_EXPORT void WKContextSetUsesNetworkProcess(WKContextRef context, bool usesNetworkProcess); 80 80 81 typedef void (*WKContextInvalidMessageFunction)(WKStringRef messageName); 82 WK_EXPORT void WKContextSetInvalidMessageFunction(WKContextInvalidMessageFunction invalidMessageFunction); 83 81 84 #ifdef __cplusplus 82 85 } -
trunk/Source/WebKit2/UIProcess/WebContext.cpp
r146823 r147489 450 450 } 451 451 452 void (*s_invalidMessageCallback)(WKStringRef messageName); 453 454 void WebContext::setInvalidMessageCallback(void (*invalidMessageCallback)(WKStringRef messageName)) 455 { 456 s_invalidMessageCallback = invalidMessageCallback; 457 } 458 459 void WebContext::didReceiveInvalidMessage(const CoreIPC::StringReference& messageReceiverName, const CoreIPC::StringReference& messageName) 460 { 461 if (!s_invalidMessageCallback) 462 return; 463 464 StringBuilder messageNameStringBuilder; 465 messageNameStringBuilder.append(messageReceiverName.data(), messageReceiverName.size()); 466 messageNameStringBuilder.append("."); 467 messageNameStringBuilder.append(messageName.data(), messageName.size()); 468 469 s_invalidMessageCallback(toAPI(WebString::create(messageNameStringBuilder.toString()).get())); 470 } 471 452 472 WebProcessProxy* WebContext::ensureSharedWebProcess() 453 473 { -
trunk/Source/WebKit2/UIProcess/WebContext.h
r147403 r147489 299 299 #endif 300 300 301 static void setInvalidMessageCallback(void (*)(WKStringRef)); 302 static void didReceiveInvalidMessage(const CoreIPC::StringReference& messageReceiverName, const CoreIPC::StringReference& messageName); 303 301 304 private: 302 305 WebContext(ProcessModel, const String& injectedBundlePath); -
trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp
r144386 r147489 412 412 WTFLogAlways("Received an invalid message \"%s.%s\" from the web process.\n", messageReceiverName.toString().data(), messageName.toString().data()); 413 413 414 // Terminate the WebProcesses. 414 WebContext::didReceiveInvalidMessage(messageReceiverName, messageName); 415 416 // Terminate the WebProcess. 415 417 terminate(); 416 418
Note: See TracChangeset
for help on using the changeset viewer.