Unreviewed, roll out http://trac.webkit.org/changeset/186903. It broke the build.
authorfpizlo@apple.com <fpizlo@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 16 Jul 2015 20:19:25 +0000 (20:19 +0000)
committerfpizlo@apple.com <fpizlo@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 16 Jul 2015 20:19:25 +0000 (20:19 +0000)
Source/WebCore:

* CMakeLists.txt:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/DOMWrapperWorld.h:
(WebCore::currentWorld):
(WebCore::worldForDOMObject): Deleted.
* bindings/js/JSBindingsAllInOne.cpp:
* bindings/js/JSCustomEventCustom.cpp:
(WebCore::JSCustomEvent::detail): Deleted.
* bindings/js/JSMessageEventCustom.cpp:
(WebCore::JSMessageEvent::data):
* bindings/js/JSPopStateEventCustom.cpp:
(WebCore::JSPopStateEvent::state):
* dom/CustomEvent.cpp:
(WebCore::CustomEvent::initCustomEvent):
(WebCore::CustomEvent::eventInterface):
(WebCore::CustomEvent::trySerializeDetail): Deleted.
* dom/CustomEvent.h:
* dom/CustomEvent.idl:
* dom/MessageEvent.cpp:
(WebCore::MessageEvent::initMessageEvent):
(WebCore::MessageEvent::data):
(WebCore::MessageEvent::trySerializeData): Deleted.
* dom/MessageEvent.h:
* dom/PopStateEvent.cpp:
(WebCore::PopStateEvent::create):
(WebCore::PopStateEvent::eventInterface):
(WebCore::PopStateEvent::trySerializeState): Deleted.
* dom/PopStateEvent.h:
* testing/Internals.cpp:
(WebCore::Internals::deserializeBuffer):
(WebCore::Internals::setUsesOverlayScrollbars):
(WebCore::Internals::isFromCurrentWorld): Deleted.
* testing/Internals.h:
* testing/Internals.idl:

LayoutTests:

* fast/events/constructors/custom-event-constructor-expected.txt:
* fast/events/constructors/custom-event-constructor.html:
* fast/events/event-leak-objects-expected.txt:
* fast/events/event-leak-objects.html:
* fast/events/event-properties-gc-expected.txt:
* fast/events/event-properties-gc.html:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@186906 268f45cc-cd09-0410-ab3c-d52691b4dbfc

25 files changed:
LayoutTests/ChangeLog
LayoutTests/fast/events/constructors/custom-event-constructor-expected.txt
LayoutTests/fast/events/constructors/custom-event-constructor.html
LayoutTests/fast/events/event-leak-objects-expected.txt
LayoutTests/fast/events/event-leak-objects.html
LayoutTests/fast/events/event-properties-gc-expected.txt
LayoutTests/fast/events/event-properties-gc.html
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/bindings/js/DOMWrapperWorld.h
Source/WebCore/bindings/js/JSBindingsAllInOne.cpp
Source/WebCore/bindings/js/JSCustomEventCustom.cpp
Source/WebCore/bindings/js/JSMessageEventCustom.cpp
Source/WebCore/bindings/js/JSPopStateEventCustom.cpp
Source/WebCore/dom/CustomEvent.cpp
Source/WebCore/dom/CustomEvent.h
Source/WebCore/dom/CustomEvent.idl
Source/WebCore/dom/MessageEvent.cpp
Source/WebCore/dom/MessageEvent.h
Source/WebCore/dom/PopStateEvent.cpp
Source/WebCore/dom/PopStateEvent.h
Source/WebCore/testing/Internals.cpp
Source/WebCore/testing/Internals.h
Source/WebCore/testing/Internals.idl

index c824f47..ef9a0f4 100644 (file)
@@ -1,3 +1,14 @@
+2015-07-16  Filip Pizlo  <fpizlo@apple.com>
+
+        Unreviewed, roll out http://trac.webkit.org/changeset/186903. It broke the build.
+
+        * fast/events/constructors/custom-event-constructor-expected.txt:
+        * fast/events/constructors/custom-event-constructor.html:
+        * fast/events/event-leak-objects-expected.txt:
+        * fast/events/event-leak-objects.html:
+        * fast/events/event-properties-gc-expected.txt:
+        * fast/events/event-properties-gc.html:
+
 2015-07-16  Tim Horton  <timothy_horton@apple.com>
 
         Rebaseline test for Windows.
