From 55848932eb04dff009924615635f692d0fd3fc1b Mon Sep 17 00:00:00 2001 From: "haraken@chromium.org" Date: Fri, 24 Feb 2012 11:57:16 +0000 Subject: [PATCH] Move WebGL APIs from DOMWindow.idl to DOMWindowWebGL.idl https://bugs.webkit.org/show_bug.cgi?id=79432 Reviewed by Adam Barth. For WebKit modularization, this patch moves WebGL-related APIs from DOMWindow.idl to DOMWindowWebGL.idl. No tests. No change in behavior. * html/canvas/DOMWindowWebGL.idl: Added. * page/DOMWindow.idl: * DerivedSources.make: Added DOMWindowWebGL.idl. * DerivedSources.pri: Ditto. * GNUmakefile.list.am: Ditto. * WebCore.gypi: Ditto. * WebCore.xcodeproj/project.pbxproj: Ditto. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108768 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 21 ++++++++++++++ Source/WebCore/DerivedSources.make | 1 + Source/WebCore/DerivedSources.pri | 1 + Source/WebCore/GNUmakefile.list.am | 1 + Source/WebCore/WebCore.gypi | 1 + Source/WebCore/WebCore.xcodeproj/project.pbxproj | 2 ++ Source/WebCore/html/canvas/DOMWindowWebGL.idl | 37 ++++++++++++++++++++++++ Source/WebCore/page/DOMWindow.idl | 9 ------ 8 files changed, 64 insertions(+), 9 deletions(-) create mode 100644 Source/WebCore/html/canvas/DOMWindowWebGL.idl diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 18943a4..ab0d66f 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,24 @@ +2012-02-24 Kentaro Hara + + Move WebGL APIs from DOMWindow.idl to DOMWindowWebGL.idl + https://bugs.webkit.org/show_bug.cgi?id=79432 + + Reviewed by Adam Barth. + + For WebKit modularization, this patch moves WebGL-related APIs + from DOMWindow.idl to DOMWindowWebGL.idl. + + No tests. No change in behavior. + + * html/canvas/DOMWindowWebGL.idl: Added. + * page/DOMWindow.idl: + + * DerivedSources.make: Added DOMWindowWebGL.idl. + * DerivedSources.pri: Ditto. + * GNUmakefile.list.am: Ditto. + * WebCore.gypi: Ditto. + * WebCore.xcodeproj/project.pbxproj: Ditto. + 2012-02-24 Vsevolod Vlasov Web Inspector: [Regression] network worker tests crash on qt. diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make index 2b144ce..1de4c74 100644 --- a/Source/WebCore/DerivedSources.make +++ b/Source/WebCore/DerivedSources.make @@ -277,6 +277,7 @@ BINDING_IDLS = \ $(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 \ diff --git a/Source/WebCore/DerivedSources.pri b/Source/WebCore/DerivedSources.pri index 2b13e81..b396430 100644 --- a/Source/WebCore/DerivedSources.pri +++ b/Source/WebCore/DerivedSources.pri @@ -215,6 +215,7 @@ IDL_BINDINGS += \ $$PWD/fileapi/WebKitBlobBuilder.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 \ diff --git a/Source/WebCore/GNUmakefile.list.am b/Source/WebCore/GNUmakefile.list.am index 57e37d6..08ae7f2 100644 --- a/Source/WebCore/GNUmakefile.list.am +++ b/Source/WebCore/GNUmakefile.list.am @@ -844,6 +844,7 @@ dom_binding_idls += \ $(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 \ diff --git a/Source/WebCore/WebCore.gypi b/Source/WebCore/WebCore.gypi index 7af86d7..d57862a 100644 --- a/Source/WebCore/WebCore.gypi +++ b/Source/WebCore/WebCore.gypi @@ -949,6 +949,7 @@ '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', diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj index 9371783..5915978 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj @@ -10673,6 +10673,7 @@ A833C80A0A2CF25600D57664 /* XMLNames.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = XMLNames.cpp; sourceTree = ""; }; A833C80B0A2CF25600D57664 /* XMLNames.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = XMLNames.h; sourceTree = ""; }; A83B533814F399BB00720D9D /* IDLAttributes.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = IDLAttributes.txt; path = scripts/IDLAttributes.txt; sourceTree = ""; }; + A83B535B14F7413A00720D9D /* DOMWindowWebGL.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DOMWindowWebGL.idl; path = canvas/DOMWindowWebGL.idl; sourceTree = ""; }; A83B78F20CCAFF15000B0825 /* JSSVGFontFaceUriElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSVGFontFaceUriElement.h; sourceTree = ""; }; A83B78F30CCAFF15000B0825 /* JSSVGFontFaceUriElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGFontFaceUriElement.cpp; sourceTree = ""; }; A83B78F40CCAFF15000B0825 /* JSSVGFontFaceSrcElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSVGFontFaceSrcElement.h; sourceTree = ""; }; @@ -14535,6 +14536,7 @@ 49484FAE102CF01E00187DD3 /* canvas */ = { isa = PBXGroup; children = ( + A83B535B14F7413A00720D9D /* DOMWindowWebGL.idl */, 49EECDCC10503C2300099FAB /* ArrayBuffer.idl */, 49EECDC910503C2300099FAB /* ArrayBufferView.idl */, 6E4E91A710F7FB3100A2779C /* CanvasContextAttributes.cpp */, diff --git a/Source/WebCore/html/canvas/DOMWindowWebGL.idl b/Source/WebCore/html/canvas/DOMWindowWebGL.idl new file mode 100644 index 0000000..92056d3 --- /dev/null +++ b/Source/WebCore/html/canvas/DOMWindowWebGL.idl @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2012 Google Inc. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +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; + }; + +} diff --git a/Source/WebCore/page/DOMWindow.idl b/Source/WebCore/page/DOMWindow.idl index 83ff248..9066a6d 100644 --- a/Source/WebCore/page/DOMWindow.idl +++ b/Source/WebCore/page/DOMWindow.idl @@ -401,15 +401,6 @@ module window { attribute CanvasRenderingContext2DConstructor CanvasRenderingContext2D; attribute ImageDataConstructor ImageData; - 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 TextMetricsConstructor TextMetrics; attribute DOMStringMapConstructor DOMStringMap; -- 2.7.4