Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (151222 => 151223)
--- trunk/Source/WebCore/CMakeLists.txt 2013-06-05 14:02:12 UTC (rev 151222)
+++ trunk/Source/WebCore/CMakeLists.txt 2013-06-05 14:16:45 UTC (rev 151223)
@@ -290,7 +290,6 @@
Modules/websockets/CloseEvent.idl
Modules/websockets/WebSocket.idl
- Modules/websockets/WorkerContextWebSocket.idl
css/Counter.idl
css/CSSCharsetRule.idl
Modified: trunk/Source/WebCore/ChangeLog (151222 => 151223)
--- trunk/Source/WebCore/ChangeLog 2013-06-05 14:02:12 UTC (rev 151222)
+++ trunk/Source/WebCore/ChangeLog 2013-06-05 14:16:45 UTC (rev 151223)
@@ -1,3 +1,30 @@
+2013-06-05 Christophe Dumez <ch.du...@sisa.samsung.com>
+
+ Remove remaining custom getters for WorkerContext constructor attributes
+ https://bugs.webkit.org/show_bug.cgi?id=117247
+
+ Reviewed by Kentaro Hara.
+
+ Remove custom getter code for remaining constructor attribute on WorkerContext
+ interface. The custom code wasn't needed as it was doing nothing more than the
+ generated one. These constructor attributes are now automatically generated.
+
+ No new tests, no behavior change.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * DerivedSources.pri:
+ * GNUmakefile.list.am:
+ * Modules/websockets/WebSocket.idl:
+ * Modules/websockets/WorkerContextWebSocket.idl: Removed.
+ * WebCore.order:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/JSWorkerContextCustom.cpp:
+ * dom/MessageChannel.idl:
+ * page/EventSource.idl:
+ * workers/WorkerContext.idl:
+ * xml/XMLHttpRequest.idl:
+
2013-06-05 Ryuan Choi <ryuan.c...@samsung.com>
Remove ChromeClient::deviceOrPageScaleFactorChanged
Modified: trunk/Source/WebCore/DerivedSources.make (151222 => 151223)
--- trunk/Source/WebCore/DerivedSources.make 2013-06-05 14:02:12 UTC (rev 151222)
+++ trunk/Source/WebCore/DerivedSources.make 2013-06-05 14:16:45 UTC (rev 151223)
@@ -175,7 +175,6 @@
$(WebCore)/Modules/webdatabase/WorkerContextWebDatabase.idl \
$(WebCore)/Modules/websockets/CloseEvent.idl \
$(WebCore)/Modules/websockets/WebSocket.idl \
- $(WebCore)/Modules/websockets/WorkerContextWebSocket.idl \
$(WebCore)/css/CSSCharsetRule.idl \
$(WebCore)/css/CSSFontFaceLoadEvent.idl \
$(WebCore)/css/CSSFontFaceRule.idl \
Modified: trunk/Source/WebCore/DerivedSources.pri (151222 => 151223)
--- trunk/Source/WebCore/DerivedSources.pri 2013-06-05 14:02:12 UTC (rev 151222)
+++ trunk/Source/WebCore/DerivedSources.pri 2013-06-05 14:16:45 UTC (rev 151223)
@@ -188,7 +188,6 @@
$$PWD/Modules/webdatabase/WorkerContextWebDatabase.idl \
$$PWD/Modules/websockets/CloseEvent.idl \
$$PWD/Modules/websockets/WebSocket.idl \
- $$PWD/Modules/websockets/WorkerContextWebSocket.idl \
$$PWD/css/Counter.idl \
$$PWD/css/CSSCharsetRule.idl \
$$PWD/css/CSSFontFaceLoadEvent.idl \
Modified: trunk/Source/WebCore/GNUmakefile.list.am (151222 => 151223)
--- trunk/Source/WebCore/GNUmakefile.list.am 2013-06-05 14:02:12 UTC (rev 151222)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2013-06-05 14:16:45 UTC (rev 151223)
@@ -1348,7 +1348,6 @@
$(WebCore)/Modules/webdatabase/WorkerContextWebDatabase.idl \
$(WebCore)/Modules/websockets/CloseEvent.idl \
$(WebCore)/Modules/websockets/WebSocket.idl \
- $(WebCore)/Modules/websockets/WorkerContextWebSocket.idl \
$(WebCore)/css/CSSCharsetRule.idl \
$(WebCore)/css/CSSFontFaceLoadEvent.idl \
$(WebCore)/css/CSSFontFaceRule.idl \
Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.idl (151222 => 151223)
--- trunk/Source/WebCore/Modules/websockets/WebSocket.idl 2013-06-05 14:02:12 UTC (rev 151222)
+++ trunk/Source/WebCore/Modules/websockets/WebSocket.idl 2013-06-05 14:16:45 UTC (rev 151223)
@@ -30,6 +30,7 @@
*/
[
+ GlobalContext=WindowAndWorker,
EnabledAtRuntime,
Conditional=WEB_SOCKETS,
ActiveDOMObject,
Deleted: trunk/Source/WebCore/Modules/websockets/WorkerContextWebSocket.idl (151222 => 151223)
--- trunk/Source/WebCore/Modules/websockets/WorkerContextWebSocket.idl 2013-06-05 14:02:12 UTC (rev 151222)
+++ trunk/Source/WebCore/Modules/websockets/WorkerContextWebSocket.idl 2013-06-05 14:16:45 UTC (rev 151223)
@@ -1,32 +0,0 @@
-/*
- * 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.
- *
- */
-
-[
- Conditional=WEB_SOCKETS,
-] partial interface WorkerContext {
- [CustomGetter] attribute WebSocketConstructor WebSocket; // Usable with the new operator
-};
-
Modified: trunk/Source/WebCore/WebCore.order (151222 => 151223)
--- trunk/Source/WebCore/WebCore.order 2013-06-05 14:02:12 UTC (rev 151222)
+++ trunk/Source/WebCore/WebCore.order 2013-06-05 14:16:45 UTC (rev 151223)
@@ -31519,7 +31519,6 @@
__ZN7WebCore44jsWebSocketPrototypeFunctionAddEventListenerEPN3JSC9ExecStateE
__ZN7WebCore41jsWebSocketPrototypeFunctionDispatchEventEPN3JSC9ExecStateE
__ZN7WebCore47jsWebSocketPrototypeFunctionRemoveEventListenerEPN3JSC9ExecStateE
-__ZN7WebCore35jsWorkerContextWebSocketConstructorEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
__ZNK7WebCore15JSWorkerContext9webSocketEPN3JSC9ExecStateE
__ZN7WebCore32WorkerThreadableWebSocketChannelC1EPNS_13WorkerContextEPNS_22WebSocketChannelClientERKN3WTF6StringERKNS_4KURLES8_
__ZN7WebCore32WorkerThreadableWebSocketChannelC2EPNS_13WorkerContextEPNS_22WebSocketChannelClientERKN3WTF6StringERKNS_4KURLES8_
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (151222 => 151223)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-06-05 14:02:12 UTC (rev 151222)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-06-05 14:16:45 UTC (rev 151223)
@@ -10163,7 +10163,6 @@
A882DA221593848D000115ED /* CSSToStyleMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSToStyleMap.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>"; };
A895709E16E9BD5900184E55 /* HTMLIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLIdentifier.h; path = parser/HTMLIdentifier.h; sourceTree = "<group>"; };
@@ -16319,7 +16318,6 @@
97AABD0A14FA09D5007457AE /* WebSocketFrame.h */,
97AABD0B14FA09D5007457AE /* WebSocketHandshake.cpp */,
97AABD0C14FA09D5007457AE /* WebSocketHandshake.h */,
- A886CDC214FBBAA300D279F4 /* WorkerContextWebSocket.idl */,
97AABD1114FA09D5007457AE /* WorkerThreadableWebSocketChannel.cpp */,
97AABD1214FA09D5007457AE /* WorkerThreadableWebSocketChannel.h */,
);
Modified: trunk/Source/WebCore/bindings/js/JSWorkerContextCustom.cpp (151222 => 151223)
--- trunk/Source/WebCore/bindings/js/JSWorkerContextCustom.cpp 2013-06-05 14:02:12 UTC (rev 151222)
+++ trunk/Source/WebCore/bindings/js/JSWorkerContextCustom.cpp 2013-06-05 14:16:45 UTC (rev 151223)
@@ -85,23 +85,6 @@
return false;
}
-JSValue JSWorkerContext::eventSource(ExecState* exec) const
-{
- return getDOMConstructor<JSEventSourceConstructor>(exec, this);
-}
-
-JSValue JSWorkerContext::xmlHttpRequest(ExecState* exec) const
-{
- return getDOMConstructor<JSXMLHttpRequestConstructor>(exec, this);
-}
-
-#if ENABLE(WEB_SOCKETS)
-JSValue JSWorkerContext::webSocket(ExecState* exec) const
-{
- return getDOMConstructor<JSWebSocketConstructor>(exec, this);
-}
-#endif
-
JSValue JSWorkerContext::importScripts(ExecState* exec)
{
if (!exec->argumentCount())
@@ -142,14 +125,6 @@
return jsNumber(impl()->setInterval(action.release(), delay));
}
-
-#if ENABLE(CHANNEL_MESSAGING)
-JSValue JSWorkerContext::messageChannel(ExecState* exec) const
-{
- return getDOMConstructor<JSMessageChannelConstructor>(exec, this);
-}
-#endif
-
} // namespace WebCore
#endif // ENABLE(WORKERS)
Modified: trunk/Source/WebCore/dom/MessageChannel.idl (151222 => 151223)
--- trunk/Source/WebCore/dom/MessageChannel.idl 2013-06-05 14:02:12 UTC (rev 151222)
+++ trunk/Source/WebCore/dom/MessageChannel.idl 2013-06-05 14:16:45 UTC (rev 151223)
@@ -25,6 +25,8 @@
*/
[
+ GlobalContext=WindowAndWorker,
+ Conditional=CHANNEL_MESSAGING,
Constructor,
CallWith=ScriptExecutionContext,
JSCustomMarkFunction,
Modified: trunk/Source/WebCore/page/EventSource.idl (151222 => 151223)
--- trunk/Source/WebCore/page/EventSource.idl 2013-06-05 14:02:12 UTC (rev 151222)
+++ trunk/Source/WebCore/page/EventSource.idl 2013-06-05 14:16:45 UTC (rev 151223)
@@ -30,6 +30,7 @@
*/
[
+ GlobalContext=WindowAndWorker,
ActiveDOMObject,
Constructor(DOMString url, optional Dictionary eventSourceInit),
CallWith=ScriptExecutionContext,
Modified: trunk/Source/WebCore/workers/WorkerContext.idl (151222 => 151223)
--- trunk/Source/WebCore/workers/WorkerContext.idl 2013-06-05 14:02:12 UTC (rev 151222)
+++ trunk/Source/WebCore/workers/WorkerContext.idl 2013-06-05 14:16:45 UTC (rev 151223)
@@ -65,13 +65,7 @@
boolean dispatchEvent(Event evt)
raises(EventException);
-#if !defined(LANGUAGE_CPP) || !LANGUAGE_CPP
- // Constructors
- [Conditional=CHANNEL_MESSAGING, CustomGetter] attribute MessageChannelConstructor MessageChannel;
- [CustomGetter] attribute EventSourceConstructor EventSource;
- [CustomGetter] attribute XMLHttpRequestConstructor XMLHttpRequest;
-#endif
-
+ // Additional constructors
[Conditional=BLOB] attribute DOMURLConstructor webkitURL; // FIXME: deprecate this.
};
Modified: trunk/Source/WebCore/xml/XMLHttpRequest.idl (151222 => 151223)
--- trunk/Source/WebCore/xml/XMLHttpRequest.idl 2013-06-05 14:02:12 UTC (rev 151222)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.idl 2013-06-05 14:16:45 UTC (rev 151223)
@@ -37,6 +37,7 @@
};
[
+ GlobalContext=WindowAndWorker,
ActiveDOMObject,
Constructor,
CallWith=ScriptExecutionContext,
