Changeset 80200 in webkit


Ignore:
Timestamp:
Mar 2, 2011 8:21:40 PM (13 years ago)
Author:
rniwa@webkit.org
Message:

2011-03-02 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r80188.
http://trac.webkit.org/changeset/80188
https://bugs.webkit.org/show_bug.cgi?id=55647

Broke the WebKit API tests. (Requested by xenon on #webkit).

  • WebCore.exp.in:

2011-03-02 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r80188.
http://trac.webkit.org/changeset/80188
https://bugs.webkit.org/show_bug.cgi?id=55647

Broke the WebKit API tests. (Requested by xenon on #webkit).

  • UIProcess/API/C/WKPage.cpp: (WKPageRunJavaScriptInMainFrame): (callRunJavaScriptBlockAndRelease):
  • UIProcess/API/C/WKPage.h:
  • UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::close): (WebKit::WebPageProxy::runJavaScriptInMainFrame): (WebKit::WebPageProxy::processDidCrash):
  • UIProcess/WebPageProxy.h:
  • UIProcess/WebPageProxy.messages.in:
  • WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::runJavaScriptInMainFrame):
Location:
trunk/Source
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r80199 r80200  
     12011-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
    1112011-03-02  Kent Tamura  <tkent@chromium.org>
    212
  • trunk/Source/WebCore/WebCore.exp.in

    r80188 r80200  
    529529__ZN7WebCore21SerializedScriptValue11deserializeEPK15OpaqueJSContextPPK13OpaqueJSValue
    530530__ZN7WebCore21SerializedScriptValue6createEPK15OpaqueJSContextPK13OpaqueJSValuePS6_
    531 __ZN7WebCore21SerializedScriptValue6createEPN3JSC9ExecStateENS1_7JSValueE
    532531__ZN7WebCore21SerializedScriptValueC1ERN3WTF6VectorIhLm0EEE
    533532__ZN7WebCore21SerializedScriptValueD1Ev
  • trunk/Source/WebKit2/ChangeLog

    r80194 r80200  
     12011-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
    1222011-03-02  Jeff Miller  <jeffm@apple.com>
    223
  • trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp

    r80188 r80200  
    398398void WKPageRunJavaScriptInMainFrame(WKPageRef pageRef, WKStringRef scriptRef, void* context, WKPageRunJavaScriptFunction callback)
    399399{
    400     toImpl(pageRef)->runJavaScriptInMainFrame(toImpl(scriptRef)->string(), ScriptValueCallback::create(context, callback));
     400    toImpl(pageRef)->runJavaScriptInMainFrame(toImpl(scriptRef)->string(), StringCallback::create(context, callback));
    401401}
    402402
    403403#ifdef __BLOCKS__
    404 static void callRunJavaScriptBlockAndRelease(WKSerializedScriptValueRef resultValue, WKErrorRef error, void* context)
     404static void callRunJavaScriptBlockAndRelease(WKStringRef resultValue, WKErrorRef error, void* context)
    405405{
    406406    WKPageRunJavaScriptBlock block = (WKPageRunJavaScriptBlock)context;
  • trunk/Source/WebKit2/UIProcess/API/C/WKPage.h

    r80188 r80200  
    340340WK_EXPORT void WKPageSetPageUIClient(WKPageRef page, const WKPageUIClient* client);
    341341
    342 typedef void (*WKPageRunJavaScriptFunction)(WKSerializedScriptValueRef, WKErrorRef, void*);
     342typedef void (*WKPageRunJavaScriptFunction)(WKStringRef, WKErrorRef, void*);
    343343WK_EXPORT void WKPageRunJavaScriptInMainFrame(WKPageRef page, WKStringRef script, void* context, WKPageRunJavaScriptFunction function);
    344344#ifdef __BLOCKS__
    345 typedef void (^WKPageRunJavaScriptBlock)(WKSerializedScriptValueRef, WKErrorRef);
     345typedef void (^WKPageRunJavaScriptBlock)(WKStringRef, WKErrorRef);
    346346WK_EXPORT void WKPageRunJavaScriptInMainFrame_b(WKPageRef page, WKStringRef script, WKPageRunJavaScriptBlock block);
    347347#endif
  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r80194 r80200  
    313313    invalidateCallbackMap(m_dataCallbacks);
    314314    invalidateCallbackMap(m_stringCallbacks);
    315     invalidateCallbackMap(m_scriptValueCallbacks);
    316315    invalidateCallbackMap(m_computedPagesCallbacks);
    317316
     
    11191118    process()->send(Messages::WebPage::CountStringMatches(string, options, maxMatchCount), m_pageID);
    11201119}
    1121 
    1122 void WebPageProxy::runJavaScriptInMainFrame(const String& script, PassRefPtr<ScriptValueCallback> prpCallback)
    1123 {
    1124     RefPtr<ScriptValueCallback> callback = prpCallback;
     1120   
     1121void WebPageProxy::runJavaScriptInMainFrame(const String& script, PassRefPtr<StringCallback> prpCallback)
     1122{
     1123    RefPtr<StringCallback> callback = prpCallback;
    11251124    uint64_t callbackID = callback->callbackID();
    1126     m_scriptValueCallbacks.set(callbackID, callback.get());
     1125    m_stringCallbacks.set(callbackID, callback.get());
    11271126    process()->send(Messages::WebPage::RunJavaScriptInMainFrame(script, callbackID), m_pageID);
    11281127}
     
    24492448}
    24502449
    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 
    24662450void WebPageProxy::computedPagesCallback(const Vector<WebCore::IntRect>& pageRects, double totalScaleFactorForPrinting, uint64_t callbackID)
    24672451{
     
    25692553    invalidateCallbackMap(m_dataCallbacks);
    25702554    invalidateCallbackMap(m_stringCallbacks);
    2571     invalidateCallbackMap(m_scriptValueCallbacks);
    25722555    invalidateCallbackMap(m_computedPagesCallbacks);
    25732556
  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r80194 r80200  
    114114
    115115typedef GenericCallback<WKStringRef, StringImpl*> StringCallback;
    116 typedef GenericCallback<WKSerializedScriptValueRef, WebSerializedScriptValue*> ScriptValueCallback;
    117116
    118117class WebPageProxy : public APIObject, public WebPopupMenuProxy::Client {
     
    305304    void getSourceForFrame(WebFrameProxy*, PassRefPtr<StringCallback>);
    306305    void getWebArchiveOfFrame(WebFrameProxy*, PassRefPtr<DataCallback>);
    307     void runJavaScriptInMainFrame(const String&, PassRefPtr<ScriptValueCallback>);
     306    void runJavaScriptInMainFrame(const String&, PassRefPtr<StringCallback>);
    308307    void forceRepaint(PassRefPtr<VoidCallback>);
    309308
     
    576575    void dataCallback(const CoreIPC::DataReference&, uint64_t);
    577576    void stringCallback(const String&, uint64_t);
    578     void scriptValueCallback(const CoreIPC::DataReference&, uint64_t);
    579577    void computedPagesCallback(const Vector<WebCore::IntRect>&, double totalScaleFactorForPrinting, uint64_t);
    580578
     
    626624    HashMap<uint64_t, RefPtr<DataCallback> > m_dataCallbacks;
    627625    HashMap<uint64_t, RefPtr<StringCallback> > m_stringCallbacks;
    628     HashMap<uint64_t, RefPtr<ScriptValueCallback> > m_scriptValueCallbacks;
    629626    HashMap<uint64_t, RefPtr<ComputedPagesCallback> > m_computedPagesCallbacks;
    630627
  • trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in

    r80194 r80200  
    120120    DataCallback(CoreIPC::DataReference resultData, uint64_t callbackID)
    121121    StringCallback(WTF::String resultString, uint64_t callbackID)
    122     ScriptValueCallback(CoreIPC::DataReference resultData, uint64_t callbackID)
    123122    ComputedPagesCallback(Vector<WebCore::IntRect> pageRects, double totalScaleFactorForPrinting, uint64_t callbackID)
    124123
  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r80194 r80200  
    9292#include <WebCore/ReplaceSelectionCommand.h>
    9393#include <WebCore/ResourceRequest.h>
    94 #include <WebCore/SerializedScriptValue.h>
    9594#include <WebCore/Settings.h>
    9695#include <WebCore/SharedBuffer.h>
     
    11981197    // disappear during script execution.
    11991198
    1200     CoreIPC::DataReference dataReference;
    1201 
    12021199    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::ScriptValueCallback(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));
    12091206}
    12101207
Note: See TracChangeset for help on using the changeset viewer.