Title: [134910] trunk
Revision
134910
Author
commit-qu...@webkit.org
Date
2012-11-16 00:08:37 -0800 (Fri, 16 Nov 2012)

Log Message

Unreviewed, rolling out r134865.
http://trac.webkit.org/changeset/134865
https://bugs.webkit.org/show_bug.cgi?id=102466

Broke the Apple Windows Debug build. (Requested by dydx on
#webkit).

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

.:

* Source/autotools/symbols.filter:

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.

Modified Paths

Removed Paths

Diff

Modified: trunk/ChangeLog (134909 => 134910)


--- trunk/ChangeLog	2012-11-16 08:06:06 UTC (rev 134909)
+++ trunk/ChangeLog	2012-11-16 08:08:37 UTC (rev 134910)
@@ -1,3 +1,14 @@
+2012-11-16  Sheriff Bot  <webkit.review....@gmail.com>
+
+        Unreviewed, rolling out r134865.
+        http://trac.webkit.org/changeset/134865
+        https://bugs.webkit.org/show_bug.cgi?id=102466
+
+        Broke the Apple Windows Debug build. (Requested by dydx on
+        #webkit).
+
+        * Source/autotools/symbols.filter:
+
 2012-11-16  Mikhail Pozdnyakov  <mikhail.pozdnya...@intel.com>
 
         Avoid copying of ViewportArguments in computeViewportAttributes function

Modified: trunk/LayoutTests/ChangeLog (134909 => 134910)


--- trunk/LayoutTests/ChangeLog	2012-11-16 08:06:06 UTC (rev 134909)
+++ trunk/LayoutTests/ChangeLog	2012-11-16 08:08:37 UTC (rev 134910)
@@ -1,3 +1,15 @@
+2012-11-16  Sheriff Bot  <webkit.review....@gmail.com>
+
+        Unreviewed, rolling out r134865.
+        http://trac.webkit.org/changeset/134865
+        https://bugs.webkit.org/show_bug.cgi?id=102466
+
+        Broke the Apple Windows Debug build. (Requested by dydx on
+        #webkit).
+
+        * platform/chromium/fast/storage/serialized-script-value-expected.txt: Removed.
+        * platform/chromium/fast/storage/serialized-script-value.html: Removed.
+
 2012-11-16  Takashi Sakamoto  <ta...@google.com>
 
         ASSERT_NOT_REACHED() when building a CSSOM wrapper for StyleRuleHost

Deleted: trunk/LayoutTests/platform/chromium/fast/storage/serialized-script-value-expected.txt (134909 => 134910)


--- trunk/LayoutTests/platform/chromium/fast/storage/serialized-script-value-expected.txt	2012-11-16 08:06:06 UTC (rev 134909)
+++ trunk/LayoutTests/platform/chromium/fast/storage/serialized-script-value-expected.txt	2012-11-16 08:08:37 UTC (rev 134910)
@@ -1,125 +0,0 @@
-
-Deserialize to {"foo":"zoo","bar":{"baz":"myNewKey"}}:
-PASS JSON.stringify(newObj) is JSON.stringify(obj)
-Serialize {"foo":"zoo","bar":{"baz":"myNewKey"}}:
-PASS bufferView.length is expectedBufferValues.length
-
-Deserialize to {"foo":"zoo","bar":"myNewKey"}:
-PASS JSON.stringify(newObj) is JSON.stringify(obj)
-Serialize {"foo":"zoo","bar":"myNewKey"}:
-PASS bufferView.length is expectedBufferValues.length
-
-Deserialize to []:
-PASS JSON.stringify(newObj) is JSON.stringify(obj)
-Serialize []:
-PASS bufferView.length is expectedBufferValues.length
-
-Deserialize to {"foo":"zoo"}:
-PASS JSON.stringify(newObj) is JSON.stringify(obj)
-PASS JSON.stringify(newObj) is JSON.stringify(obj)
-Serialize {"foo":"zoo"}:
-PASS bufferView.length is expectedBufferValues.length
-
-Deserialize to {"foo":null}:
-PASS JSON.stringify(newObj) is JSON.stringify(obj)
-PASS JSON.stringify(newObj) is JSON.stringify(obj)
-Serialize {"foo":null}:
-PASS bufferView.length is expectedBufferValues.length
-
-Deserialize to {}:
-PASS JSON.stringify(newObj) is JSON.stringify(obj)
-PASS JSON.stringify(newObj) is JSON.stringify(obj)
-Serialize {}:
-PASS bufferView.length is expectedBufferValues.length
-
-Deserialize to undefined:
-PASS JSON.stringify(newObj) is JSON.stringify(obj)
-Serialize undefined:
-PASS bufferView.length is expectedBufferValues.length
-
-Deserialize to true:
-PASS JSON.stringify(newObj) is JSON.stringify(obj)
-Serialize true:
-PASS bufferView.length is expectedBufferValues.length
-
-Deserialize to false:
-PASS JSON.stringify(newObj) is JSON.stringify(obj)
-Serialize false:
-PASS bufferView.length is expectedBufferValues.length
-
-Deserialize to 10:
-PASS JSON.stringify(newObj) is JSON.stringify(obj)
-Serialize 10:
-PASS bufferView.length is expectedBufferValues.length
-
-Deserialize to -10:
-PASS JSON.stringify(newObj) is JSON.stringify(obj)
-Serialize -10:
-PASS bufferView.length is expectedBufferValues.length
-
-Deserialize to 1073741824:
-PASS JSON.stringify(newObj) is JSON.stringify(obj)
-Serialize 1073741824:
-PASS bufferView.length is expectedBufferValues.length
-
-Deserialize to 36028797018963970:
-PASS JSON.stringify(newObj) is JSON.stringify(obj)
-Serialize 36028797018963970:
-PASS bufferView.length is expectedBufferValues.length
-
-Deserialize to 1.23:
-PASS JSON.stringify(newObj) is JSON.stringify(obj)
-Serialize 1.23:
-PASS bufferView.length is expectedBufferValues.length
-
-Deserialize to "":
-PASS JSON.stringify(newObj) is JSON.stringify(obj)
-Serialize "":
-PASS bufferView.length is expectedBufferValues.length
-
-Deserialize to "abc":
-PASS JSON.stringify(newObj) is JSON.stringify(obj)
-Serialize "abc":
-PASS bufferView.length is expectedBufferValues.length
-
-Deserialize to {"integer":123}:
-PASS JSON.stringify(newObj) is JSON.stringify(obj)
-Serialize {"integer":123}:
-PASS bufferView.length is expectedBufferValues.length
-
-Deserialize to {"string":"str"}:
-PASS JSON.stringify(newObj) is JSON.stringify(obj)
-Serialize {"string":"str"}:
-PASS bufferView.length is expectedBufferValues.length
-
-Deserialize to {"list":[1,2,3]}:
-PASS JSON.stringify(newObj) is JSON.stringify(obj)
-Serialize {"list":[1,2,3]}:
-PASS bufferView.length is expectedBufferValues.length
-
-Deserialize to null:
-PASS JSON.stringify(newObj) is JSON.stringify(obj)
-Serialize null:
-PASS bufferView.length is expectedBufferValues.length
-
-Deserialize to {}:
-PASS JSON.stringify(newObj) is JSON.stringify(obj)
-Serialize {}:
-PASS bufferView.length is expectedBufferValues.length
-
-Deserialize to {"inner":{"hello":"there"},"outer":{"hello":"there"}}:
-PASS JSON.stringify(newObj) is JSON.stringify(obj)
-Serialize {"inner":{"hello":"there"},"outer":{"hello":"there"}}:
-PASS bufferView.length is expectedBufferValues.length
-
-Deserialize to {"hello":"there"}:
-PASS JSON.stringify(newObj) is JSON.stringify(obj)
-Serialize {"hello":"there"}:
-PASS bufferView.length is expectedBufferValues.length
-
-Serialize undefined:
-PASS thrownException.code is expectedException
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

Deleted: trunk/LayoutTests/platform/chromium/fast/storage/serialized-script-value.html (134909 => 134910)


--- trunk/LayoutTests/platform/chromium/fast/storage/serialized-script-value.html	2012-11-16 08:06:06 UTC (rev 134909)
+++ trunk/LayoutTests/platform/chromium/fast/storage/serialized-script-value.html	2012-11-16 08:08:37 UTC (rev 134910)
@@ -1,152 +0,0 @@
-<html>
-    <head>
-        <script src=""
-    </head>
-    <body>
-        <script>
-function expectBufferValue(expectedValues, buffer) {
-    expectedBufferValues = expectedValues;
-    bufferView = new Uint16Array(buffer);
-    shouldBe("bufferView.length", "expectedBufferValues.length");
-    var success = (bufferView.length == expectedBufferValues.length);
-    if (success) {
-        for (var i = 0; i < expectedValues.length; i++) {
-            if (expectedValues[i] != bufferView[i]) {
-                testFailed("ArrayBufferViews differ at index " + i + ". Should be " + expectedValues[i] + ". Was " + view[i]);
-                success = false;
-                break;
-            }
-        }
-    }
-
-    if (!success) {
-        // output the full buffer for adding back into the test
-        var output = [];
-        for (i = 0; i < bufferView.length; i++) {
-            var hexVal = bufferView[i].toString(16);
-            if (hexVal.length < 4) {
-                hexVal = "0000".slice(hexVal.length) + hexVal;
-            }
-            output.push("0x" + hexVal);
-        }
-        debug("Actual buffer: [" + output.join(", ") + "]");
-    }
-}
-
-function makeBuffer(serializedValues) {
-    var bufferView = new Uint16Array(new ArrayBuffer(serializedValues.length * 2));
-    for (var i = 0; i < serializedValues.length; i++) {
-        bufferView[i] = serializedValues[i];
-    }
-    return bufferView.buffer;
-}
-
-
-function testSerialization(obj, values, oldFormat, serializeExceptionValue) {
-    debug("");
-
-    if (!serializeExceptionValue) {
-        self.obj = obj;
-        debug("Deserialize to " + JSON.stringify(obj) + ":");
-        self.newObj = internals.deserializeBuffer(makeBuffer(values));
-        shouldBe("JSON.stringify(newObj)", "JSON.stringify(obj)");
-
-        if (oldFormat) {
-            self.newObj = internals.deserializeBuffer(makeBuffer(oldFormat));
-            shouldBe("JSON.stringify(newObj)", "JSON.stringify(obj)");
-        }
-    }
-
-    debug("Serialize " + JSON.stringify(obj) + ":");
-    try {
-        var serialized = internals.serializeObject(obj);
-        if (serializeExceptionValue) {
-            testFailed("Should have thrown an exception of type ", serializeExceptionValue);
-        }
-    } catch(e) {
-        if (!serializeExceptionValue) {
-            testFailed("Threw exception " + e);
-            return;
-        } else {
-            self.thrownException = e;
-            self.expectedException = serializeExceptionValue;
-            shouldBe("thrownException.code", "expectedException");
-            return;
-        }
-    }
-    expectBufferValue(values, serialized);
-}
-
-// we only test a few cases of the "old" serialization format because
-// that is all that was left around from previous tests. Those values
-// are only persisted out in the world in IndexedDB stores that were
-// written with implementations built before mid-2011.
-testSerialization({foo: 'zoo', bar: {baz: 'myNewKey'}},
-                  [ 0x01ff, 0x003f, 0x3f6f, 0x5301, 0x6603,
-                    0x6f6f, 0x013f, 0x0353, 0x6f7a, 0x3f6f,
-                    0x5301, 0x6203, 0x7261, 0x013f, 0x3f6f,
-                    0x5302, 0x6203, 0x7a61, 0x023f, 0x0853,
-                    0x796d, 0x654e, 0x4b77, 0x7965, 0x017b,
-                    0x027b ]);
-
-testSerialization({foo: 'zoo', bar: 'myNewKey'},
-                  [0x01ff, 0x003f, 0x3f6f, 0x5301, 0x6603,
-                   0x6f6f, 0x013f, 0x0353, 0x6f7a, 0x3f6f,
-                   0x5301, 0x6203, 0x7261, 0x013f, 0x0853,
-                   0x796d, 0x654e, 0x4b77, 0x7965, 0x027b]);
-
-testSerialization([], [0x01ff, 0x003f, 0x0041, 0x0024, 0x0000 ]);
-testSerialization({foo: "zoo"},
-                  [0x01ff, 0x003f, 0x3f6f, 0x5301, 0x6603, 0x6f6f,
-                   0x013f, 0x0353, 0x6f7a, 0x7b6f, 0x0001],
-                  [0x0353, 0x6f66, 0x536f, 0x7a03, 0x6f6f, 0x017b]);
-testSerialization({foo: null},
-                  [0x01ff, 0x003f, 0x3f6f, 0x5301, 0x6603, 0x6f6f,
-                   0x013f, 0x7b30, 0x0001],
-                  [0x0353, 0x6f66, 0x306f, 0x017b]);
-testSerialization({}, [0x01ff, 0x003f, 0x7b6f, 0x0000], [0x007b]);
-
-testSerialization(undefined, [0x01ff, 0x003f, 0x005f]);
-testSerialization(true, [0x01ff, 0x003f, 0x0054]);
-testSerialization(false, [0x01ff, 0x003f, 0x0046]);
-// Sparse array deserialization is broken.
-// See: https://bugs.webkit.org/show_bug.cgi?id=96838
-// testSerialization(new Array(100), [0x01ff, 0x003f, 0x6461, 0x0040, 0x0064]);
-testSerialization(10, [0x01ff, 0x003f, 0x1449]);
-testSerialization(-10, [0x01ff, 0x003f, 0x1349]);
-testSerialization(Math.pow(2,30), [0x01ff, 0x003f, 0x8049, 0x8080, 0x0880]);
-testSerialization(Math.pow(2,55), [0x01ff, 0x003f, 0x004e, 0x0000, 0x0000,
-                                   0x6000, 0x0043]);
-testSerialization(1.23, [0x01ff, 0x003f, 0xae4e, 0xe147, 0x147a, 0xf3ae, 0x003f]);
-testSerialization("", [0x01ff, 0x003f, 0x0053]);
-testSerialization("abc", [0x01ff, 0x003f, 0x0353, 0x6261, 0x0063]);
-testSerialization({integer: 123}, [0x01ff, 0x003f, 0x3f6f, 0x5301, 0x6907,
-                                   0x746e, 0x6765, 0x7265, 0x013f, 0xf649,
-                                   0x7b01, 0x0001]);
-testSerialization({string: "str"}, [0x01ff, 0x003f, 0x3f6f, 0x5301, 0x7306,
-                                    0x7274, 0x6e69, 0x3f67, 0x5301, 0x7303,
-                                    0x7274, 0x017b]);
-testSerialization({list: [1,2,3]}, [0x01ff, 0x003f, 0x3f6f, 0x5301, 0x6c04,
-                                    0x7369, 0x3f74, 0x4101, 0x3f03, 0x4902,
-                                    0x3f02, 0x4902, 0x3f04, 0x4902, 0x2406,
-                                    0x0300, 0x017b]);
-testSerialization(null, [0x01ff, 0x003f, 0x0030]);
-testSerialization(/abc/, [0x01ff, 0x003f, 0x0352, 0x6261, 0x0063]);
-
-var innerObject = {hello: "there"};
-var outerObject = {inner: innerObject};
-outerObject['outer'] = innerObject;
-testSerialization(outerObject, [0x01ff, 0x003f, 0x3f6f, 0x5301, 0x6905,
-                                0x6e6e, 0x7265, 0x013f, 0x3f6f, 0x5302,
-                                0x6805, 0x6c65, 0x6f6c, 0x023f, 0x0553,
-                                0x6874, 0x7265, 0x7b65, 0x3f01, 0x5302,
-                                0x6f05, 0x7475, 0x7265, 0x023f, 0x015e,
-                                0x027b]);
-testSerialization(innerObject, [0x01ff, 0x003f, 0x3f6f, 0x5301, 0x6805,
-                                0x6c65, 0x6f6c, 0x013f, 0x0553, 0x6874,
-                                0x7265, 0x7b65, 0x0001]);
-testSerialization(function(){}, [], null, DOMException.DATA_CLONE_ERR);
-        </script>
-        <script src=""
-    </body>
-</html>

Modified: trunk/Source/WebCore/ChangeLog (134909 => 134910)


--- trunk/Source/WebCore/ChangeLog	2012-11-16 08:06:06 UTC (rev 134909)
+++ trunk/Source/WebCore/ChangeLog	2012-11-16 08:08:37 UTC (rev 134910)
@@ -1,3 +1,19 @@
+2012-11-16  Sheriff Bot  <webkit.review....@gmail.com>
+
+        Unreviewed, rolling out r134865.
+        http://trac.webkit.org/changeset/134865
+        https://bugs.webkit.org/show_bug.cgi?id=102466
+
+        Broke the Apple Windows Debug build. (Requested by dydx on
+        #webkit).
+
+        * WebCore.exp.in:
+        * bindings/js/SerializedScriptValue.h:
+        * testing/Internals.cpp:
+        * testing/Internals.h:
+        (WebCore):
+        * testing/Internals.idl:
+
 2012-11-16  Takashi Sakamoto  <ta...@google.com>
 
         ASSERT_NOT_REACHED() when building a CSSOM wrapper for StyleRuleHost

Modified: trunk/Source/WebCore/WebCore.exp.in (134909 => 134910)


--- trunk/Source/WebCore/WebCore.exp.in	2012-11-16 08:06:06 UTC (rev 134909)
+++ trunk/Source/WebCore/WebCore.exp.in	2012-11-16 08:08:37 UTC (rev 134910)
@@ -225,16 +225,15 @@
 __ZN7WebCore13JSHTMLElement6s_infoE
 __ZN7WebCore13KeyboardEventC1ERKN3WTF12AtomicStringEbbPNS_9DOMWindowERKNS1_6StringEjbbbbb
 __ZN7WebCore13KeyboardEventC1ERKNS_21PlatformKeyboardEventEPNS_9DOMWindowE
-__ZN7WebCore13QualifiedNameD1Ev
 __ZN7WebCore13ResourceErrorC1EP7NSError
 __ZN7WebCore13ResourceErrorC1EP9__CFError
 __ZN7WebCore13StyledElement22setInlineStylePropertyENS_13CSSPropertyIDERKN3WTF6StringEb
 __ZN7WebCore13StyledElement22setInlineStylePropertyENS_13CSSPropertyIDEdNS_17CSSPrimitiveValue9UnitTypesEb
 __ZN7WebCore13createWrapperEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_4NodeE
 __ZN7WebCore13directoryNameERKN3WTF6StringE
-__ZN7WebCore13toArrayBufferEN3JSC7JSValueE
 __ZN7WebCore13toHTMLElementEPNS_21FormAssociatedElementE
 __ZN7WebCore13toJSDOMWindowEN3JSC7JSValueE
+__ZN7WebCore13QualifiedNameD1Ev
 __ZN7WebCore14CachedResource12removeClientEPNS_20CachedResourceClientE
 __ZN7WebCore14CachedResource16unregisterHandleEPNS_24CachedResourceHandleBaseE
 __ZN7WebCore14CachedResource9addClientEPNS_20CachedResourceClientE
@@ -245,11 +244,6 @@
 __ZN7WebCore14DocumentLoader13attachToFrameEv
 __ZN7WebCore14DocumentLoader15detachFromFrameEv
 __ZN7WebCore14DocumentLoader18addArchiveResourceEN3WTF10PassRefPtrINS_15ArchiveResourceEEE
-__ZN7WebCore21SerializedScriptValue11deserializeEPN3JSC9ExecStateEPNS1_14JSGlobalObjectEPN3WTF6VectorINS6_6RefPtrINS_11MessagePortEEELm1EEENS_22SerializationErrorModeE
-__ZN7WebCore21SerializedScriptValue6createEPN3JSC9ExecStateENS1_7JSValueEPN3WTF6VectorINS5_6RefPtrINS_11MessagePortEEELm1EEEPNS6_INS7_INS5_11ArrayBufferEEELm1EEENS_22SerializationErrorModeE
-__ZN7WebCore21SerializedScriptValue6createERKN3WTF6StringE
-__ZN7WebCore21SerializedScriptValue8toStringEv
-__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPN3WTF11ArrayBufferE
 __ZN7WebCore14DocumentLoader21addPlugInStreamLoaderEPNS_14ResourceLoaderE
 __ZN7WebCore14DocumentLoader22addAllArchiveResourcesEPNS_7ArchiveE
 __ZN7WebCore14DocumentLoader22cancelMainResourceLoadERKNS_13ResourceErrorE

Modified: trunk/Source/WebCore/bindings/js/SerializedScriptValue.h (134909 => 134910)


--- trunk/Source/WebCore/bindings/js/SerializedScriptValue.h	2012-11-16 08:06:06 UTC (rev 134909)
+++ trunk/Source/WebCore/bindings/js/SerializedScriptValue.h	2012-11-16 08:08:37 UTC (rev 134910)
@@ -73,7 +73,6 @@
     static PassRefPtr<SerializedScriptValue> create(JSContextRef, JSValueRef, JSValueRef* exception);
 
     static PassRefPtr<SerializedScriptValue> create(const String&);
-    static PassRefPtr<SerializedScriptValue> createFromWire(const String& value) { return create(value); }
     static PassRefPtr<SerializedScriptValue> adopt(Vector<uint8_t>& buffer)
     {
         return adoptRef(new SerializedScriptValue(buffer));
@@ -85,7 +84,6 @@
     static PassRefPtr<SerializedScriptValue> booleanValue(bool value);
 
     String toString();
-    String toWireString() { return toString(); }
     
     JSC::JSValue deserialize(JSC::ExecState*, JSC::JSGlobalObject*, MessagePortArray*, SerializationErrorMode = Throwing);
     JSValueRef deserialize(JSContextRef, JSValueRef* exception, MessagePortArray*);

Modified: trunk/Source/WebCore/testing/Internals.cpp (134909 => 134910)


--- trunk/Source/WebCore/testing/Internals.cpp	2012-11-16 08:06:06 UTC (rev 134909)
+++ trunk/Source/WebCore/testing/Internals.cpp	2012-11-16 08:08:37 UTC (rev 134910)
@@ -71,7 +71,6 @@
 #include "RuntimeEnabledFeatures.h"
 #include "SchemeRegistry.h"
 #include "SelectRuleFeatureSet.h"
-#include "SerializedScriptValue.h"
 #include "Settings.h"
 #include "ShadowRoot.h"
 #include "SpellChecker.h"
@@ -1628,16 +1627,4 @@
 #endif
 }
 
-PassRefPtr<ArrayBuffer> Internals::serializeObject(PassRefPtr<SerializedScriptValue> value) const
-{
-    String stringValue = value->toWireString();
-    return ArrayBuffer::create(static_cast<const void*>(stringValue.impl()->characters()), stringValue.sizeInBytes());
 }
-
-PassRefPtr<SerializedScriptValue> Internals::deserializeBuffer(PassRefPtr<ArrayBuffer> buffer) const
-{
-    String value(static_cast<const UChar*>(buffer->data()), buffer->byteLength() / sizeof(UChar));
-    return SerializedScriptValue::createFromWire(value);
-}
-
-}

Modified: trunk/Source/WebCore/testing/Internals.h (134909 => 134910)


--- trunk/Source/WebCore/testing/Internals.h	2012-11-16 08:06:06 UTC (rev 134909)
+++ trunk/Source/WebCore/testing/Internals.h	2012-11-16 08:08:37 UTC (rev 134910)
@@ -29,7 +29,6 @@
 #include "ContextDestructionObserver.h"
 #include "ExceptionCodePlaceholder.h"
 #include "NodeList.h"
-#include <wtf/ArrayBuffer.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 #include <wtf/text/WTFString.h>
@@ -54,7 +53,6 @@
 class ShadowRoot;
 class WebKitPoint;
 class MallocStatistics;
-class SerializedScriptValue;
 
 typedef int ExceptionCode;
 
@@ -248,9 +246,6 @@
     void startTrackingRepaints(Document*, ExceptionCode&);
     void stopTrackingRepaints(Document*, ExceptionCode&);
 
-    PassRefPtr<ArrayBuffer> serializeObject(PassRefPtr<SerializedScriptValue>) const;
-    PassRefPtr<SerializedScriptValue> deserializeBuffer(PassRefPtr<ArrayBuffer>) const;
-
     String getCurrentCursorInfo(Document*, ExceptionCode&);
 
 private:

Modified: trunk/Source/WebCore/testing/Internals.idl (134909 => 134910)


--- trunk/Source/WebCore/testing/Internals.idl	2012-11-16 08:06:06 UTC (rev 134909)
+++ trunk/Source/WebCore/testing/Internals.idl	2012-11-16 08:08:37 UTC (rev 134910)
@@ -217,7 +217,4 @@
 
     // Returns a string with information about the mouse cursor used at the specified client location.
     DOMString getCurrentCursorInfo(in Document document) raises (DOMException);
-
-    SerializedScriptValue deserializeBuffer(in ArrayBuffer buffer);
-    ArrayBuffer serializeObject(in SerializedScriptValue obj);
 };

Modified: trunk/Source/WebKit2/ChangeLog (134909 => 134910)


--- trunk/Source/WebKit2/ChangeLog	2012-11-16 08:06:06 UTC (rev 134909)
+++ trunk/Source/WebKit2/ChangeLog	2012-11-16 08:08:37 UTC (rev 134910)
@@ -1,3 +1,15 @@
+2012-11-16  Sheriff Bot  <webkit.review....@gmail.com>
+
+        Unreviewed, rolling out r134865.
+        http://trac.webkit.org/changeset/134865
+        https://bugs.webkit.org/show_bug.cgi?id=102466
+
+        Broke the Apple Windows Debug build. (Requested by dydx on
+        #webkit).
+
+        * win/WebKit2.def:
+        * win/WebKit2CFLite.def:
+
 2012-11-16  Mikhail Pozdnyakov  <mikhail.pozdnya...@intel.com>
 
         Avoid copying of ViewportArguments in computeViewportAttributes function

Modified: trunk/Source/WebKit2/win/WebKit2.def (134909 => 134910)


--- trunk/Source/WebKit2/win/WebKit2.def	2012-11-16 08:06:06 UTC (rev 134909)
+++ trunk/Source/WebKit2/win/WebKit2.def	2012-11-16 08:08:37 UTC (rev 134910)
@@ -157,8 +157,6 @@
         ??0Cursor@WebCore@@QAE@ABV01@@Z
         ??0String@WTF@@QAE@PBD@Z
         ??0String@WTF@@QAE@PB_W@Z
-        ??0String@WTF@@QAE@PB_WI@Z
-        ??1SerializedScriptValue@WebCore@@QAE@XZ
         ?absoluteBoundingBoxRect@RenderObject@WebCore@@QBE?AVIntRect@2@_N@Z
         ?absoluteBoundingBoxRectIgnoringTransforms@RenderObject@WebCore@@QBE?AVIntRect@2@XZ
         ?description@DocumentMarker@WebCore@@QBEABVString@WTF@@XZ
@@ -169,11 +167,8 @@
         ?childItemWithTarget@HistoryItem@WebCore@@QBEPAV12@ABVString@WTF@@@Z
         ?create@HTMLContentElement@WebCore@@SA?AV?$PassRefPtr@VHTMLContentElement@WebCore@@@WTF@@PAVDocument@2@@Z
         ?create@Range@WebCore@@SA?AV?$PassRefPtr@VRange@WebCore@@@WTF@@V?$PassRefPtr@VDocument@WebCore@@@4@V?$PassRefPtr@VNode@WebCore@@@4@H1H@Z
-        ?create@SerializedScriptValue@WebCore@@SA?AV?$PassRefPtr@VSerializedScriptValue@WebCore@@@WTF@@ABVString@4@@Z
-        ?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
         ?create@ShadowRoot@WebCore@@SA?AV?$PassRefPtr@VShadowRoot@WebCore@@@WTF@@PAVElement@2@AAH@Z
         ?createWrapper@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVNode@1@@Z
-        ?deserialize@SerializedScriptValue@WebCore@@QAE?AVJSValue@JSC@@PAVExecState@4@PAVJSGlobalObject@4@PAV?$Vector@V?$RefPtr@VMessagePort@WebCore@@@WTF@@$00@WTF@@W4SerializationErrorMode@2@@Z
         ?documentState@HistoryItem@WebCore@@QBEABV?$Vector@VString@WTF@@$0A@@WTF@@XZ
         ?ensureSelectFeatureSetCollected@ElementShadow@WebCore@@QAEXXZ
         ?equal@WTF@@YA_NPBVStringImpl@1@PBE@Z
@@ -262,17 +257,14 @@
         ?text@Range@WebCore@@QBE?AVString@WTF@@XZ
         ?textContent@Node@WebCore@@QBE?AVString@WTF@@_N@Z
         ?toDocument@WebCore@@YAPAVDocument@1@VJSValue@JSC@@@Z
-        ?toArrayBuffer@WebCore@@YAPAVArrayBuffer@WTF@@VJSValue@JSC@@@Z
         ?toDOMStringList@WebCore@@YA?AV?$PassRefPtr@VDOMStringList@WebCore@@@WTF@@PAVExecState@JSC@@VJSValue@5@@Z
         ?toElement@WebCore@@YAPAVElement@1@VJSValue@JSC@@@Z
-        ?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVArrayBuffer@WTF@@@Z
         ?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVClientRect@1@@Z
         ?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVClientRectList@1@@Z
         ?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVNode@1@@Z
         ?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVRange@1@@Z
         ?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVNodeList@1@@Z
         ?toRange@WebCore@@YAPAVRange@1@VJSValue@JSC@@@Z
-        ?toString@SerializedScriptValue@WebCore@@QAE?AVString@WTF@@XZ
         ?treeScope@Node@WebCore@@QBEPAVTreeScope@2@XZ
         ?updateLayoutIgnorePendingStylesheets@Document@WebCore@@QAEXXZ
         ?userPreferredLanguages@WebCore@@YA?AV?$Vector@VString@WTF@@$0A@@WTF@@XZ

Modified: trunk/Source/WebKit2/win/WebKit2CFLite.def (134909 => 134910)


--- trunk/Source/WebKit2/win/WebKit2CFLite.def	2012-11-16 08:06:06 UTC (rev 134909)
+++ trunk/Source/WebKit2/win/WebKit2CFLite.def	2012-11-16 08:08:37 UTC (rev 134910)
@@ -150,8 +150,6 @@
         ??0Cursor@WebCore@@QAE@ABV01@@Z
         ??0String@WTF@@QAE@PBD@Z
         ??0String@WTF@@QAE@PB_W@Z
-        ??0String@WTF@@QAE@PB_WI@Z
-        ??1SerializedScriptValue@WebCore@@QAE@XZ
         ?absoluteBoundingBoxRect@RenderObject@WebCore@@QBE?AVIntRect@2@_N@Z
         ?absoluteBoundingBoxRectIgnoringTransforms@RenderObject@WebCore@@QBE?AVIntRect@2@XZ
 	?description@DocumentMarker@WebCore@@QBEABVString@WTF@@XZ
@@ -162,11 +160,8 @@
         ?childItemWithTarget@HistoryItem@WebCore@@QBEPAV12@ABVString@WTF@@@Z
         ?create@HTMLContentElement@WebCore@@SA?AV?$PassRefPtr@VHTMLContentElement@WebCore@@@WTF@@PAVDocument@2@@Z
         ?create@Range@WebCore@@SA?AV?$PassRefPtr@VRange@WebCore@@@WTF@@V?$PassRefPtr@VDocument@WebCore@@@4@V?$PassRefPtr@VNode@WebCore@@@4@H1H@Z
-        ?create@SerializedScriptValue@WebCore@@SA?AV?$PassRefPtr@VSerializedScriptValue@WebCore@@@WTF@@ABVString@4@@Z
-        ?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
         ?create@ShadowRoot@WebCore@@SA?AV?$PassRefPtr@VShadowRoot@WebCore@@@WTF@@PAVElement@2@AAH@Z
         ?createWrapper@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVNode@1@@Z
-        ?deserialize@SerializedScriptValue@WebCore@@QAE?AVJSValue@JSC@@PAVExecState@4@PAVJSGlobalObject@4@PAV?$Vector@V?$RefPtr@VMessagePort@WebCore@@@WTF@@$00@WTF@@W4SerializationErrorMode@2@@Z
         ?documentState@HistoryItem@WebCore@@QBEABV?$Vector@VString@WTF@@$0A@@WTF@@XZ
         ?ensureSelectFeatureSetCollected@ElementShadow@WebCore@@QAEXXZ
         ?equal@WTF@@YA_NPBVStringImpl@1@PBE@Z
@@ -255,19 +250,14 @@
         ?text@Range@WebCore@@QBE?AVString@WTF@@XZ
         ?textContent@Node@WebCore@@QBE?AVString@WTF@@_N@Z
         ?toDocument@WebCore@@YAPAVDocument@1@VJSValue@JSC@@@Z
-        ?toArrayBuffer@WebCore@@YAPAVArrayBuffer@WTF@@VJSValue@JSC@@@Z
         ?toDOMStringList@WebCore@@YA?AV?$PassRefPtr@VDOMStringList@WebCore@@@WTF@@PAVExecState@JSC@@VJSValue@5@@Z
-        ?toArrayBuffer@WebCore@@YAPAVArrayBuffer@WTF@@VJSValue@JSC@@@Z
-        ?toDocument@WebCore@@YAPAVDocument@1@VJSValue@JSC@@@Z
         ?toElement@WebCore@@YAPAVElement@1@VJSValue@JSC@@@Z
-        ?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVArrayBuffer@WTF@@@Z
         ?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVClientRect@1@@Z
         ?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVClientRectList@1@@Z
         ?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVNode@1@@Z
         ?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVRange@1@@Z
         ?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVNodeList@1@@Z
         ?toRange@WebCore@@YAPAVRange@1@VJSValue@JSC@@@Z
-        ?toString@SerializedScriptValue@WebCore@@QAE?AVString@WTF@@XZ
         ?treeScope@Node@WebCore@@QBEPAVTreeScope@2@XZ
         ?updateLayoutIgnorePendingStylesheets@Document@WebCore@@QAEXXZ
         ?userPreferredLanguages@WebCore@@YA?AV?$Vector@VString@WTF@@$0A@@WTF@@XZ

Modified: trunk/Source/autotools/symbols.filter (134909 => 134910)


--- trunk/Source/autotools/symbols.filter	2012-11-16 08:06:06 UTC (rev 134909)
+++ trunk/Source/autotools/symbols.filter	2012-11-16 08:08:37 UTC (rev 134910)
@@ -212,13 +212,6 @@
 _ZNK7WebCore5Frame15layerTreeAsTextEj;
 _ZN7WebCore9FrameView17setTracksRepaintsEb;
 _ZNK7WebCore5Frame25trackedRepaintRectsAsTextEv;
-_ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPN3WTF11ArrayBufferE;
-_ZN7WebCore13toArrayBufferEN3JSC7JSValueE;
-_ZN7WebCore21SerializedScriptValue6createEPN3JSC9ExecStateENS1_7JSValueEPN3WTF6VectorINS5_6RefPtrINS_11MessagePortEEELm1EEEPNS6_INS7_INS5_11ArrayBufferEEELm1EEENS_22SerializationErrorModeE;
-_ZN7WebCore21SerializedScriptValue6createERKN3WTF6StringE;
-_ZN7WebCore21SerializedScriptValue8toStringEv;
-_ZN7WebCore21SerializedScriptValue11deserializeEPN3JSC9ExecStateEPNS1_14JSGlobalObjectEPN3WTF6VectorINS6_6RefPtrINS_11MessagePortEEELm1EEENS_22SerializationErrorModeE;
-_ZN7WebCore21SerializedScriptValueD1Ev;
 
 local:
 _Z*;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to