index 9f0f9c0..648c596 100644 (file)
@@ -13,11 +13,8 @@ PASS new CustomEvent('eventType', { detail: 10 }).detail is 10
 PASS new CustomEvent('eventType', { detail: 'string' }).detail is 'string'
 PASS new CustomEvent('eventType', { detail: detailObject }).detail is detailObject
 PASS new CustomEvent('eventType', { detail: document }).detail is document
-PASS new CustomEvent('eventType', { detail: undefined }).detail is undefined
-PASS new CustomEvent('eventType', { detail: null }).detail is null
 PASS new CustomEvent('eventType', { get detail() { return true; } }).detail is true
 PASS new CustomEvent('eventType', { get detail() { throw 'Custom Error'; } }) threw exception Custom Error.
-PASS event.detail is detailObject
 PASS successfullyParsed is true
 
 TEST COMPLETE
index 99d7501..a860a92 100644 (file)
@@ -31,23 +31,11 @@ shouldBe("new CustomEvent('eventType', { detail: detailObject }).detail", "detai
 // Detail is a DOM object
 shouldBe("new CustomEvent('eventType', { detail: document }).detail", "document");
 
-// Detail is undefined.
-shouldBe("new CustomEvent('eventType', { detail: undefined }).detail", "undefined");
-
-// Detail is null.
-shouldBe("new CustomEvent('eventType', { detail: null }).detail", "null");
-
 // Detail is a getter.
 shouldBe("new CustomEvent('eventType', { get detail() { return true; } }).detail", "true");
 
 // Detail throws an exeception.
 shouldThrow("new CustomEvent('eventType', { get detail() { throw 'Custom Error'; } })");
-
-// try initCustomEvent
-var event = document.createEvent('CustomEvent');
-event.initCustomEvent('eventType', true, false, detailObject);
-shouldBe("event.detail", "detailObject");
-
 </script>
 <script src="../../../resources/js-test-post.js"></script>
 </body>
index 1be79dd..e69de29 100644 (file)
@@ -1,40 +0,0 @@
-PASS checkAllPropertiesFromCurrentWorld(documentResult) is true
-PASS document.pageDefinedVar is undefined.
-PASS checkAllPropertiesFromCurrentWorld(documentResult) is true
-PASS document.pageDefinedVar is undefined.
-PASS checkAllPropertiesFromCurrentWorld(documentResult) is true
-PASS document.pageDefinedVar is undefined.
-PASS checkAllPropertiesFromCurrentWorld(documentResult) is true
-PASS document.pageDefinedVar is undefined.
-PASS checkAllPropertiesFromCurrentWorld(documentResult) is true
-PASS document.pageDefinedVar is undefined.
-PASS checkAllPropertiesFromCurrentWorld(documentResult) is true
-PASS document.pageDefinedVar is undefined.
-PASS checkAllPropertiesFromCurrentWorld(documentResult) is true
-PASS document.pageDefinedVar is undefined.
-PASS checkAllPropertiesFromCurrentWorld(documentResult) is true
-PASS document.pageDefinedVar is undefined.
-PASS checkAllPropertiesFromCurrentWorld(documentResult) is true
-PASS document.pageDefinedVar is undefined.
-PASS checkAllPropertiesFromCurrentWorld(documentResult) is true
-PASS document.pageDefinedVar is undefined.
-PASS checkAllPropertiesFromCurrentWorld(documentResult) is true
-PASS document.pageDefinedVar is undefined.
-PASS checkAllPropertiesFromCurrentWorld(documentResult) is true
-PASS document.pageDefinedVar is undefined.
-PASS checkAllPropertiesFromCurrentWorld(documentResult) is true
-PASS document.pageDefinedVar is undefined.
-PASS checkAllPropertiesFromCurrentWorld(documentResult) is true
-PASS document.pageDefinedVar is undefined.
-PASS checkAllPropertiesFromCurrentWorld(documentResult) is true
-PASS document.pageDefinedVar is undefined.
-PASS checkAllPropertiesFromCurrentWorld(documentResult) is true
-PASS document.pageDefinedVar is undefined.
-PASS checkAllPropertiesFromCurrentWorld(documentResult) is true
-PASS document.pageDefinedVar is undefined.
-PASS checkAllPropertiesFromCurrentWorld(documentResult) is true
-PASS document.pageDefinedVar is undefined.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
index ad44925..e69de29 100644 (file)
@@ -1,128 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src="../../resources/js-test-pre.js"></script>
-</head>
-<body>
-<script>
-window.jsTestIsAsync = true;
-
-// The events that we want to test, with the properties that each one uses.
-var events = [
-    { eventKind: "CustomEvent", propName: "detail" },
-    { eventKind: "MessageEvent", propName: "data"  },
-    { eventKind: "PopStateEvent", propName: "state" }
-];
-
-// Types we can put in the property of the Event
-var values = [
-    { propValue: "document" },
-    { propValue: '{"bar":1}' },
-    { propValue: "5" },
-    { propValue: '"hello"' },
-    { propValue: "true" },
-    { propValue: "[1,2,3]" }
-];
-
-function merge(obj1, obj2) {
-    var newObj = { };
-    for (var attrname in obj1) { newObj[attrname] = obj1[attrname]; }
-    for (var attrname in obj2) { newObj[attrname] = obj2[attrname]; }
-    return newObj;
-}
-
-// Format the tests so they look like [ { eventKind: ..., propValue: ... }, ... { eventKind: ..., propValue: ... } ]
-var tests = events.map(function(event) {
-    return values.map(function(value) {
-        return merge(event, value);
-    })
-});
-tests = tests.reduce(function(a, b) {
-    return a.concat(b);
-});
-
-// We need to scan all the properies of value to ensure they all came from the current world.
-// Assumes window.internals exists.
-function checkAllPropertiesFromCurrentWorld(value) {
-
-    var allFromCurrentWorld = window.internals.isFromCurrentWorld(value);
-
-    if (!value)
-        return true;
-
-    if (typeof value === "object") {
-        for (var prop in value) {
-            allFromCurrentWorld = allFromCurrentWorld && checkAllPropertiesFromCurrentWorld(value[prop]);
-        }
-    }
-
-    if (Object.getPrototypeOf(value)) {
-        allFromCurrentWorld = allFromCurrentWorld
-            && checkAllPropertiesFromCurrentWorld(Object.getPrototypeOf(value));
-    }
-
-    return allFromCurrentWorld;
-}
-
-function addListener(eventKind, eventString, prop) {
-    document.addEventListener(eventString, function(event) {
-        documentResult = event[prop];
-
-        if (window.internals)
-            shouldBeTrue("checkAllPropertiesFromCurrentWorld(documentResult)");
-
-        // The property defined in the isolated world should be undefined.
-        shouldBeUndefined("document.pageDefinedVar");
-        window.postMessage("done", "*");
-    });
-}
-
-function sendDocumentEvent(eventKind, eventString, prop, value) {
-    var constructor = eval(eventKind);
-    var initializer = { };
-    initializer[prop] = value;
-    var newEvent = new constructor(eventString, initializer);
-    // Try to access the property in a different world to make sure caching issues do not occur
-    newEvent[prop];
-    document.dispatchEvent(newEvent);
-}
-
-function runScript(eventKind, propName, propValue, number) {
-    // Final string should have the form:
-    //     document.pageDefinedVar = 1; (function sendDocumentObject(eventKind, propName, result) {...})(...);
-    // When evaluated in the isolated world, should initiate the event with the
-    // document object as the specificed property value.
-    var eventString = eventKind + number;
-
-    var script = "document.pageDefinedVar = 1; "
-        + "(" + sendDocumentEvent.toString() + ")('"
-        + eventKind + "', '" + eventString + "', '" + propName + "', " + propValue + ");";
-    addListener(eventKind, eventString, propName);
-    testRunner.evaluateScriptInIsolatedWorld(1, script);
-}
-
-// Run the tests whenever a notification arrives, which indicates that the
-// previous test has finished.
-window.addEventListener("message", function(message) {
-    runNextTest();
-}, false);
-
-// Keep a count to make a unique string
-var count = 1;
-function runNextTest () {
-    var test = tests.pop();
-    if (!test) {
-        finishJSTest();
-        return;
-    }
-    runScript(test.eventKind, test.propName, test.propValue, count++);
-};
-
-// This test is meaningless without testRunner.
-if (window.testRunner) {
-    runNextTest();
-}
-</script>
-</body>
-<script src="../../resources/js-test-post.js"></script>
-</html>
index 3c65f0f..e69de29 100644 (file)
@@ -1,7 +0,0 @@
-PASS event[prop] is "foo"
-PASS event[prop] is "foo"
-PASS event[prop] is "foo"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
index b249e38..e69de29 100644 (file)
@@ -1,60 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src="../../resources/js-test-pre.js"></script>
-</head>
-<body>
-<script>
-window.jsTestIsAsync = true;
-
-function addListener(eventType, prop) {
-    document.addEventListener(eventType, function(event) {
-        window.prop = prop;
-        // Despite the earlier assignement of the local variable to null and
-        // the following garabage collection, the property should still be
-        // present here.
-        shouldBeEqualToString("event[prop]", "foo");
-        window.prop = undefined;
-        window.postMessage("done", "*");
-    });
-}
-
-// Run the tests whenever a notification arrives, which indicates that the
-// previous test has finished.
-window.addEventListener("message", function(message) {
-    runNextTest();
-}, false);
-
-function newEvent(eventType, prop, value) {
-   return eval("new " + eventType + "('" + eventType + "', { " + prop + ": value })");
-}
-
-// The events that we want to test, with the properties that each one uses.
-var events = [
-    { eventType: "CustomEvent", prop: "detail" },
-    { eventType: "MessageEvent", prop: "data" },
-    { eventType: "PopStateEvent", prop: "state" }
-];
-
-function runNextTest () {
-    var evt = events.pop();
-    if (!evt) {
-        finishJSTest();
-        return;
-    }
-    var value = "foo";
-    var eventToDispatch = newEvent(evt.eventType, evt.prop, value);
-    value = null;
-    gc();
-    addListener(evt.eventType, evt.prop);
-    document.dispatchEvent(eventToDispatch);
-};
-
-// This test is meaningless without testRunner.
-if (window.testRunner) {
-    runNextTest();
-}
-</script>
-</body>
-<script src="../../resources/js-test-post.js"></script>
-</html>
index d5460b7..000f999 100644 (file)
@@ -1097,7 +1097,6 @@ set(WebCore_SOURCES
     bindings/js/JSCryptoKeyPairCustom.cpp
     bindings/js/JSCryptoKeySerializationJWK.cpp
     bindings/js/JSCryptoOperationData.cpp
-    bindings/js/JSCustomEventCustom.cpp
     bindings/js/JSCustomSQLStatementErrorCallback.cpp
     bindings/js/JSCustomXPathNSResolver.cpp
     bindings/js/JSDOMBinding.cpp
index b48e974..cda039e 100644 (file)
@@ -1,3 +1,42 @@
+2015-07-16  Filip Pizlo  <fpizlo@apple.com>
+
+        Unreviewed, roll out http://trac.webkit.org/changeset/186903. It broke the build.
+
+        * CMakeLists.txt:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/DOMWrapperWorld.h:
+        (WebCore::currentWorld):
+        (WebCore::worldForDOMObject): Deleted.
+        * bindings/js/JSBindingsAllInOne.cpp:
+        * bindings/js/JSCustomEventCustom.cpp:
+        (WebCore::JSCustomEvent::detail): Deleted.
+        * bindings/js/JSMessageEventCustom.cpp:
+        (WebCore::JSMessageEvent::data):
+        * bindings/js/JSPopStateEventCustom.cpp:
+        (WebCore::JSPopStateEvent::state):
+        * dom/CustomEvent.cpp:
+        (WebCore::CustomEvent::initCustomEvent):
+        (WebCore::CustomEvent::eventInterface):
+        (WebCore::CustomEvent::trySerializeDetail): Deleted.
+        * dom/CustomEvent.h:
+        * dom/CustomEvent.idl:
+        * dom/MessageEvent.cpp:
+        (WebCore::MessageEvent::initMessageEvent):
+        (WebCore::MessageEvent::data):
+        (WebCore::MessageEvent::trySerializeData): Deleted.
+        * dom/MessageEvent.h:
+        * dom/PopStateEvent.cpp:
+        (WebCore::PopStateEvent::create):
+        (WebCore::PopStateEvent::eventInterface):
+        (WebCore::PopStateEvent::trySerializeState): Deleted.
+        * dom/PopStateEvent.h:
+        * testing/Internals.cpp:
+        (WebCore::Internals::deserializeBuffer):
+        (WebCore::Internals::setUsesOverlayScrollbars):
+        (WebCore::Internals::isFromCurrentWorld): Deleted.
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2015-07-16  Keith Miller  <keith_miller@apple.com>
 
         Remove leak of objects between isolated worlds on custom events, message events, and pop state events.
index 09fe765..37092ca 100644 (file)
                DEBCCDD216646E8200A452E1 /* RenderMediaControlElements.h in Headers */ = {isa = PBXBuildFile; fileRef = DE49B308165F2FE10010338D /* RenderMediaControlElements.h */; };
                DEBCCDD416646EAF00A452E1 /* MediaControlElementTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = DE49B300165F2FC60010338D /* MediaControlElementTypes.h */; };
                DEBCCDD516646EB200A452E1 /* MediaControlElementTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE49B2FF165F2FC60010338D /* MediaControlElementTypes.cpp */; };
