Attachment #130033 for bug #80144

View Details Raw Unified Return to Bug 80144

| Differences between



2012-03-02  Kentaro Hara  <haraken@chromium.org>

        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  Robin Cao  <robin.cao@torchmobile.com.cn>

        [BlackBerry] Upstream two helper files from platform/graphics/blackberry

Lines 296-302 BINDING_IDLS = \ a/Source/WebCore/DerivedSources.make_sec1
- a/Source/WebCore/DerivedSources.make -1 lines
296	$(WebCore)/html/canvas/CanvasPattern.idl \	296	$(WebCore)/html/canvas/CanvasPattern.idl \
297	$(WebCore)/html/canvas/CanvasRenderingContext.idl \	297	$(WebCore)/html/canvas/CanvasRenderingContext.idl \
298	$(WebCore)/html/canvas/CanvasRenderingContext2D.idl \	298	$(WebCore)/html/canvas/CanvasRenderingContext2D.idl \
299	$(WebCore)/html/canvas/DOMWindowWebGL.idl \
300	$(WebCore)/html/canvas/DataView.idl \	299	$(WebCore)/html/canvas/DataView.idl \
301	$(WebCore)/html/canvas/Float32Array.idl \	300	$(WebCore)/html/canvas/Float32Array.idl \
302	$(WebCore)/html/canvas/Float64Array.idl \	301	$(WebCore)/html/canvas/Float64Array.idl \

Lines 233-239 IDL_BINDINGS += \ a/Source/WebCore/DerivedSources.pri_sec1
- a/Source/WebCore/DerivedSources.pri -1 lines
233	$$PWD/fileapi/WorkerContextFileSystem.idl \	233	$$PWD/fileapi/WorkerContextFileSystem.idl \
234	$$PWD/html/canvas/ArrayBufferView.idl \	234	$$PWD/html/canvas/ArrayBufferView.idl \
235	$$PWD/html/canvas/ArrayBuffer.idl \	235	$$PWD/html/canvas/ArrayBuffer.idl \
236	$$PWD/html/canvas/DOMWindowWebGL.idl \
237	$$PWD/html/canvas/DataView.idl \	236	$$PWD/html/canvas/DataView.idl \
238	$$PWD/html/canvas/Int8Array.idl \	237	$$PWD/html/canvas/Int8Array.idl \
239	$$PWD/html/canvas/Float32Array.idl \	238	$$PWD/html/canvas/Float32Array.idl \

Lines 856-862 dom_binding_idls += \ a/Source/WebCore/GNUmakefile.list.am_sec1
- a/Source/WebCore/GNUmakefile.list.am -1 lines
856	$(WebCore)/html/canvas/CanvasPattern.idl \	856	$(WebCore)/html/canvas/CanvasPattern.idl \
857	$(WebCore)/html/canvas/CanvasRenderingContext.idl \	857	$(WebCore)/html/canvas/CanvasRenderingContext.idl \
858	$(WebCore)/html/canvas/CanvasRenderingContext2D.idl \	858	$(WebCore)/html/canvas/CanvasRenderingContext2D.idl \
859	$(WebCore)/html/canvas/DOMWindowWebGL.idl \
860	$(WebCore)/html/canvas/DataView.idl \	859	$(WebCore)/html/canvas/DataView.idl \
861	$(WebCore)/html/canvas/Float32Array.idl \	860	$(WebCore)/html/canvas/Float32Array.idl \
862	$(WebCore)/html/canvas/Float64Array.idl \	861	$(WebCore)/html/canvas/Float64Array.idl \

Lines 984-990 a/Source/WebCore/WebCore.gypi_sec1
- a/Source/WebCore/WebCore.gypi -1 lines
984	'html/canvas/CanvasPixelArray.idl',	984	'html/canvas/CanvasPixelArray.idl',
985	'html/canvas/CanvasRenderingContext.idl',	985	'html/canvas/CanvasRenderingContext.idl',
986	'html/canvas/CanvasRenderingContext2D.idl',	986	'html/canvas/CanvasRenderingContext2D.idl',
987	'html/canvas/DOMWindowWebGL.idl',
988	'html/canvas/DataView.idl',	987	'html/canvas/DataView.idl',
989	'html/canvas/Float32Array.idl',	988	'html/canvas/Float32Array.idl',
990	'html/canvas/Float64Array.idl',	989	'html/canvas/Float64Array.idl',



		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>"; };

				2E97CCE712939CB800C5C8FF /* DataView.cpp */,
				2E97CCE812939CB800C5C8FF /* DataView.h */,
				2E97CCE912939CB800C5C8FF /* DataView.idl */,
				A83B535B14F7413A00720D9D /* DOMWindowWebGL.idl */,
				49EECDCF10503C2300099FAB /* Float32Array.idl */,
				6EBC5D80138B4C4E00A0CF8A /* Float64Array.idl */,
				49EECDD510503C2300099FAB /* Int16Array.idl */,



