Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (111948 => 111949)
--- trunk/Source/WebCore/CMakeLists.txt 2012-03-24 00:55:04 UTC (rev 111948)
+++ trunk/Source/WebCore/CMakeLists.txt 2012-03-24 00:55:59 UTC (rev 111949)
@@ -148,6 +148,7 @@
Modules/websockets/CloseEvent.idl
Modules/websockets/DOMWindowWebSocket.idl
+ Modules/websockets/WorkerContextWebSocket.idl
css/Counter.idl
css/CSSCharsetRule.idl
Modified: trunk/Source/WebCore/ChangeLog (111948 => 111949)
--- trunk/Source/WebCore/ChangeLog 2012-03-24 00:55:04 UTC (rev 111948)
+++ trunk/Source/WebCore/ChangeLog 2012-03-24 00:55:59 UTC (rev 111949)
@@ -1,3 +1,24 @@
+2012-03-23 Kentaro Hara <[email protected]>
+
+ Move WebSocket APIs from WorkerContext.idl to WorkerContextWebSocket.idl
+ https://bugs.webkit.org/show_bug.cgi?id=79663
+
+ Reviewed by Adam Barth.
+
+ For WebKit modularization, this patch moves WebSocket APIs from WorkerContext.idl
+ to WorkerContextWebSocket.idl.
+
+ Tests: http/tests/websocket/tests/hybi/workers/* (No change in test results)
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * DerivedSources.pri:
+ * GNUmakefile.list.am:
+ * Modules/websockets/WorkerContextWebSocket.idl: Added.
+ * WebCore.gypi:
+ * WebCore.xcodeproj/project.xcodeproj:
+ * workers/WorkerContext.idl:
+
2012-03-23 Parag Radke <[email protected]>
REGRESSION: can select text of an input button
Modified: trunk/Source/WebCore/DerivedSources.make (111948 => 111949)
--- trunk/Source/WebCore/DerivedSources.make 2012-03-24 00:55:04 UTC (rev 111948)
+++ trunk/Source/WebCore/DerivedSources.make 2012-03-24 00:55:59 UTC (rev 111949)
@@ -150,6 +150,7 @@
$(WebCore)/Modules/websockets/CloseEvent.idl \
$(WebCore)/Modules/websockets/DOMWindowWebSocket.idl \
$(WebCore)/Modules/websockets/WebSocket.idl \
+ $(WebCore)/Modules/websockets/WorkerContextWebSocket.idl \
$(WebCore)/css/CSSCharsetRule.idl \
$(WebCore)/css/CSSFontFaceRule.idl \
$(WebCore)/css/CSSImportRule.idl \
Modified: trunk/Source/WebCore/DerivedSources.pri (111948 => 111949)
--- trunk/Source/WebCore/DerivedSources.pri 2012-03-24 00:55:04 UTC (rev 111948)
+++ trunk/Source/WebCore/DerivedSources.pri 2012-03-24 00:55:59 UTC (rev 111949)
@@ -169,6 +169,7 @@
$$PWD/Modules/websockets/CloseEvent.idl \
$$PWD/Modules/websockets/DOMWindowWebSocket.idl \
$$PWD/Modules/websockets/WebSocket.idl \
+ $$PWD/Modules/websockets/WorkerContextWebSocket.idl \
$$PWD/css/Counter.idl \
$$PWD/css/CSSCharsetRule.idl \
$$PWD/css/CSSFontFaceRule.idl \
Modified: trunk/Source/WebCore/GNUmakefile.list.am (111948 => 111949)
--- trunk/Source/WebCore/GNUmakefile.list.am 2012-03-24 00:55:04 UTC (rev 111948)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2012-03-24 00:55:59 UTC (rev 111949)
@@ -5636,7 +5636,8 @@
dom_binding_idls += \
$(WebCore)/Modules/websockets/CloseEvent.idl \
$(WebCore)/Modules/websockets/DOMWindowWebSocket.idl \
- $(WebCore)/Modules/websockets/WebSocket.idl
+ $(WebCore)/Modules/websockets/WebSocket.idl \
+ $(WebCore)/Modules/websockets/WorkerContextWebSocket.idl
endif # END ENABLE_WEB_SOCKETS
# ---
Added: trunk/Source/WebCore/Modules/websockets/WorkerContextWebSocket.idl (0 => 111949)
--- trunk/Source/WebCore/Modules/websockets/WorkerContextWebSocket.idl (rev 0)
+++ trunk/Source/WebCore/Modules/websockets/WorkerContextWebSocket.idl 2012-03-24 00:55:59 UTC (rev 111949)
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2008 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 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 [
+ Conditional=WEB_SOCKETS,
+ Supplemental=WorkerContext
+ ] WorkerContextWebSocket {
+ attribute [JSCustomGetter,V8EnabledAtRuntime] WebSocketConstructor WebSocket; // Usable with the new operator
+ };
+
+}
Modified: trunk/Source/WebCore/WebCore.gypi (111948 => 111949)
--- trunk/Source/WebCore/WebCore.gypi 2012-03-24 00:55:04 UTC (rev 111948)
+++ trunk/Source/WebCore/WebCore.gypi 2012-03-24 00:55:59 UTC (rev 111949)
@@ -860,6 +860,7 @@
'Modules/websockets/CloseEvent.idl',
'Modules/websockets/DOMWindowWebSocket.idl',
'Modules/websockets/WebSocket.idl',
+ 'Modules/websockets/WorkerContextWebSocket.idl',
'css/CSSCharsetRule.idl',
'css/CSSFontFaceRule.idl',
'css/CSSImportRule.idl',
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (111948 => 111949)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-03-24 00:55:04 UTC (rev 111948)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-03-24 00:55:59 UTC (rev 111949)
@@ -10993,6 +10993,7 @@
A8748BDF12CBF2DC001FBA41 /* HashTools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HashTools.h; sourceTree = "<group>"; };
A883DF250F3D045D00F19BF6 /* VisibleSelection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VisibleSelection.cpp; sourceTree = "<group>"; };
A883DF260F3D045D00F19BF6 /* VisibleSelection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VisibleSelection.h; sourceTree = "<group>"; };
+ A886CDC214FBBAA300D279F4 /* WorkerContextWebSocket.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WorkerContextWebSocket.idl; path = Modules/websockets/WorkerContextWebSocket.idl; sourceTree = "<group>"; };
A88DD4860B4629A300C02990 /* PathTraversalState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PathTraversalState.h; sourceTree = "<group>"; };
A88DD4880B4629B000C02990 /* PathTraversalState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PathTraversalState.cpp; sourceTree = "<group>"; };
A89943260B42338700D7C802 /* BitmapImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BitmapImage.h; sourceTree = "<group>"; };
@@ -17381,6 +17382,7 @@
97AABD0E14FA09D5007457AE /* WebSocketHandshakeRequest.h */,
97AABD0F14FA09D5007457AE /* WebSocketHandshakeResponse.cpp */,
97AABD1014FA09D5007457AE /* WebSocketHandshakeResponse.h */,
+ A886CDC214FBBAA300D279F4 /* WorkerContextWebSocket.idl */,
97AABD1114FA09D5007457AE /* WorkerThreadableWebSocketChannel.cpp */,
97AABD1214FA09D5007457AE /* WorkerThreadableWebSocketChannel.h */,
);
Modified: trunk/Source/WebCore/workers/WorkerContext.idl (111948 => 111949)
--- trunk/Source/WebCore/workers/WorkerContext.idl 2012-03-24 00:55:04 UTC (rev 111948)
+++ trunk/Source/WebCore/workers/WorkerContext.idl 2012-03-24 00:55:59 UTC (rev 111949)
@@ -85,10 +85,7 @@
#endif
attribute [JSCustomGetter] EventSourceConstructor EventSource;
attribute [JSCustomGetter] XMLHttpRequestConstructor XMLHttpRequest;
-#if defined(ENABLE_WEB_SOCKETS) && ENABLE_WEB_SOCKETS
- attribute [JSCustomGetter,V8EnabledAtRuntime] WebSocketConstructor WebSocket; // Usable with the new operator
#endif
-#endif
#if defined(ENABLE_BLOB) && ENABLE_BLOB
attribute WebKitBlobBuilderConstructor WebKitBlobBuilder;
