Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (109633 => 109634)
--- trunk/Source/WebCore/CMakeLists.txt 2012-03-03 00:39:06 UTC (rev 109633)
+++ trunk/Source/WebCore/CMakeLists.txt 2012-03-03 00:50:55 UTC (rev 109634)
@@ -2136,12 +2136,6 @@
)
ENDIF ()
-IF (ENABLE_WORKERS OR ENABLE_SHARED_WORKERS)
- LIST(APPEND WebCore_IDL_FILES
- workers/DOMWindowWorker.idl
- )
-ENDIF ()
-
IF (ENABLE_VIDEO_TRACK)
LIST(APPEND WebCore_SOURCES
html/HTMLTrackElement.cpp
Modified: trunk/Source/WebCore/ChangeLog (109633 => 109634)
--- trunk/Source/WebCore/ChangeLog 2012-03-03 00:39:06 UTC (rev 109633)
+++ trunk/Source/WebCore/ChangeLog 2012-03-03 00:50:55 UTC (rev 109634)
@@ -1,5 +1,26 @@
2012-03-02 Kentaro Hara <[email protected]>
+ Revert Worker-related APIs from DOMWindowWorker.idl back to DOMWindow.idl
+ https://bugs.webkit.org/show_bug.cgi?id=80151
+
+ Reviewed by Adam Barth.
+
+ Based on the discussion on webkit-dev@
+ (http://markmail.org/message/kagvswmah67zmrry#query:+page:1+mid:h34vzbiu5suub3ld+state:results),
+ this patch reverts Worker-related APIs from DOMWindowWorker.idl back to DOMWindow.idl.
+
+ No tests. No change in behavior.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * DerivedSources.pri:
+ * GNUmakefile.list.am:
+ * WebCore.gypi:
+ * page/DOMWindow.idl:
+ * workers/DOMWindowWorker.idl: Removed.
+
+2012-03-02 Kentaro Hara <[email protected]>
+
Revert HTML-related APIs from DOMWindowHTML.idl back to DOMWindow.idl
https://bugs.webkit.org/show_bug.cgi?id=80140
Modified: trunk/Source/WebCore/DerivedSources.make (109633 => 109634)
--- trunk/Source/WebCore/DerivedSources.make 2012-03-03 00:39:06 UTC (rev 109633)
+++ trunk/Source/WebCore/DerivedSources.make 2012-03-03 00:50:55 UTC (rev 109634)
@@ -569,7 +569,6 @@
$(WebCore)/webaudio/RealtimeAnalyserNode.idl \
$(WebCore)/webaudio/WaveShaperNode.idl \
$(WebCore)/workers/AbstractWorker.idl \
- $(WebCore)/workers/DOMWindowWorker.idl \
$(WebCore)/workers/DedicatedWorkerContext.idl \
$(WebCore)/workers/SharedWorker.idl \
$(WebCore)/workers/SharedWorkerContext.idl \
Modified: trunk/Source/WebCore/DerivedSources.pri (109633 => 109634)
--- trunk/Source/WebCore/DerivedSources.pri 2012-03-03 00:39:06 UTC (rev 109633)
+++ trunk/Source/WebCore/DerivedSources.pri 2012-03-03 00:50:55 UTC (rev 109634)
@@ -432,7 +432,6 @@
$$PWD/webaudio/LowPass2FilterNode.idl \
$$PWD/webaudio/RealtimeAnalyserNode.idl \
$$PWD/workers/AbstractWorker.idl \
- $$PWD/workers/DOMWindowWorker.idl \
$$PWD/workers/DedicatedWorkerContext.idl \
$$PWD/workers/SharedWorker.idl \
$$PWD/workers/SharedWorkerContext.idl \
Modified: trunk/Source/WebCore/GNUmakefile.list.am (109633 => 109634)
--- trunk/Source/WebCore/GNUmakefile.list.am 2012-03-03 00:39:06 UTC (rev 109633)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2012-03-03 00:50:55 UTC (rev 109634)
@@ -934,7 +934,6 @@
$(WebCore)/webaudio/DOMWindowWebAudio.idl \
$(WebCore)/webaudio/WaveShaperNode.idl \
$(WebCore)/workers/AbstractWorker.idl \
- $(WebCore)/workers/DOMWindowWorker.idl \
$(WebCore)/workers/DedicatedWorkerContext.idl \
$(WebCore)/workers/SharedWorker.idl \
$(WebCore)/workers/SharedWorkerContext.idl \
Modified: trunk/Source/WebCore/WebCore.gypi (109633 => 109634)
--- trunk/Source/WebCore/WebCore.gypi 2012-03-03 00:39:06 UTC (rev 109633)
+++ trunk/Source/WebCore/WebCore.gypi 2012-03-03 00:50:55 UTC (rev 109634)
@@ -1107,7 +1107,6 @@
'webaudio/RealtimeAnalyserNode.idl',
'webaudio/WaveShaperNode.idl',
'workers/AbstractWorker.idl',
- 'workers/DOMWindowWorker.idl',
'workers/DedicatedWorkerContext.idl',
'workers/SharedWorker.idl',
'workers/SharedWorkerContext.idl',
Modified: trunk/Source/WebCore/page/DOMWindow.idl (109633 => 109634)
--- trunk/Source/WebCore/page/DOMWindow.idl 2012-03-03 00:39:06 UTC (rev 109633)
+++ trunk/Source/WebCore/page/DOMWindow.idl 2012-03-03 00:50:55 UTC (rev 109634)
@@ -547,6 +547,9 @@
attribute ClipboardConstructor Clipboard;
+ attribute [Conditional=WORKERS] WorkerConstructor Worker; // Usable with the new operator
+ attribute [Conditional=SHARED_WORKERS, JSCustomGetter, V8EnabledAtRuntime] SharedWorkerConstructor SharedWorker; // Usable with the new operator
+
attribute FileConstructor File;
attribute FileListConstructor FileList;
attribute BlobConstructor Blob;
Deleted: trunk/Source/WebCore/workers/DOMWindowWorker.idl (109633 => 109634)
--- trunk/Source/WebCore/workers/DOMWindowWorker.idl 2012-03-03 00:39:06 UTC (rev 109633)
+++ trunk/Source/WebCore/workers/DOMWindowWorker.idl 2012-03-03 00:50:55 UTC (rev 109634)
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
- * Copyright (C) 2011 Google 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 COMPUTER, 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 COMPUTER, 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.
- */
-
-module window {
-
- interface [
- Supplemental=DOMWindow
- ] DOMWindowWorker {
- attribute [Conditional=WORKERS] WorkerConstructor Worker; // Usable with the new operator
- attribute [Conditional=SHARED_WORKERS, JSCustomGetter, V8EnabledAtRuntime] SharedWorkerConstructor SharedWorker; // Usable with the new operator
- };
-
-}