/*
 * 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;
    };

}



        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

Return to Bug 80144

Lines 493-498 module window { a/Source/WebCore/page/DOMWindow.idl_sec1
- a/Source/WebCore/page/DOMWindow.idl +10 lines
493	attribute ImageDataConstructor ImageData;	493	attribute ImageDataConstructor ImageData;
494	attribute TextMetricsConstructor TextMetrics;	494	attribute TextMetricsConstructor TextMetrics;
495		495
		496	attribute [Conditional=WEBGL] WebGLActiveInfoConstructor WebGLActiveInfo;
		497	attribute [Conditional=WEBGL] WebGLBufferConstructor WebGLBuffer;
		498	attribute [Conditional=WEBGL] WebGLFramebufferConstructor WebGLFramebuffer;
		499	attribute [Conditional=WEBGL] WebGLProgramConstructor WebGLProgram;
		500	attribute [Conditional=WEBGL] WebGLRenderbufferConstructor WebGLRenderbuffer;
		501	attribute [Conditional=WEBGL] WebGLRenderingContextConstructor WebGLRenderingContext;
		502	attribute [Conditional=WEBGL] WebGLShaderConstructor WebGLShader;
		503	attribute [Conditional=WEBGL] WebGLTextureConstructor WebGLTexture;
		504	attribute [Conditional=WEBGL] WebGLUniformLocationConstructor WebGLUniformLocation;
		505
496	attribute DOMStringMapConstructor DOMStringMap;	506	attribute DOMStringMapConstructor DOMStringMap;
497		507
498	attribute ArrayBufferConstructor ArrayBuffer; // Usable with new operator	508	attribute ArrayBufferConstructor ArrayBuffer; // Usable with new operator

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +21 lines
		1	2012-03-02 Kentaro Hara <haraken@chromium.org>
		2
		3	Revert WebGL-related APIs from DOMWindowWebGL.idl back to DOMWindow.idl
		4	https://bugs.webkit.org/show_bug.cgi?id=80144
		5
		6	Reviewed by Adam Barth.
		7
		8	Based on the discussion on webkit-dev@
		9	(http://markmail.org/message/kagvswmah67zmrry#query:+page:1+mid:h34vzbiu5suub3ld+state:results),
		10	this patch reverts WebGL-related APIs from DOMWindowWebGL.idl back to DOMWindow.idl.
		11
		12	No tests. No change in behavior.
		13
		14	* DerivedSources.make:
		15	* DerivedSources.pri:
		16	* GNUmakefile.list.am:
		17	* WebCore.gypi:
		18	* WebCore.xcodeproj/project.pbxproj:
		19	* html/canvas/DOMWindowWebGL.idl: Removed.
		20	* page/DOMWindow.idl:
		21
1	2012-03-04 Robin Cao <robin.cao@torchmobile.com.cn>	22	2012-03-04 Robin Cao <robin.cao@torchmobile.com.cn>
2		23
3	[BlackBerry] Upstream two helper files from platform/graphics/blackberry	24	[BlackBerry] Upstream two helper files from platform/graphics/blackberry

Lines 10808-10814 a/Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec1
- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj -2 lines
10808	A833C80A0A2CF25600D57664 /* XMLNames.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = XMLNames.cpp; sourceTree = "<group>"; };	10808	A833C80A0A2CF25600D57664 /* XMLNames.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = XMLNames.cpp; sourceTree = "<group>"; };
10809	A833C80B0A2CF25600D57664 /* XMLNames.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = XMLNames.h; sourceTree = "<group>"; };	10809	A833C80B0A2CF25600D57664 /* XMLNames.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = XMLNames.h; sourceTree = "<group>"; };
10810	A83B533814F399BB00720D9D /* IDLAttributes.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = IDLAttributes.txt; path = scripts/IDLAttributes.txt; sourceTree = "<group>"; };	10810	A83B533814F399BB00720D9D /* IDLAttributes.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = IDLAttributes.txt; path = scripts/IDLAttributes.txt; sourceTree = "<group>"; };
10811	A83B535B14F7413A00720D9D /* DOMWindowWebGL.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DOMWindowWebGL.idl; path = canvas/DOMWindowWebGL.idl; sourceTree = "<group>"; };
10812	A83B538014FBB2EC00720D9D /* preprocess-idls.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; name = "preprocess-idls.pl"; path = "scripts/preprocess-idls.pl"; sourceTree = "<group>"; };	10811	A83B538014FBB2EC00720D9D /* preprocess-idls.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; name = "preprocess-idls.pl"; path = "scripts/preprocess-idls.pl"; sourceTree = "<group>"; };
10813	A83B78F20CCAFF15000B0825 /* JSSVGFontFaceUriElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSVGFontFaceUriElement.h; sourceTree = "<group>"; };	10812	A83B78F20CCAFF15000B0825 /* JSSVGFontFaceUriElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSVGFontFaceUriElement.h; sourceTree = "<group>"; };
10814	A83B78F30CCAFF15000B0825 /* JSSVGFontFaceUriElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGFontFaceUriElement.cpp; sourceTree = "<group>"; };	10813	A83B78F30CCAFF15000B0825 /* JSSVGFontFaceUriElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGFontFaceUriElement.cpp; sourceTree = "<group>"; };
Lines 14591-14597 a/Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec2
14591	2E97CCE712939CB800C5C8FF /* DataView.cpp */,	14590	2E97CCE712939CB800C5C8FF /* DataView.cpp */,
14592	2E97CCE812939CB800C5C8FF /* DataView.h */,	14591	2E97CCE812939CB800C5C8FF /* DataView.h */,
14593	2E97CCE912939CB800C5C8FF /* DataView.idl */,	14592	2E97CCE912939CB800C5C8FF /* DataView.idl */,
14594	A83B535B14F7413A00720D9D /* DOMWindowWebGL.idl */,
14595	49EECDCF10503C2300099FAB /* Float32Array.idl */,	14593	49EECDCF10503C2300099FAB /* Float32Array.idl */,
14596	6EBC5D80138B4C4E00A0CF8A /* Float64Array.idl */,	14594	6EBC5D80138B4C4E00A0CF8A /* Float64Array.idl */,
14597	49EECDD510503C2300099FAB /* Int16Array.idl */,	14595	49EECDD510503C2300099FAB /* Int16Array.idl */,