-               DEC297611B4F2F8D005F5945 /* JSCustomEventCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DEC2975D1B4DEB2A005F5945 /* JSCustomEventCustom.cpp */; };
                DF9AFD7213FC31D80015FEB7 /* MediaPlayerPrivateAVFoundationObjC.h in Headers */ = {isa = PBXBuildFile; fileRef = DF9AFD7013FC31D80015FEB7 /* MediaPlayerPrivateAVFoundationObjC.h */; };
                DF9AFD7313FC31D80015FEB7 /* MediaPlayerPrivateAVFoundationObjC.mm in Sources */ = {isa = PBXBuildFile; fileRef = DF9AFD7113FC31D80015FEB7 /* MediaPlayerPrivateAVFoundationObjC.mm */; };
                E0FEF372B17C53EAC1C1FBEE /* EventSource.h in Headers */ = {isa = PBXBuildFile; fileRef = E0FEF371B17C53EAC1C1FBEE /* EventSource.h */; };
                DE49B300165F2FC60010338D /* MediaControlElementTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaControlElementTypes.h; sourceTree = "<group>"; };
                DE49B307165F2FE10010338D /* RenderMediaControlElements.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderMediaControlElements.cpp; sourceTree = "<group>"; };
                DE49B308165F2FE10010338D /* RenderMediaControlElements.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderMediaControlElements.h; sourceTree = "<group>"; };
-               DEC2975D1B4DEB2A005F5945 /* JSCustomEventCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCustomEventCustom.cpp; sourceTree = "<group>"; };
                DF9AFD7013FC31D80015FEB7 /* MediaPlayerPrivateAVFoundationObjC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlayerPrivateAVFoundationObjC.h; sourceTree = "<group>"; };
                DF9AFD7113FC31D80015FEB7 /* MediaPlayerPrivateAVFoundationObjC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MediaPlayerPrivateAVFoundationObjC.mm; sourceTree = "<group>"; };
                E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = EventSource.idl; sourceTree = "<group>"; };
                BC4EDEF70C08F414007EDD49 /* Custom */ = {
                        isa = PBXGroup;
                        children = (
-                               DEC2975D1B4DEB2A005F5945 /* JSCustomEventCustom.cpp */,
                                BC2ED6BB0C6BD2F000920BFF /* JSAttrCustom.cpp */,
                                FDEAAAEF12B02EE400DCF33B /* JSAudioBufferSourceNodeCustom.cpp */,
                                FDEAAAF012B02EE400DCF33B /* JSAudioContextCustom.cpp */,
                                B2227AD90D00BF220071B782 /* SVGTransformable.cpp in Sources */,
                                B2227ADC0D00BF220071B782 /* SVGTransformDistance.cpp in Sources */,
                                B2227ADE0D00BF220071B782 /* SVGTransformList.cpp in Sources */,
-                               DEC297611B4F2F8D005F5945 /* JSCustomEventCustom.cpp in Sources */,
                                B2227AE10D00BF220071B782 /* SVGTRefElement.cpp in Sources */,
                                B2227AE40D00BF220071B782 /* SVGTSpanElement.cpp in Sources */,
                                B2227AE90D00BF220071B782 /* SVGURIReference.cpp in Sources */,
index f04883c..f88e1c4 100644 (file)
@@ -74,11 +74,6 @@ inline DOMWrapperWorld& currentWorld(JSC::ExecState* exec)
     return JSC::jsCast<JSDOMGlobalObject*>(exec->lexicalGlobalObject())->world();
 }
 
-inline DOMWrapperWorld& worldForDOMObject(JSC::JSObject* object)
-{
-    return JSC::jsCast<JSDOMGlobalObject*>(object->globalObject())->world();
-}
-    
 } // namespace WebCore
 
 #endif // DOMWrapperWorld_h
