Changeset 134747 in webkit


Ignore:
Timestamp:
Nov 14, 2012 11:34:30 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r134691, r134703, r134715, r134716,
and r134733.
http://trac.webkit.org/changeset/134691
http://trac.webkit.org/changeset/134703
http://trac.webkit.org/changeset/134715
http://trac.webkit.org/changeset/134716
http://trac.webkit.org/changeset/134733
https://bugs.webkit.org/show_bug.cgi?id=102342

"Broke the Apple Windows Debug and GTK builds." (Requested by
dydx on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-11-14

Source/WebCore:

  • WebCore.exp.in:
  • bindings/js/SerializedScriptValue.h:
  • testing/Internals.cpp:
  • testing/Internals.h:

(WebCore):

  • testing/Internals.idl:

Source/WebKit2:

  • win/WebKit2.def:
  • win/WebKit2CFLite.def:

LayoutTests:

  • platform/chromium/fast/storage/serialized-script-value-expected.txt: Removed.
  • platform/chromium/fast/storage/serialized-script-value.html: Removed.
Location:
trunk
Files:
2 deleted
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r134746 r134747  
     12012-11-14  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r134691, r134703, r134715, r134716,
     4        and r134733.
     5        http://trac.webkit.org/changeset/134691
     6        http://trac.webkit.org/changeset/134703
     7        http://trac.webkit.org/changeset/134715
     8        http://trac.webkit.org/changeset/134716
     9        http://trac.webkit.org/changeset/134733
     10        https://bugs.webkit.org/show_bug.cgi?id=102342
     11
     12        "Broke the Apple Windows Debug and GTK builds." (Requested by
     13        dydx on #webkit).
     14
     15        * platform/chromium/fast/storage/serialized-script-value-expected.txt: Removed.
     16        * platform/chromium/fast/storage/serialized-script-value.html: Removed.
     17
    1182012-11-14  Kentaro Hara  <haraken@chromium.org>
    219
  • trunk/Source/WebCore/ChangeLog

    r134745 r134747  
     12012-11-14  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r134691, r134703, r134715, r134716,
     4        and r134733.
     5        http://trac.webkit.org/changeset/134691
     6        http://trac.webkit.org/changeset/134703
     7        http://trac.webkit.org/changeset/134715
     8        http://trac.webkit.org/changeset/134716
     9        http://trac.webkit.org/changeset/134733
     10        https://bugs.webkit.org/show_bug.cgi?id=102342
     11
     12        "Broke the Apple Windows Debug and GTK builds." (Requested by
     13        dydx on #webkit).
     14
     15        * WebCore.exp.in:
     16        * bindings/js/SerializedScriptValue.h:
     17        * testing/Internals.cpp:
     18        * testing/Internals.h:
     19        (WebCore):
     20        * testing/Internals.idl:
     21
    1222012-11-14  Pavel Feldman  <pfeldman@chromium.org>
    223
  • trunk/Source/WebCore/WebCore.exp.in

    r134691 r134747  
    226226__ZN7WebCore13KeyboardEventC1ERKN3WTF12AtomicStringEbbPNS_9DOMWindowERKNS1_6StringEjbbbbb
    227227__ZN7WebCore13KeyboardEventC1ERKNS_21PlatformKeyboardEventEPNS_9DOMWindowE
    228 __ZN7WebCore13QualifiedNameD1Ev
    229228__ZN7WebCore13ResourceErrorC1EP7NSError
    230229__ZN7WebCore13ResourceErrorC1EP9__CFError
     
    233232__ZN7WebCore13createWrapperEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_4NodeE
    234233__ZN7WebCore13directoryNameERKN3WTF6StringE
    235 __ZN7WebCore13toArrayBufferEN3JSC7JSValueE
    236234__ZN7WebCore13toHTMLElementEPNS_21FormAssociatedElementE
    237235__ZN7WebCore13toJSDOMWindowEN3JSC7JSValueE
     236__ZN7WebCore13QualifiedNameD1Ev
    238237__ZN7WebCore14CachedResource12removeClientEPNS_20CachedResourceClientE
    239238__ZN7WebCore14CachedResource16unregisterHandleEPNS_24CachedResourceHandleBaseE
     
    246245__ZN7WebCore14DocumentLoader15detachFromFrameEv
    247246__ZN7WebCore14DocumentLoader18addArchiveResourceEN3WTF10PassRefPtrINS_15ArchiveResourceEEE
    248 __ZN7WebCore21SerializedScriptValue11deserializeEPN3JSC9ExecStateEPNS1_14JSGlobalObjectEPN3WTF6VectorINS6_6RefPtrINS_11MessagePortEEELm1EEENS_22SerializationErrorModeE
    249 __ZN7WebCore21SerializedScriptValue6createEPN3JSC9ExecStateENS1_7JSValueEPN3WTF6VectorINS5_6RefPtrINS_11MessagePortEEELm1EEEPNS6_INS7_INS5_11ArrayBufferEEELm1EEENS_22SerializationErrorModeE
    250 __ZN7WebCore21SerializedScriptValue6createERKN3WTF6StringE
    251 __ZN7WebCore21SerializedScriptValue8toStringEv
    252 __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPN3WTF11ArrayBufferE
    253247__ZN7WebCore14DocumentLoader21addPlugInStreamLoaderEPNS_14ResourceLoaderE
    254248__ZN7WebCore14DocumentLoader22addAllArchiveResourcesEPNS_7ArchiveE
  • trunk/Source/WebCore/bindings/js/SerializedScriptValue.h

    r134691 r134747  
    7474
    7575    static PassRefPtr<SerializedScriptValue> create(const String&);
    76     static PassRefPtr<SerializedScriptValue> createFromWire(const String& value) { return create(value); }
    7776    static PassRefPtr<SerializedScriptValue> adopt(Vector<uint8_t>& buffer)
    7877    {
     
    8685
    8786    String toString();
    88     String toWireString() { return toString(); }
    8987   
    9088    JSC::JSValue deserialize(JSC::ExecState*, JSC::JSGlobalObject*, MessagePortArray*, SerializationErrorMode = Throwing);
  • trunk/Source/WebCore/testing/Internals.cpp

    r134691 r134747  
    7070#include "SchemeRegistry.h"
    7171#include "SelectRuleFeatureSet.h"
    72 #include "SerializedScriptValue.h"
    7372#include "Settings.h"
    7473#include "ShadowRoot.h"
     
    15411540}
    15421541
    1543 PassRefPtr<ArrayBuffer> Internals::serializeObject(PassRefPtr<SerializedScriptValue> value) const
    1544 {
    1545     String stringValue = value->toWireString();
    1546     return ArrayBuffer::create(static_cast<const void*>(stringValue.impl()->characters()), stringValue.sizeInBytes());
    1547 }
    1548 
    1549 PassRefPtr<SerializedScriptValue> Internals::deserializeBuffer(PassRefPtr<ArrayBuffer> buffer) const
    1550 {
    1551     String value(static_cast<const UChar*>(buffer->data()), buffer->byteLength() / sizeof(UChar));
    1552     return SerializedScriptValue::createFromWire(value);
    1553 }
    1554 
    1555 }
     1542}
  • trunk/Source/WebCore/testing/Internals.h

    r134691 r134747  
    3030#include "ExceptionCodePlaceholder.h"
    3131#include "NodeList.h"
    32 #include <wtf/ArrayBuffer.h>
    3332#include <wtf/PassRefPtr.h>
    3433#include <wtf/RefCounted.h>
     
    5554class WebKitPoint;
    5655class MallocStatistics;
    57 class SerializedScriptValue;
    5856
    5957typedef int ExceptionCode;
     
    249247    void stopTrackingRepaints(Document*, ExceptionCode&);
    250248
    251     PassRefPtr<ArrayBuffer> serializeObject(PassRefPtr<SerializedScriptValue>) const;
    252     PassRefPtr<SerializedScriptValue> deserializeBuffer(PassRefPtr<ArrayBuffer>) const;
    253 
    254249private:
    255250    explicit Internals(Document*);
  • trunk/Source/WebCore/testing/Internals.idl

    r134691 r134747  
    215215    void startTrackingRepaints(in Document document) raises (DOMException);
    216216    void stopTrackingRepaints(in Document document) raises (DOMException);
    217 
    218     SerializedScriptValue deserializeBuffer(in ArrayBuffer buffer);
    219     ArrayBuffer serializeObject(in SerializedScriptValue obj);
    220217};
  • trunk/Source/WebKit2/ChangeLog

    r134744 r134747  
     12012-11-14  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r134691, r134703, r134715, r134716,
     4        and r134733.
     5        http://trac.webkit.org/changeset/134691
     6        http://trac.webkit.org/changeset/134703
     7        http://trac.webkit.org/changeset/134715
     8        http://trac.webkit.org/changeset/134716
     9        http://trac.webkit.org/changeset/134733
     10        https://bugs.webkit.org/show_bug.cgi?id=102342
     11
     12        "Broke the Apple Windows Debug and GTK builds." (Requested by
     13        dydx on #webkit).
     14
     15        * win/WebKit2.def:
     16        * win/WebKit2CFLite.def:
     17
    1182012-11-14  Sheriff Bot  <webkit.review.bot@gmail.com>
    219
  • trunk/Source/WebKit2/win/WebKit2.def

    r134744 r134747  
    156156        ??0String@WTF@@QAE@PBD@Z
    157157        ??0String@WTF@@QAE@PB_W@Z
    158         ??0String@WTF@@QAE@PB_WI@Z
    159         ??1SerializedScriptValue@WebCore@@QAE@XZ
    160158        ?absoluteBoundingBoxRect@RenderObject@WebCore@@QBE?AVIntRect@2@_N@Z
    161159        ?absoluteBoundingBoxRectIgnoringTransforms@RenderObject@WebCore@@QBE?AVIntRect@2@XZ
     
    168166        ?create@HTMLContentElement@WebCore@@SA?AV?$PassRefPtr@VHTMLContentElement@WebCore@@@WTF@@PAVDocument@2@@Z
    169167        ?create@Range@WebCore@@SA?AV?$PassRefPtr@VRange@WebCore@@@WTF@@V?$PassRefPtr@VDocument@WebCore@@@4@V?$PassRefPtr@VNode@WebCore@@@4@H1H@Z
    170         ?create@SerializedScriptValue@WebCore@@SA?AV?$PassRefPtr@VSerializedScriptValue@WebCore@@@WTF@@ABVString@4@@Z
    171         ?create@SerializedScriptValue@WebCore@@SA?AV?$PassRefPtr@VSerializedScriptValue@WebCore@@@WTF@@PAVExecState@JSC@@VJSValue@6@PAV?$Vector@V?$RefPtr@VMessagePort@WebCore@@@WTF@@$00@4@PAV?$Vector@V?$RefPtr@VArrayBuffer@WTF@@@WTF@@$00@4@W4SerializationErrorMode@2@@Z
    172168        ?create@ShadowRoot@WebCore@@SA?AV?$PassRefPtr@VShadowRoot@WebCore@@@WTF@@PAVElement@2@AAH@Z
    173169        ?createWrapper@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVNode@1@@Z
    174         ?deserialize@SerializedScriptValue@WebCore@@QAE?AVJSValue@JSC@@PAVExecState@4@PAVJSGlobalObject@4@PAV?$Vector@V?$RefPtr@VMessagePort@WebCore@@@WTF@@$00@WTF@@W4SerializationErrorMode@2@@Z
    175170        ?documentState@HistoryItem@WebCore@@QBEABV?$Vector@VString@WTF@@$0A@@WTF@@XZ
    176171        ?ensureSelectFeatureSetCollected@ElementShadow@WebCore@@QAEXXZ
     
    260255        ?text@Range@WebCore@@QBE?AVString@WTF@@XZ
    261256        ?textContent@Node@WebCore@@QBE?AVString@WTF@@_N@Z
    262         ?toArrayBuffer@WebCore@@YAPAVArrayBuffer@WTF@@VJSValue@JSC@@@Z
     257        ?toDocument@WebCore@@YAPAVDocument@1@VJSValue@JSC@@@Z
    263258        ?toDOMStringList@WebCore@@YA?AV?$PassRefPtr@VDOMStringList@WebCore@@@WTF@@PAVExecState@JSC@@VJSValue@5@@Z
    264         ?toDocument@WebCore@@YAPAVDocument@1@VJSValue@JSC@@@Z
    265259        ?toElement@WebCore@@YAPAVElement@1@VJSValue@JSC@@@Z
    266         ?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVArrayBuffer@WTF@@@Z
    267260        ?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVClientRect@1@@Z
    268261        ?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVClientRectList@1@@Z
    269262        ?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVNode@1@@Z
     263        ?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVRange@1@@Z
    270264        ?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVNodeList@1@@Z
    271         ?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVRange@1@@Z
    272265        ?toRange@WebCore@@YAPAVRange@1@VJSValue@JSC@@@Z
    273         ?toString@SerializedScriptValue@WebCore@@QAE?AVString@WTF@@XZ
    274266        ?treeScope@Node@WebCore@@QBEPAVTreeScope@2@XZ
    275267        ?updateLayoutIgnorePendingStylesheets@Document@WebCore@@QAEXXZ
  • trunk/Source/WebKit2/win/WebKit2CFLite.def

    r134744 r134747  
    119119        ?didBeginFrameImpl@InspectorInstrumentation@WebCore@@CAXPAVInstrumentingAgents@2@@Z
    120120        ?didCancelFrameImpl@InspectorInstrumentation@WebCore@@CAXPAVInstrumentingAgents@2@@Z
     121        ?getDistributedNodes@InsertionPoint@WebCore@@QBE?AV?$PassRefPtr@VNodeList@WebCore@@@WTF@@XZ
    121122        ?initializeMainThread@WTF@@YAXXZ
    122123        ?initializeThreading@WTF@@YAXXZ
     
    136137        ?waitForThreadCompletion@WTF@@YAHIPAPAX@Z
    137138        ?createThread@WTF@@YAIP6APAXPAX@Z0@Z
    138 
    139 ; Re-exports from WebCore for test harnesses
     139        ; Re-exports from WebCore for test harnesses
    140140        ??0NodeRenderingContext@WebCore@@QAE@PAVNode@1@@Z
    141141        ??1NodeRenderingContext@WebCore@@QAE@XZ
     
    149149        ??0String@WTF@@QAE@PBD@Z
    150150        ??0String@WTF@@QAE@PB_W@Z
    151         ??0String@WTF@@QAE@PB_WI@Z
    152         ??1SerializedScriptValue@WebCore@@QAE@XZ
    153151        ?absoluteBoundingBoxRect@RenderObject@WebCore@@QBE?AVIntRect@2@_N@Z
    154152        ?absoluteBoundingBoxRectIgnoringTransforms@RenderObject@WebCore@@QBE?AVIntRect@2@XZ
     
    161159        ?create@HTMLContentElement@WebCore@@SA?AV?$PassRefPtr@VHTMLContentElement@WebCore@@@WTF@@PAVDocument@2@@Z
    162160        ?create@Range@WebCore@@SA?AV?$PassRefPtr@VRange@WebCore@@@WTF@@V?$PassRefPtr@VDocument@WebCore@@@4@V?$PassRefPtr@VNode@WebCore@@@4@H1H@Z
    163         ?create@SerializedScriptValue@WebCore@@SA?AV?$PassRefPtr@VSerializedScriptValue@WebCore@@@WTF@@ABVString@4@@Z
    164         ?create@SerializedScriptValue@WebCore@@SA?AV?$PassRefPtr@VSerializedScriptValue@WebCore@@@WTF@@PAVExecState@JSC@@VJSValue@6@PAV?$Vector@V?$RefPtr@VMessagePort@WebCore@@@WTF@@$00@4@PAV?$Vector@V?$RefPtr@VArrayBuffer@WTF@@@WTF@@$00@4@W4SerializationErrorMode@2@@Z
    165161        ?create@ShadowRoot@WebCore@@SA?AV?$PassRefPtr@VShadowRoot@WebCore@@@WTF@@PAVElement@2@AAH@Z
    166162        ?createWrapper@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVNode@1@@Z
    167         ?deserialize@SerializedScriptValue@WebCore@@QAE?AVJSValue@JSC@@PAVExecState@4@PAVJSGlobalObject@4@PAV?$Vector@V?$RefPtr@VMessagePort@WebCore@@@WTF@@$00@WTF@@W4SerializationErrorMode@2@@Z
    168163        ?documentState@HistoryItem@WebCore@@QBEABV?$Vector@VString@WTF@@$0A@@WTF@@XZ
    169164        ?ensureSelectFeatureSetCollected@ElementShadow@WebCore@@QAEXXZ
     
    231226        ?setPagination@Page@WebCore@@QAEXABUPagination@2@@Z
    232227        ?setPictographFontFamily@Settings@WebCore@@QAEXABVAtomicString@WTF@@W4UScriptCode@@@Z
     228        ?setPseudo@Element@WebCore@@QAEXABVAtomicString@WTF@@@Z
    233229        ?setResourcesDataSizeLimitsFromInternals@InspectorController@WebCore@@QAEXHH@Z
    234230        ?setSansSerifFontFamily@Settings@WebCore@@QAEXABVAtomicString@WTF@@W4UScriptCode@@@Z
     
    241237        ?setSuggestedValue@HTMLInputElement@WebCore@@QAEXABVString@WTF@@@Z
    242238        ?setEditingValue@HTMLInputElement@WebCore@@QAEXABVString@WTF@@@Z
    243         ?setPseudo@Element@WebCore@@QAEXABVAtomicString@WTF@@@Z
    244239        ?setResolutionOverride@Settings@WebCore@@QAEXABVIntSize@2@@Z
    245240        ?setMediaTypeOverride@Settings@WebCore@@QAEXABVString@WTF@@@Z
     
    253248        ?text@Range@WebCore@@QBE?AVString@WTF@@XZ
    254249        ?textContent@Node@WebCore@@QBE?AVString@WTF@@_N@Z
    255         ?toArrayBuffer@WebCore@@YAPAVArrayBuffer@WTF@@VJSValue@JSC@@@Z
     250        ?toDocument@WebCore@@YAPAVDocument@1@VJSValue@JSC@@@Z
    256251        ?toDOMStringList@WebCore@@YA?AV?$PassRefPtr@VDOMStringList@WebCore@@@WTF@@PAVExecState@JSC@@VJSValue@5@@Z
    257         ?toDocument@WebCore@@YAPAVDocument@1@VJSValue@JSC@@@Z
    258252        ?toElement@WebCore@@YAPAVElement@1@VJSValue@JSC@@@Z
    259         ?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVArrayBuffer@WTF@@@Z
    260253        ?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVClientRect@1@@Z
    261254        ?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVClientRectList@1@@Z
    262255        ?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVNode@1@@Z
     256        ?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVRange@1@@Z
    263257        ?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVNodeList@1@@Z
    264         ?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVRange@1@@Z
    265258        ?toRange@WebCore@@YAPAVRange@1@VJSValue@JSC@@@Z
    266         ?toString@SerializedScriptValue@WebCore@@QAE?AVString@WTF@@XZ
    267259        ?treeScope@Node@WebCore@@QBEPAVTreeScope@2@XZ
    268260        ?updateLayoutIgnorePendingStylesheets@Document@WebCore@@QAEXXZ
     
    315307        ?trackedRepaintRectsAsText@Frame@WebCore@@QBE?AVString@WTF@@XZ
    316308        ?setTracksRepaints@FrameView@WebCore@@QAEX_N@Z
    317 
Note: See TracChangeset for help on using the changeset viewer.