Changeset 80200 in webkit
- Timestamp:
- Mar 2, 2011 8:21:40 PM (13 years ago)
- Location:
- trunk/Source
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r80199 r80200 1 2011-03-02 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r80188. 4 http://trac.webkit.org/changeset/80188 5 https://bugs.webkit.org/show_bug.cgi?id=55647 6 7 Broke the WebKit API tests. (Requested by xenon on #webkit). 8 9 * WebCore.exp.in: 10 1 11 2011-03-02 Kent Tamura <tkent@chromium.org> 2 12 -
trunk/Source/WebCore/WebCore.exp.in
r80188 r80200 529 529 __ZN7WebCore21SerializedScriptValue11deserializeEPK15OpaqueJSContextPPK13OpaqueJSValue 530 530 __ZN7WebCore21SerializedScriptValue6createEPK15OpaqueJSContextPK13OpaqueJSValuePS6_ 531 __ZN7WebCore21SerializedScriptValue6createEPN3JSC9ExecStateENS1_7JSValueE532 531 __ZN7WebCore21SerializedScriptValueC1ERN3WTF6VectorIhLm0EEE 533 532 __ZN7WebCore21SerializedScriptValueD1Ev -
trunk/Source/WebKit2/ChangeLog
r80194 r80200 1 2011-03-02 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r80188. 4 http://trac.webkit.org/changeset/80188 5 https://bugs.webkit.org/show_bug.cgi?id=55647 6 7 Broke the WebKit API tests. (Requested by xenon on #webkit). 8 9 * UIProcess/API/C/WKPage.cpp: 10 (WKPageRunJavaScriptInMainFrame): 11 (callRunJavaScriptBlockAndRelease): 12 * UIProcess/API/C/WKPage.h: 13 * UIProcess/WebPageProxy.cpp: 14 (WebKit::WebPageProxy::close): 15 (WebKit::WebPageProxy::runJavaScriptInMainFrame): 16 (WebKit::WebPageProxy::processDidCrash): 17 * UIProcess/WebPageProxy.h: 18 * UIProcess/WebPageProxy.messages.in: 19 * WebProcess/WebPage/WebPage.cpp: 20 (WebKit::WebPage::runJavaScriptInMainFrame): 21 1 22 2011-03-02 Jeff Miller <jeffm@apple.com> 2 23 -
trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp
r80188 r80200 398 398 void WKPageRunJavaScriptInMainFrame(WKPageRef pageRef, WKStringRef scriptRef, void* context, WKPageRunJavaScriptFunction callback) 399 399 { 400 toImpl(pageRef)->runJavaScriptInMainFrame(toImpl(scriptRef)->string(), S criptValueCallback::create(context, callback));400 toImpl(pageRef)->runJavaScriptInMainFrame(toImpl(scriptRef)->string(), StringCallback::create(context, callback)); 401 401 } 402 402 403 403 #ifdef __BLOCKS__ 404 static void callRunJavaScriptBlockAndRelease(WKS erializedScriptValueRef resultValue, WKErrorRef error, void* context)404 static void callRunJavaScriptBlockAndRelease(WKStringRef resultValue, WKErrorRef error, void* context) 405 405 { 406 406 WKPageRunJavaScriptBlock block = (WKPageRunJavaScriptBlock)context; -
trunk/Source/WebKit2/UIProcess/API/C/WKPage.h
r80188 r80200 340 340 WK_EXPORT void WKPageSetPageUIClient(WKPageRef page, const WKPageUIClient* client); 341 341 342 typedef void (*WKPageRunJavaScriptFunction)(WKS erializedScriptValueRef, WKErrorRef, void*);342 typedef void (*WKPageRunJavaScriptFunction)(WKStringRef, WKErrorRef, void*); 343 343 WK_EXPORT void WKPageRunJavaScriptInMainFrame(WKPageRef page, WKStringRef script, void* context, WKPageRunJavaScriptFunction function); 344 344 #ifdef __BLOCKS__ 345 typedef void (^WKPageRunJavaScriptBlock)(WKS erializedScriptValueRef, WKErrorRef);345 typedef void (^WKPageRunJavaScriptBlock)(WKStringRef, WKErrorRef); 346 346 WK_EXPORT void WKPageRunJavaScriptInMainFrame_b(WKPageRef page, WKStringRef script, WKPageRunJavaScriptBlock block); 347 347 #endif -
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
r80194 r80200 313 313 invalidateCallbackMap(m_dataCallbacks); 314 314 invalidateCallbackMap(m_stringCallbacks); 315 invalidateCallbackMap(m_scriptValueCallbacks);316 315 invalidateCallbackMap(m_computedPagesCallbacks); 317 316 … … 1119 1118 process()->send(Messages::WebPage::CountStringMatches(string, options, maxMatchCount), m_pageID); 1120 1119 } 1121 1122 void WebPageProxy::runJavaScriptInMainFrame(const String& script, PassRefPtr<S criptValueCallback> prpCallback)1123 { 1124 RefPtr<S criptValueCallback> callback = prpCallback;1120 1121 void WebPageProxy::runJavaScriptInMainFrame(const String& script, PassRefPtr<StringCallback> prpCallback) 1122 { 1123 RefPtr<StringCallback> callback = prpCallback; 1125 1124 uint64_t callbackID = callback->callbackID(); 1126 m_s criptValueCallbacks.set(callbackID, callback.get());1125 m_stringCallbacks.set(callbackID, callback.get()); 1127 1126 process()->send(Messages::WebPage::RunJavaScriptInMainFrame(script, callbackID), m_pageID); 1128 1127 } … … 2449 2448 } 2450 2449 2451 void WebPageProxy::scriptValueCallback(const CoreIPC::DataReference& dataReference, uint64_t callbackID)2452 {2453 RefPtr<ScriptValueCallback> callback = m_scriptValueCallbacks.take(callbackID);2454 if (!callback) {2455 // FIXME: Log error or assert.2456 return;2457 }2458 2459 Vector<uint8_t> data;2460 data.reserveInitialCapacity(dataReference.size());2461 data.append(dataReference.data(), dataReference.size());2462 2463 callback->performCallbackWithReturnValue(WebSerializedScriptValue::adopt(data).get());2464 }2465 2466 2450 void WebPageProxy::computedPagesCallback(const Vector<WebCore::IntRect>& pageRects, double totalScaleFactorForPrinting, uint64_t callbackID) 2467 2451 { … … 2569 2553 invalidateCallbackMap(m_dataCallbacks); 2570 2554 invalidateCallbackMap(m_stringCallbacks); 2571 invalidateCallbackMap(m_scriptValueCallbacks);2572 2555 invalidateCallbackMap(m_computedPagesCallbacks); 2573 2556 -
trunk/Source/WebKit2/UIProcess/WebPageProxy.h
r80194 r80200 114 114 115 115 typedef GenericCallback<WKStringRef, StringImpl*> StringCallback; 116 typedef GenericCallback<WKSerializedScriptValueRef, WebSerializedScriptValue*> ScriptValueCallback;117 116 118 117 class WebPageProxy : public APIObject, public WebPopupMenuProxy::Client { … … 305 304 void getSourceForFrame(WebFrameProxy*, PassRefPtr<StringCallback>); 306 305 void getWebArchiveOfFrame(WebFrameProxy*, PassRefPtr<DataCallback>); 307 void runJavaScriptInMainFrame(const String&, PassRefPtr<S criptValueCallback>);306 void runJavaScriptInMainFrame(const String&, PassRefPtr<StringCallback>); 308 307 void forceRepaint(PassRefPtr<VoidCallback>); 309 308 … … 576 575 void dataCallback(const CoreIPC::DataReference&, uint64_t); 577 576 void stringCallback(const String&, uint64_t); 578 void scriptValueCallback(const CoreIPC::DataReference&, uint64_t);579 577 void computedPagesCallback(const Vector<WebCore::IntRect>&, double totalScaleFactorForPrinting, uint64_t); 580 578 … … 626 624 HashMap<uint64_t, RefPtr<DataCallback> > m_dataCallbacks; 627 625 HashMap<uint64_t, RefPtr<StringCallback> > m_stringCallbacks; 628 HashMap<uint64_t, RefPtr<ScriptValueCallback> > m_scriptValueCallbacks;629 626 HashMap<uint64_t, RefPtr<ComputedPagesCallback> > m_computedPagesCallbacks; 630 627 -
trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in
r80194 r80200 120 120 DataCallback(CoreIPC::DataReference resultData, uint64_t callbackID) 121 121 StringCallback(WTF::String resultString, uint64_t callbackID) 122 ScriptValueCallback(CoreIPC::DataReference resultData, uint64_t callbackID)123 122 ComputedPagesCallback(Vector<WebCore::IntRect> pageRects, double totalScaleFactorForPrinting, uint64_t callbackID) 124 123 -
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
r80194 r80200 92 92 #include <WebCore/ReplaceSelectionCommand.h> 93 93 #include <WebCore/ResourceRequest.h> 94 #include <WebCore/SerializedScriptValue.h>95 94 #include <WebCore/Settings.h> 96 95 #include <WebCore/SharedBuffer.h> … … 1198 1197 // disappear during script execution. 1199 1198 1200 CoreIPC::DataReference dataReference;1201 1202 1199 JSLock lock(SilenceAssertionsOnly); 1203 if (JSValue resultValue = m_mainFrame->coreFrame()->script()->executeScript(script, true).jsValue()) {1204 if (RefPtr<SerializedScriptValue> serializedResultValue = SerializedScriptValue::create(m_mainFrame->coreFrame()->script()->globalObject(mainThreadNormalWorld())->globalExec(), resultValue))1205 dataReference = CoreIPC::DataReference(serializedResultValue->data().data(), serializedResultValue->data().size());1206 }1207 1208 send(Messages::WebPageProxy::S criptValueCallback(dataReference, callbackID));1200 JSValue resultValue = m_mainFrame->coreFrame()->script()->executeScript(script, true).jsValue(); 1201 String resultString; 1202 if (resultValue) 1203 resultString = ustringToString(resultValue.toString(m_mainFrame->coreFrame()->script()->globalObject(mainThreadNormalWorld())->globalExec())); 1204 1205 send(Messages::WebPageProxy::StringCallback(resultString, callbackID)); 1209 1206 } 1210 1207
Note: See TracChangeset
for help on using the changeset viewer.