index 4e6d2e3..9d8a741 100644 (file)
@@ -45,7 +45,6 @@
 #include "JSCharacterDataCustom.cpp"
 #include "JSCommandLineAPIHostCustom.cpp"
 #include "JSCryptoCustom.cpp"
-#include "JSCustomEventCustom.cpp"
 #include "JSCustomSQLStatementErrorCallback.cpp"
 #include "JSCustomXPathNSResolver.cpp"
 #include "JSDOMBinding.cpp"
index 34453bb..e69de29 100644 (file)
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "JSCustomEvent.h"
-
-#include "CustomEvent.h"
-#include "DOMWrapperWorld.h"
-#include <runtime/JSCJSValue.h>
-#include <runtime/Structure.h>
-
-using namespace JSC;
-
-namespace WebCore {
-    
-JSValue JSCustomEvent::detail(ExecState* exec) const
-{
-    CustomEvent& event = impl();
-    
-    if (event.detail().hasNoValue())
-        return jsNull();
-
-    JSValue detail = event.detail().jsValue();
-    
-    if (detail.isObject() && &worldForDOMObject(detail.getObject()) != &currentWorld(exec)) {
-        // We need to make sure CustomEvents do not leak their detail property across isolated DOM worlds.
-        // Ideally, we would check that the worlds have different privileges but that's not possible yet.
-        RefPtr<SerializedScriptValue> serializedDetail = event.trySerializeDetail(exec);
-        
-        if (!serializedDetail)
-            return jsNull();
-        
-        return serializedDetail->deserialize(exec, globalObject(), nullptr);
-    }
-    
-    return detail;
-}
-
-} // namespace WebCore
-
index be645c0..0e14bcd 100644 (file)
@@ -46,12 +46,8 @@ namespace WebCore {
 
 JSValue JSMessageEvent::data(ExecState* exec) const
 {
-    if (JSValue cachedValue = m_data.get()) {
-        // We cannot use a cached object if we are in a different world than the one it was created in.
-        if (!cachedValue.isObject() || &worldForDOMObject(cachedValue.getObject()) == &currentWorld(exec))
-            return cachedValue;
-        ASSERT_NOT_REACHED();
-    }
+    if (JSValue cachedValue = m_data.get())
+        return cachedValue;
 
     MessageEvent& event = impl();
     JSValue result;
@@ -60,19 +56,8 @@ JSValue JSMessageEvent::data(ExecState* exec) const
         Deprecated::ScriptValue scriptValue = event.dataAsScriptValue();
         if (scriptValue.hasNoValue())
             result = jsNull();
-        else {
-            JSValue dataValue = scriptValue.jsValue();
-            // We need to make sure MessageEvents do not leak objects in their state property across isolated DOM worlds.
-            // Ideally, we would check that the worlds have different privileges but that's not possible yet.
-            if (dataValue.isObject() && &worldForDOMObject(dataValue.getObject()) != &currentWorld(exec)) {
-                RefPtr<SerializedScriptValue> serializedValue = event.trySerializeData(exec);
-                if (serializedValue)
-                    result = serializedValue->deserialize(exec, globalObject(), nullptr);
-                else
-                    result = jsNull();
-            } else
-                result = dataValue;
-        }
+        else
+            result = scriptValue.jsValue();
         break;
     }
 
index 502e48b..95aee34 100644 (file)
@@ -49,29 +49,14 @@ static const JSValue& cacheState(ExecState* exec, JSPopStateEvent* event, const
 JSValue JSPopStateEvent::state(ExecState* exec) const
 {
     JSValue cachedValue = m_state.get();
-    if (!cachedValue.isEmpty()) {
-        // We cannot use a cached object if we are in a different world than the one it was created in.
-        if (!cachedValue.isObject() || &worldForDOMObject(cachedValue.getObject()) == &currentWorld(exec))
-            return cachedValue;
-        ASSERT_NOT_REACHED();
-    }
+    if (!cachedValue.isEmpty())
+        return cachedValue;
 
     PopStateEvent& event = impl();
 
-    if (!event.state().hasNoValue()) {
-        // We need to make sure a PopStateEvent does not leak objects in its state property across isolated DOM worlds.
-        // Ideally, we would check that the worlds have different privileges but that's not possible yet.
-        JSValue state = event.state().jsValue();
-        if (state.isObject() && &worldForDOMObject(state.getObject()) != &currentWorld(exec)) {
-            if (RefPtr<SerializedScriptValue> serializedValue = event.trySerializeState(exec))
-                state = serializedValue->deserialize(exec, globalObject(), nullptr);
-            else
-                state = jsNull();
-        }
-        
-        return cacheState(exec, const_cast<JSPopStateEvent*>(this), state);
-    }
-    
+    if (!event.state().hasNoValue())
+        return cacheState(exec, const_cast<JSPopStateEvent*>(this), event.state().jsValue());
+
     History* history = event.history();
     if (!history || !event.serializedState())
         return cacheState(exec, const_cast<JSPopStateEvent*>(this), jsNull());
index 3e7f507..f2fce80 100644 (file)
@@ -51,24 +51,13 @@ CustomEvent::~CustomEvent()
 
 void CustomEvent::initCustomEvent(const AtomicString& type, bool canBubble, bool cancelable, const Deprecated::ScriptValue& detail)
 {
+    ASSERT(!m_serializedScriptValue.get());
     if (dispatched())
         return;
 
     initEvent(type, canBubble, cancelable);
 
     m_detail = detail;
-    m_serializedDetail = nullptr;
-    m_triedToSerialize = false;
-}
-
-RefPtr<SerializedScriptValue> CustomEvent::trySerializeDetail(JSC::ExecState* exec)
-{
-    if (!m_serializedDetail && !m_triedToSerialize) {
-        m_serializedDetail = SerializedScriptValue::create(exec, m_detail.jsValue(), nullptr, nullptr, NonThrowing);
-        m_triedToSerialize = true;
-    }
-    
-    return m_serializedDetail;
 }
 
 EventInterface CustomEvent::eventInterface() const
index 228f026..9940fb2 100644 (file)
@@ -57,16 +57,14 @@ public:
     virtual EventInterface eventInterface() const override;
 
     const Deprecated::ScriptValue& detail() const { return m_detail; }
-    
-    RefPtr<SerializedScriptValue> trySerializeDetail(JSC::ExecState*);
+    PassRefPtr<SerializedScriptValue> serializedScriptValue() { return m_serializedScriptValue; }
 
 private:
     CustomEvent();
     CustomEvent(const AtomicString& type, const CustomEventInit& initializer);
 
     Deprecated::ScriptValue m_detail;
-    RefPtr<SerializedScriptValue> m_serializedDetail;
-    bool m_triedToSerialize { false };
+    RefPtr<SerializedScriptValue> m_serializedScriptValue;
 };
 
 } // namespace WebCore
index 12e0ec3..af704b3 100644 (file)
 [
     ConstructorTemplate=Event,
 ] interface CustomEvent : Event {
-    [InitializedByEventConstructor, CustomGetter] readonly attribute any detail;
+    [InitializedByEventConstructor] readonly attribute any detail;
 
-    void initCustomEvent([Default=Undefined] optional DOMString typeArg,
-                         [Default=Undefined] optional boolean canBubbleArg,
-                         [Default=Undefined] optional boolean cancelableArg,
+    void initCustomEvent([Default=Undefined] optional DOMString typeArg, 
+                         [Default=Undefined] optional boolean canBubbleArg, 
+                         [Default=Undefined] optional boolean cancelableArg, 
                          [Default=Undefined] optional any detailArg);
 };
 
index d3c34bf..11d2c52 100644 (file)
@@ -118,8 +118,6 @@ void MessageEvent::initMessageEvent(const AtomicString& type, bool canBubble, bo
 
     m_dataType = DataTypeScriptValue;
     m_dataAsScriptValue = data;
-    m_dataAsSerializedScriptValue = nullptr;
-    m_triedToSerialize = false;
     m_origin = origin;
     m_lastEventId = lastEventId;
     m_source = source;
@@ -140,18 +138,6 @@ void MessageEvent::initMessageEvent(const AtomicString& type, bool canBubble, bo
     m_source = source;
     m_ports = WTF::move(ports);
 }
-    
-RefPtr<SerializedScriptValue> MessageEvent::trySerializeData(JSC::ExecState* exec)
-{
-    ASSERT(!m_dataAsScriptValue.hasNoValue());
-    
-    if (!m_dataAsSerializedScriptValue && !m_triedToSerialize) {
-        m_dataAsSerializedScriptValue = SerializedScriptValue::create(exec, m_dataAsScriptValue.jsValue(), nullptr, nullptr, NonThrowing);
-        m_triedToSerialize = true;
-    }
-    
-    return m_dataAsSerializedScriptValue;
-}
 
 // FIXME: Remove this when we have custom ObjC binding support.
 SerializedScriptValue* MessageEvent::data() const
index 207a72e..9eb39dd 100644 (file)
@@ -114,8 +114,6 @@ public:
     Blob* dataAsBlob() const { ASSERT(m_dataType == DataTypeBlob); return m_dataAsBlob.get(); }
     ArrayBuffer* dataAsArrayBuffer() const { ASSERT(m_dataType == DataTypeArrayBuffer); return m_dataAsArrayBuffer.get(); }
 
-    RefPtr<SerializedScriptValue> trySerializeData(JSC::ExecState*);
-    
 private:
     MessageEvent();
     MessageEvent(const AtomicString&, const MessageEventInit&);
@@ -129,7 +127,6 @@ private:
     DataType m_dataType;
     Deprecated::ScriptValue m_dataAsScriptValue;
     RefPtr<SerializedScriptValue> m_dataAsSerializedScriptValue;
-    bool m_triedToSerialize { false };
     String m_dataAsString;
     RefPtr<Blob> m_dataAsBlob;
     RefPtr<ArrayBuffer> m_dataAsArrayBuffer;
index 5742a11..dffa43d 100644 (file)
@@ -29,6 +29,7 @@
 
 #include "EventNames.h"
 #include "History.h"
+#include "SerializedScriptValue.h"
 #include <runtime/JSCInlines.h>
 
 namespace WebCore {
@@ -78,18 +79,6 @@ Ref<PopStateEvent> PopStateEvent::create(const AtomicString& type, const PopStat
     return adoptRef(*new PopStateEvent(type, initializer));
 }
 
-RefPtr<SerializedScriptValue> PopStateEvent::trySerializeState(JSC::ExecState* exec)
-{
-    ASSERT(!m_state.hasNoValue());
-    
-    if (!m_serializedState && !m_triedToSerialize) {
-        m_serializedState = SerializedScriptValue::create(exec, m_state.jsValue(), nullptr, nullptr, NonThrowing);
-        m_triedToSerialize = true;
-    }
-    
-    return m_serializedState;
-}
-
 EventInterface PopStateEvent::eventInterface() const
 {
     return PopStateEventInterfaceType;
index c63b34a..a1e1940 100644 (file)
@@ -28,7 +28,6 @@
 #define PopStateEvent_h
 
 #include "Event.h"
-#include "SerializedScriptValue.h"
 #include <bindings/ScriptValue.h>
 
 namespace WebCore {
@@ -49,10 +48,7 @@ public:
     static Ref<PopStateEvent> create(PassRefPtr<SerializedScriptValue>, PassRefPtr<History>);
     static Ref<PopStateEvent> create(const AtomicString&, const PopStateEventInit&);
 
-    PassRefPtr<SerializedScriptValue> serializedState() const { ASSERT(m_serializedState); return m_serializedState; }
-    
-    RefPtr<SerializedScriptValue> trySerializeState(JSC::ExecState*);
-    
+    PassRefPtr<SerializedScriptValue> serializedState() const { return m_serializedState; }
     const Deprecated::ScriptValue& state() const { return m_state; }
     History* history() const { return m_history.get(); }
 
@@ -65,7 +61,6 @@ private:
 
     Deprecated::ScriptValue m_state;
     RefPtr<SerializedScriptValue> m_serializedState;
-    bool m_triedToSerialize { false };
     RefPtr<History> m_history;
 };
 
index 5839524..83a6792 100644 (file)
@@ -2357,16 +2357,6 @@ PassRefPtr<SerializedScriptValue> Internals::deserializeBuffer(PassRefPtr<ArrayB
     return SerializedScriptValue::adopt(bytes);
 }
 
-bool Internals::isFromCurrentWorld(Deprecated::ScriptValue value) const
-{
-    ASSERT(!value.hasNoValue());
-    
-    JSC::ExecState* exec = contextDocument()->vm().topCallFrame;
-    if (!value.isObject() || &worldForDOMObject(value.jsValue().getObject()) == &currentWorld(exec))
-        return true;
-    return false;
-}
-
 void Internals::setUsesOverlayScrollbars(bool enabled)
 {
     WebCore::Settings::setUsesOverlayScrollbars(enabled);
index 4a48fa3..87bf6a9 100644 (file)
@@ -324,8 +324,6 @@ public:
     PassRefPtr<ArrayBuffer> serializeObject(PassRefPtr<SerializedScriptValue>) const;
     PassRefPtr<SerializedScriptValue> deserializeBuffer(PassRefPtr<ArrayBuffer>) const;
 
-    bool isFromCurrentWorld(Deprecated::ScriptValue) const;
-
     void setUsesOverlayScrollbars(bool enabled);
 
     String getCurrentCursorInfo(ExceptionCode&);
index d07ebbf..60e637d 100644 (file)
@@ -311,8 +311,6 @@ enum ResourceLoadPriority {
     SerializedScriptValue deserializeBuffer(ArrayBuffer buffer);
     ArrayBuffer serializeObject(SerializedScriptValue obj);
 
-    boolean isFromCurrentWorld(any obj);
-
     void setUsesOverlayScrollbars(boolean enabled);
 
     void forceReload(boolean endToEnd);