Diff
Modified: trunk/Source/WebCore/ChangeLog (102570 => 102571)
--- trunk/Source/WebCore/ChangeLog 2011-12-12 13:23:54 UTC (rev 102570)
+++ trunk/Source/WebCore/ChangeLog 2011-12-12 13:39:05 UTC (rev 102571)
@@ -1,3 +1,15 @@
+2011-12-12 Kentaro Hara <[email protected]>
+
+ Unreviewed, rolling out r102558.
+ http://trac.webkit.org/changeset/102558
+ https://bugs.webkit.org/show_bug.cgi?id=74160
+
+ clobber build failure
+
+ * WebCore.gypi:
+ * page/DOMWindow.idl:
+ * websockets/DOMWindowWebSocket.idl: Removed.
+
2011-11-25 Alexander Pavlov <[email protected]>
WebKit does not enumerate over CSS properties in HTMLElement.style
Modified: trunk/Source/WebCore/WebCore.gypi (102570 => 102571)
--- trunk/Source/WebCore/WebCore.gypi 2011-12-12 13:23:54 UTC (rev 102570)
+++ trunk/Source/WebCore/WebCore.gypi 2011-12-12 13:39:05 UTC (rev 102571)
@@ -1506,7 +1506,6 @@
'webaudio/RealtimeAnalyserNode.idl',
'webaudio/WaveShaperNode.idl',
'websockets/CloseEvent.idl',
- 'websockets/DOMWindowWebSocket.idl',
'websockets/WebSocket.idl',
'workers/AbstractWorker.idl',
'workers/DedicatedWorkerContext.idl',
Modified: trunk/Source/WebCore/page/DOMWindow.idl (102570 => 102571)
--- trunk/Source/WebCore/page/DOMWindow.idl 2011-12-12 13:23:54 UTC (rev 102570)
+++ trunk/Source/WebCore/page/DOMWindow.idl 2011-12-12 13:39:05 UTC (rev 102571)
@@ -550,7 +550,7 @@
attribute [Conditional=DEVICE_ORIENTATION, EnabledAtRuntime] DeviceMotionEventConstructor DeviceMotionEvent;
attribute [Conditional=DEVICE_ORIENTATION, EnabledAtRuntime] DeviceOrientationEventConstructor DeviceOrientationEvent;
attribute [Conditional=TOUCH_EVENTS] TouchEventConstructor TouchEvent;
- attribute [Supplemented, Conditional=WEB_SOCKETS] CloseEventConstructor CloseEvent;
+ attribute [Conditional=WEB_SOCKETS] CloseEventConstructor CloseEvent;
attribute StorageEventConstructor StorageEvent;
attribute [Supplemented, Conditional=WEB_AUDIO] AudioProcessingEventConstructor AudioProcessingEvent;
attribute [Supplemented, Conditional=WEB_AUDIO] OfflineAudioCompletionEventConstructor OfflineAudioCompletionEvent;
@@ -606,7 +606,7 @@
#endif
#if defined(ENABLE_WEB_SOCKETS) && ENABLE_WEB_SOCKETS
- attribute [Supplemented, JSCCustomGetter, EnabledAtRuntime] WebSocketConstructor WebSocket; // Usable with the new operator
+ attribute [JSCCustomGetter,EnabledAtRuntime] WebSocketConstructor WebSocket; // Usable with the new operator
#endif
#if defined(ENABLE_VIDEO_TRACK) && ENABLE_VIDEO_TRACK
Deleted: trunk/Source/WebCore/websockets/DOMWindowWebSocket.idl (102570 => 102571)
--- trunk/Source/WebCore/websockets/DOMWindowWebSocket.idl 2011-12-12 13:23:54 UTC (rev 102570)
+++ trunk/Source/WebCore/websockets/DOMWindowWebSocket.idl 2011-12-12 13:39:05 UTC (rev 102571)
@@ -1,41 +0,0 @@
-/*
- * 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "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 THE COPYRIGHT
- * OWNER 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=DOMWindow
- ] DOMWindowWebSocket {
- attribute CloseEventConstructor CloseEvent;
- attribute [JSCCustomGetter, EnabledAtRuntime] WebSocketConstructor WebSocket; // Usable with the new operator
- };
-
-}
