Revert Worker-related APIs from DOMWindowWorker.idl back to DOMWindow.idl
authorharaken@chromium.org <haraken@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 3 Mar 2012 00:50:55 +0000 (00:50 +0000)
committerharaken@chromium.org <haraken@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 3 Mar 2012 00:50:55 +0000 (00:50 +0000)
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.

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

Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/DerivedSources.make
Source/WebCore/DerivedSources.pri
Source/WebCore/GNUmakefile.list.am
Source/WebCore/WebCore.gypi
Source/WebCore/page/DOMWindow.idl
Source/WebCore/workers/DOMWindowWorker.idl [deleted file]

index 55a19a3..1827a19 100644 (file)
@@ -2136,12 +2136,6 @@ IF (ENABLE_SHARED_WORKERS)
     )
 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
index aa91ddd..01dcc4a 100644 (file)
@@ -1,5 +1,26 @@
 2012-03-02  Kentaro Hara  <haraken@chromium.org>
 
+        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  <haraken@chromium.org>
+
         Revert HTML-related APIs from DOMWindowHTML.idl back to DOMWindow.idl
         https://bugs.webkit.org/show_bug.cgi?id=80140
 
index 1ed4eba..96bea7f 100644 (file)
@@ -569,7 +569,6 @@ BINDING_IDLS = \
     $(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 \
index 34c37fa..70488d8 100644 (file)
@@ -432,7 +432,6 @@ IDL_BINDINGS += \
     $$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 \
index 6dcf36d..7f9adc8 100644 (file)
@@ -934,7 +934,6 @@ dom_binding_idls += \
        $(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 \
index 20d8c39..64d04ec 100644 (file)
             'webaudio/RealtimeAnalyserNode.idl',
             'webaudio/WaveShaperNode.idl',
             'workers/AbstractWorker.idl',
-            'workers/DOMWindowWorker.idl',
             'workers/DedicatedWorkerContext.idl',
             'workers/SharedWorker.idl',
             'workers/SharedWorkerContext.idl',
index 21eae17..0c470f0 100644 (file)
@@ -547,6 +547,9 @@ module window {
 
         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;
diff --git a/Source/WebCore/workers/DOMWindowWorker.idl b/Source/WebCore/workers/DOMWindowWorker.idl
deleted file mode 100644 (file)
index 44f32f4..0000000
+++ /dev/null
@@ -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
-    };
-
-}