From: haraken@chromium.org Date: Fri, 24 Feb 2012 13:33:20 +0000 (+0000) Subject: Move Worker-related APIs from DOMWindow.idl to DOMWindowWorker.idl X-Git-Tag: 070512121124~11902 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=49aa0f73f0561df47a4dbbcc28f6f0b6ef300594;p=profile%2Fivi%2Fwebkit-efl.git Move Worker-related APIs from DOMWindow.idl to DOMWindowWorker.idl https://bugs.webkit.org/show_bug.cgi?id=79442 Reviewed by Adam Barth. For WebKit modularization, this patch moves Worker-related APIs from DOMWindow.idl to DOMWindowWorker.idl. No tests. No change in behavior. * workers/DOMWindowWorker.idl: Added. * page/DOMWindow.idl: * CMakeLists.txt: * DerivedSources.make: * DerivedSources.pri: * GNUmakefile.list.am: * WebCore.gypi: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108778 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt index cd1677f..e49f070 100644 --- a/Source/WebCore/CMakeLists.txt +++ b/Source/WebCore/CMakeLists.txt @@ -2121,6 +2121,12 @@ 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 diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index fb495bb..fa50305 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,24 @@ +2012-02-24 Kentaro Hara + + Move Worker-related APIs from DOMWindow.idl to DOMWindowWorker.idl + https://bugs.webkit.org/show_bug.cgi?id=79442 + + Reviewed by Adam Barth. + + For WebKit modularization, this patch moves Worker-related APIs + from DOMWindow.idl to DOMWindowWorker.idl. + + No tests. No change in behavior. + + * workers/DOMWindowWorker.idl: Added. + * page/DOMWindow.idl: + + * CMakeLists.txt: + * DerivedSources.make: + * DerivedSources.pri: + * GNUmakefile.list.am: + * WebCore.gypi: + 2012-02-24 Robin Cao [BlackBerry] Upstream helper classes for skia diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make index 1de4c74..4caa5f7 100644 --- a/Source/WebCore/DerivedSources.make +++ b/Source/WebCore/DerivedSources.make @@ -565,6 +565,7 @@ BINDING_IDLS = \ $(WebCore)/websockets/DOMWindowWebSocket.idl \ $(WebCore)/websockets/WebSocket.idl \ $(WebCore)/workers/AbstractWorker.idl \ + $(WebCore)/workers/DOMWindowWorker.idl \ $(WebCore)/workers/DedicatedWorkerContext.idl \ $(WebCore)/workers/SharedWorker.idl \ $(WebCore)/workers/SharedWorkerContext.idl \ diff --git a/Source/WebCore/DerivedSources.pri b/Source/WebCore/DerivedSources.pri index b396430..09b7d34 100644 --- a/Source/WebCore/DerivedSources.pri +++ b/Source/WebCore/DerivedSources.pri @@ -430,6 +430,7 @@ IDL_BINDINGS += \ $$PWD/websockets/DOMWindowWebSocket.idl \ $$PWD/websockets/WebSocket.idl \ $$PWD/workers/AbstractWorker.idl \ + $$PWD/workers/DOMWindowWorker.idl \ $$PWD/workers/DedicatedWorkerContext.idl \ $$PWD/workers/SharedWorker.idl \ $$PWD/workers/SharedWorkerContext.idl \ diff --git a/Source/WebCore/GNUmakefile.list.am b/Source/WebCore/GNUmakefile.list.am index 08ae7f2..9f729a2 100644 --- a/Source/WebCore/GNUmakefile.list.am +++ b/Source/WebCore/GNUmakefile.list.am @@ -935,6 +935,7 @@ 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 \ diff --git a/Source/WebCore/WebCore.gypi b/Source/WebCore/WebCore.gypi index d57862a..e8b5b2d 100644 --- a/Source/WebCore/WebCore.gypi +++ b/Source/WebCore/WebCore.gypi @@ -1103,6 +1103,7 @@ 'websockets/DOMWindowWebSocket.idl', 'websockets/WebSocket.idl', 'workers/AbstractWorker.idl', + 'workers/DOMWindowWorker.idl', 'workers/DedicatedWorkerContext.idl', 'workers/SharedWorker.idl', 'workers/SharedWorkerContext.idl', diff --git a/Source/WebCore/page/DOMWindow.idl b/Source/WebCore/page/DOMWindow.idl index 9066a6d..1fc5d4a 100644 --- a/Source/WebCore/page/DOMWindow.idl +++ b/Source/WebCore/page/DOMWindow.idl @@ -485,14 +485,6 @@ module window { attribute MessageChannelConstructor MessageChannel; // Usable with the new operator #endif -#if defined(ENABLE_WORKERS) && ENABLE_WORKERS - attribute WorkerConstructor Worker; // Usable with the new operator -#endif - -#if defined(ENABLE_SHARED_WORKERS) && ENABLE_SHARED_WORKERS - attribute [JSCustomGetter, V8EnabledAtRuntime] SharedWorkerConstructor SharedWorker; // Usable with the new operator -#endif - #if defined(ENABLE_VIDEO_TRACK) && ENABLE_VIDEO_TRACK attribute [V8EnabledAtRuntime=webkitVideoTrack] HTMLTrackElementConstructor HTMLTrackElement; attribute [V8EnabledAtRuntime=webkitVideoTrack] TextTrackConstructor TextTrack; diff --git a/Source/WebCore/workers/DOMWindowWorker.idl b/Source/WebCore/workers/DOMWindowWorker.idl new file mode 100644 index 0000000..80bb93a --- /dev/null +++ b/Source/WebCore/workers/DOMWindowWorker.idl @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2012 Google Inc. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +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 + }; + +}