Diff
Modified: trunk/Source/WebCore/ChangeLog (109690 => 109691)
--- trunk/Source/WebCore/ChangeLog 2012-03-05 02:01:45 UTC (rev 109690)
+++ trunk/Source/WebCore/ChangeLog 2012-03-05 02:24:20 UTC (rev 109691)
@@ -1,3 +1,24 @@
+2012-03-04 Kentaro Hara <[email protected]>
+
+ Revert WebGL-related APIs from DOMWindowWebGL.idl back to DOMWindow.idl
+ https://bugs.webkit.org/show_bug.cgi?id=80144
+
+ 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 WebGL-related APIs from DOMWindowWebGL.idl back to DOMWindow.idl.
+
+ No tests. No change in behavior.
+
+ * DerivedSources.make:
+ * DerivedSources.pri:
+ * GNUmakefile.list.am:
+ * WebCore.gypi:
+ * WebCore.xcodeproj/project.pbxproj:
+ * html/canvas/DOMWindowWebGL.idl: Removed.
+ * page/DOMWindow.idl:
+
2012-03-04 MORITA Hajime <[email protected]>
Unreviewed build fix.
Modified: trunk/Source/WebCore/DerivedSources.make (109690 => 109691)
--- trunk/Source/WebCore/DerivedSources.make 2012-03-05 02:01:45 UTC (rev 109690)
+++ trunk/Source/WebCore/DerivedSources.make 2012-03-05 02:24:20 UTC (rev 109691)
@@ -296,7 +296,6 @@
$(WebCore)/html/canvas/CanvasPattern.idl \
$(WebCore)/html/canvas/CanvasRenderingContext.idl \
$(WebCore)/html/canvas/CanvasRenderingContext2D.idl \
- $(WebCore)/html/canvas/DOMWindowWebGL.idl \
$(WebCore)/html/canvas/DataView.idl \
$(WebCore)/html/canvas/Float32Array.idl \
$(WebCore)/html/canvas/Float64Array.idl \
Modified: trunk/Source/WebCore/DerivedSources.pri (109690 => 109691)
--- trunk/Source/WebCore/DerivedSources.pri 2012-03-05 02:01:45 UTC (rev 109690)
+++ trunk/Source/WebCore/DerivedSources.pri 2012-03-05 02:24:20 UTC (rev 109691)
@@ -233,7 +233,6 @@
$$PWD/fileapi/WorkerContextFileSystem.idl \
$$PWD/html/canvas/ArrayBufferView.idl \
$$PWD/html/canvas/ArrayBuffer.idl \
- $$PWD/html/canvas/DOMWindowWebGL.idl \
$$PWD/html/canvas/DataView.idl \
$$PWD/html/canvas/Int8Array.idl \
$$PWD/html/canvas/Float32Array.idl \
Modified: trunk/Source/WebCore/GNUmakefile.list.am (109690 => 109691)
--- trunk/Source/WebCore/GNUmakefile.list.am 2012-03-05 02:01:45 UTC (rev 109690)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2012-03-05 02:24:20 UTC (rev 109691)
@@ -856,7 +856,6 @@
$(WebCore)/html/canvas/CanvasPattern.idl \
$(WebCore)/html/canvas/CanvasRenderingContext.idl \
$(WebCore)/html/canvas/CanvasRenderingContext2D.idl \
- $(WebCore)/html/canvas/DOMWindowWebGL.idl \
$(WebCore)/html/canvas/DataView.idl \
$(WebCore)/html/canvas/Float32Array.idl \
$(WebCore)/html/canvas/Float64Array.idl \
Modified: trunk/Source/WebCore/WebCore.gypi (109690 => 109691)
--- trunk/Source/WebCore/WebCore.gypi 2012-03-05 02:01:45 UTC (rev 109690)
+++ trunk/Source/WebCore/WebCore.gypi 2012-03-05 02:24:20 UTC (rev 109691)
@@ -984,7 +984,6 @@
'html/canvas/CanvasPixelArray.idl',
'html/canvas/CanvasRenderingContext.idl',
'html/canvas/CanvasRenderingContext2D.idl',
- 'html/canvas/DOMWindowWebGL.idl',
'html/canvas/DataView.idl',
'html/canvas/Float32Array.idl',
'html/canvas/Float64Array.idl',
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (109690 => 109691)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-03-05 02:01:45 UTC (rev 109690)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-03-05 02:24:20 UTC (rev 109691)
@@ -10808,7 +10808,6 @@
A833C80A0A2CF25600D57664 /* XMLNames.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = XMLNames.cpp; sourceTree = "<group>"; };
A833C80B0A2CF25600D57664 /* XMLNames.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = XMLNames.h; sourceTree = "<group>"; };
A83B533814F399BB00720D9D /* IDLAttributes.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = IDLAttributes.txt; path = scripts/IDLAttributes.txt; sourceTree = "<group>"; };
- A83B535B14F7413A00720D9D /* DOMWindowWebGL.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DOMWindowWebGL.idl; path = canvas/DOMWindowWebGL.idl; sourceTree = "<group>"; };
A83B538014FBB2EC00720D9D /* preprocess-idls.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; name = "preprocess-idls.pl"; path = "scripts/preprocess-idls.pl"; sourceTree = "<group>"; };
A83B78F20CCAFF15000B0825 /* JSSVGFontFaceUriElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSVGFontFaceUriElement.h; sourceTree = "<group>"; };
A83B78F30CCAFF15000B0825 /* JSSVGFontFaceUriElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGFontFaceUriElement.cpp; sourceTree = "<group>"; };
@@ -14591,7 +14590,6 @@
2E97CCE712939CB800C5C8FF /* DataView.cpp */,
2E97CCE812939CB800C5C8FF /* DataView.h */,
2E97CCE912939CB800C5C8FF /* DataView.idl */,
- A83B535B14F7413A00720D9D /* DOMWindowWebGL.idl */,
49EECDCF10503C2300099FAB /* Float32Array.idl */,
6EBC5D80138B4C4E00A0CF8A /* Float64Array.idl */,
49EECDD510503C2300099FAB /* Int16Array.idl */,
Deleted: trunk/Source/WebCore/html/canvas/DOMWindowWebGL.idl (109690 => 109691)
--- trunk/Source/WebCore/html/canvas/DOMWindowWebGL.idl 2012-03-05 02:01:45 UTC (rev 109690)
+++ trunk/Source/WebCore/html/canvas/DOMWindowWebGL.idl 2012-03-05 02:24:20 UTC (rev 109691)
@@ -1,44 +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 [
- Conditional=WEBGL,
- Supplemental=DOMWindow
- ] DOMWindowWebGL {
- attribute WebGLActiveInfoConstructor WebGLActiveInfo;
- attribute WebGLBufferConstructor WebGLBuffer;
- attribute WebGLFramebufferConstructor WebGLFramebuffer;
- attribute WebGLProgramConstructor WebGLProgram;
- attribute WebGLRenderbufferConstructor WebGLRenderbuffer;
- attribute WebGLRenderingContextConstructor WebGLRenderingContext;
- attribute WebGLShaderConstructor WebGLShader;
- attribute WebGLTextureConstructor WebGLTexture;
- attribute WebGLUniformLocationConstructor WebGLUniformLocation;
- };
-
-}
Modified: trunk/Source/WebCore/page/DOMWindow.idl (109690 => 109691)
--- trunk/Source/WebCore/page/DOMWindow.idl 2012-03-05 02:01:45 UTC (rev 109690)
+++ trunk/Source/WebCore/page/DOMWindow.idl 2012-03-05 02:24:20 UTC (rev 109691)
@@ -493,6 +493,16 @@
attribute ImageDataConstructor ImageData;
attribute TextMetricsConstructor TextMetrics;
+ attribute [Conditional=WEBGL] WebGLActiveInfoConstructor WebGLActiveInfo;
+ attribute [Conditional=WEBGL] WebGLBufferConstructor WebGLBuffer;
+ attribute [Conditional=WEBGL] WebGLFramebufferConstructor WebGLFramebuffer;
+ attribute [Conditional=WEBGL] WebGLProgramConstructor WebGLProgram;
+ attribute [Conditional=WEBGL] WebGLRenderbufferConstructor WebGLRenderbuffer;
+ attribute [Conditional=WEBGL] WebGLRenderingContextConstructor WebGLRenderingContext;
+ attribute [Conditional=WEBGL] WebGLShaderConstructor WebGLShader;
+ attribute [Conditional=WEBGL] WebGLTextureConstructor WebGLTexture;
+ attribute [Conditional=WEBGL] WebGLUniformLocationConstructor WebGLUniformLocation;
+
attribute DOMStringMapConstructor DOMStringMap;
attribute ArrayBufferConstructor ArrayBuffer; // Usable with new operator