Lines 1-44 a/Source/WebCore/html/canvas/DOMWindowWebGL.idl_sec1
- a/Source/WebCore/html/canvas/DOMWindowWebGL.idl -44 lines
1	/*
2	* Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
3	* Copyright (C) 2011 Google Inc. All rights reserved.
4	*
5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions
7	* are met:
8	* 1. Redistributions of source code must retain the above copyright
9	* notice, this list of conditions and the following disclaimer.
10	* 2. Redistributions in binary form must reproduce the above copyright
11	* notice, this list of conditions and the following disclaimer in the
12	* documentation and/or other materials provided with the distribution.
13	*
14	* THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
15	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
17	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
18	* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
19	* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
20	* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
21	* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
22	* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25	*/
26
27	module window {
28
29	interface [
30	Conditional=WEBGL,
31	Supplemental=DOMWindow
32	] DOMWindowWebGL {
33	attribute WebGLActiveInfoConstructor WebGLActiveInfo;
34	attribute WebGLBufferConstructor WebGLBuffer;
35	attribute WebGLFramebufferConstructor WebGLFramebuffer;
36	attribute WebGLProgramConstructor WebGLProgram;
37	attribute WebGLRenderbufferConstructor WebGLRenderbuffer;
38	attribute WebGLRenderingContextConstructor WebGLRenderingContext;
39	attribute WebGLShaderConstructor WebGLShader;
40	attribute WebGLTextureConstructor WebGLTexture;
41	attribute WebGLUniformLocationConstructor WebGLUniformLocation;
42	};
43
44	}