[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
tkent at chromium.org
tkent at chromium.org
Thu Apr 8 00:57:09 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit f3924cc79048b4dca0d3eefb481a285bd268f731
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 7 13:43:28 2010 +0000
2010-01-07 Kent Tamura <tkent at chromium.org>
Reviewed by Maciej Stachowiak.
Remove COM code generation stuff.
https://bugs.webkit.org/show_bug.cgi?id=32854
Remove the followings:
- CodeGeenratorCOM.pm, COM code generator,
- "#if !defined(LANGUAGE_COM) || !LANGUAGE_COM" in IDL files, and
- UUID attributes in IDL files.
* bindings/scripts/CodeGeneratorCOM.pm: Removed.
* css/CSSCharsetRule.idl:
* css/CSSFontFaceRule.idl:
* css/CSSImportRule.idl:
* css/CSSMediaRule.idl:
* css/CSSPageRule.idl:
* css/CSSPrimitiveValue.idl:
* css/CSSRule.idl:
* css/CSSRuleList.idl:
* css/CSSStyleDeclaration.idl:
* css/CSSStyleRule.idl:
* css/CSSStyleSheet.idl:
* css/CSSUnknownRule.idl:
* css/CSSValue.idl:
* css/CSSValueList.idl:
* css/Counter.idl:
* css/MediaList.idl:
* css/RGBColor.idl:
* css/Rect.idl:
* css/StyleSheet.idl:
* css/StyleSheetList.idl:
* css/WebKitCSSKeyframeRule.idl:
* css/WebKitCSSKeyframesRule.idl:
* css/WebKitCSSTransformValue.idl:
* dom/Attr.idl:
* dom/CDATASection.idl:
* dom/CharacterData.idl:
* dom/Comment.idl:
* dom/DOMImplementation.idl:
* dom/Document.idl:
* dom/DocumentFragment.idl:
* dom/DocumentType.idl:
* dom/Element.idl:
* dom/Entity.idl:
* dom/EntityReference.idl:
* dom/Event.idl:
* dom/EventListener.idl:
* dom/EventTarget.idl:
* dom/NamedNodeMap.idl:
* dom/Node.idl:
* dom/NodeList.idl:
* dom/Notation.idl:
* dom/ProcessingInstruction.idl:
* dom/Text.idl:
* html/HTMLAnchorElement.idl:
* html/HTMLAppletElement.idl:
* html/HTMLAreaElement.idl:
* html/HTMLBRElement.idl:
* html/HTMLBaseElement.idl:
* html/HTMLBaseFontElement.idl:
* html/HTMLBlockquoteElement.idl:
* html/HTMLBodyElement.idl:
* html/HTMLButtonElement.idl:
* html/HTMLCanvasElement.idl:
* html/HTMLCollection.idl:
* html/HTMLDListElement.idl:
* html/HTMLDirectoryElement.idl:
* html/HTMLDivElement.idl:
* html/HTMLDocument.idl:
* html/HTMLElement.idl:
* html/HTMLEmbedElement.idl:
* html/HTMLFieldSetElement.idl:
* html/HTMLFontElement.idl:
* html/HTMLFormElement.idl:
* html/HTMLFrameElement.idl:
* html/HTMLFrameSetElement.idl:
* html/HTMLHRElement.idl:
* html/HTMLHeadElement.idl:
* html/HTMLHeadingElement.idl:
* html/HTMLHtmlElement.idl:
* html/HTMLIFrameElement.idl:
* html/HTMLImageElement.idl:
* html/HTMLInputElement.idl:
* html/HTMLIsIndexElement.idl:
* html/HTMLLIElement.idl:
* html/HTMLLabelElement.idl:
* html/HTMLLegendElement.idl:
* html/HTMLLinkElement.idl:
* html/HTMLMapElement.idl:
* html/HTMLMarqueeElement.idl:
* html/HTMLMenuElement.idl:
* html/HTMLMetaElement.idl:
* html/HTMLModElement.idl:
* html/HTMLOListElement.idl:
* html/HTMLObjectElement.idl:
* html/HTMLOptGroupElement.idl:
* html/HTMLOptionElement.idl:
* html/HTMLOptionsCollection.idl:
* html/HTMLParagraphElement.idl:
* html/HTMLParamElement.idl:
* html/HTMLPreElement.idl:
* html/HTMLQuoteElement.idl:
* html/HTMLScriptElement.idl:
* html/HTMLSelectElement.idl:
* html/HTMLStyleElement.idl:
* html/HTMLTableCaptionElement.idl:
* html/HTMLTableCellElement.idl:
* html/HTMLTableColElement.idl:
* html/HTMLTableElement.idl:
* html/HTMLTableRowElement.idl:
* html/HTMLTableSectionElement.idl:
* html/HTMLTextAreaElement.idl:
* html/HTMLTitleElement.idl:
* html/HTMLUListElement.idl:
2010-01-07 Kent Tamura <tkent at chromium.org>
Reviewed by Maciej Stachowiak.
Remove COM code generation files.
https://bugs.webkit.org/show_bug.cgi?id=32854
* WebKit.vcproj/DerivedSources.make: Removed.
* WebKit.vcproj/build-generated-files.sh: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52921 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e022169..c378d30 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,120 @@
+2010-01-07 Kent Tamura <tkent at chromium.org>
+
+ Reviewed by Maciej Stachowiak.
+
+ Remove COM code generation stuff.
+ https://bugs.webkit.org/show_bug.cgi?id=32854
+
+ Remove the followings:
+ - CodeGeenratorCOM.pm, COM code generator,
+ - "#if !defined(LANGUAGE_COM) || !LANGUAGE_COM" in IDL files, and
+ - UUID attributes in IDL files.
+
+ * bindings/scripts/CodeGeneratorCOM.pm: Removed.
+ * css/CSSCharsetRule.idl:
+ * css/CSSFontFaceRule.idl:
+ * css/CSSImportRule.idl:
+ * css/CSSMediaRule.idl:
+ * css/CSSPageRule.idl:
+ * css/CSSPrimitiveValue.idl:
+ * css/CSSRule.idl:
+ * css/CSSRuleList.idl:
+ * css/CSSStyleDeclaration.idl:
+ * css/CSSStyleRule.idl:
+ * css/CSSStyleSheet.idl:
+ * css/CSSUnknownRule.idl:
+ * css/CSSValue.idl:
+ * css/CSSValueList.idl:
+ * css/Counter.idl:
+ * css/MediaList.idl:
+ * css/RGBColor.idl:
+ * css/Rect.idl:
+ * css/StyleSheet.idl:
+ * css/StyleSheetList.idl:
+ * css/WebKitCSSKeyframeRule.idl:
+ * css/WebKitCSSKeyframesRule.idl:
+ * css/WebKitCSSTransformValue.idl:
+ * dom/Attr.idl:
+ * dom/CDATASection.idl:
+ * dom/CharacterData.idl:
+ * dom/Comment.idl:
+ * dom/DOMImplementation.idl:
+ * dom/Document.idl:
+ * dom/DocumentFragment.idl:
+ * dom/DocumentType.idl:
+ * dom/Element.idl:
+ * dom/Entity.idl:
+ * dom/EntityReference.idl:
+ * dom/Event.idl:
+ * dom/EventListener.idl:
+ * dom/EventTarget.idl:
+ * dom/NamedNodeMap.idl:
+ * dom/Node.idl:
+ * dom/NodeList.idl:
+ * dom/Notation.idl:
+ * dom/ProcessingInstruction.idl:
+ * dom/Text.idl:
+ * html/HTMLAnchorElement.idl:
+ * html/HTMLAppletElement.idl:
+ * html/HTMLAreaElement.idl:
+ * html/HTMLBRElement.idl:
+ * html/HTMLBaseElement.idl:
+ * html/HTMLBaseFontElement.idl:
+ * html/HTMLBlockquoteElement.idl:
+ * html/HTMLBodyElement.idl:
+ * html/HTMLButtonElement.idl:
+ * html/HTMLCanvasElement.idl:
+ * html/HTMLCollection.idl:
+ * html/HTMLDListElement.idl:
+ * html/HTMLDirectoryElement.idl:
+ * html/HTMLDivElement.idl:
+ * html/HTMLDocument.idl:
+ * html/HTMLElement.idl:
+ * html/HTMLEmbedElement.idl:
+ * html/HTMLFieldSetElement.idl:
+ * html/HTMLFontElement.idl:
+ * html/HTMLFormElement.idl:
+ * html/HTMLFrameElement.idl:
+ * html/HTMLFrameSetElement.idl:
+ * html/HTMLHRElement.idl:
+ * html/HTMLHeadElement.idl:
+ * html/HTMLHeadingElement.idl:
+ * html/HTMLHtmlElement.idl:
+ * html/HTMLIFrameElement.idl:
+ * html/HTMLImageElement.idl:
+ * html/HTMLInputElement.idl:
+ * html/HTMLIsIndexElement.idl:
+ * html/HTMLLIElement.idl:
+ * html/HTMLLabelElement.idl:
+ * html/HTMLLegendElement.idl:
+ * html/HTMLLinkElement.idl:
+ * html/HTMLMapElement.idl:
+ * html/HTMLMarqueeElement.idl:
+ * html/HTMLMenuElement.idl:
+ * html/HTMLMetaElement.idl:
+ * html/HTMLModElement.idl:
+ * html/HTMLOListElement.idl:
+ * html/HTMLObjectElement.idl:
+ * html/HTMLOptGroupElement.idl:
+ * html/HTMLOptionElement.idl:
+ * html/HTMLOptionsCollection.idl:
+ * html/HTMLParagraphElement.idl:
+ * html/HTMLParamElement.idl:
+ * html/HTMLPreElement.idl:
+ * html/HTMLQuoteElement.idl:
+ * html/HTMLScriptElement.idl:
+ * html/HTMLSelectElement.idl:
+ * html/HTMLStyleElement.idl:
+ * html/HTMLTableCaptionElement.idl:
+ * html/HTMLTableCellElement.idl:
+ * html/HTMLTableColElement.idl:
+ * html/HTMLTableElement.idl:
+ * html/HTMLTableRowElement.idl:
+ * html/HTMLTableSectionElement.idl:
+ * html/HTMLTextAreaElement.idl:
+ * html/HTMLTitleElement.idl:
+ * html/HTMLUListElement.idl:
+
2010-01-07 Steve Block <steveblock at google.com>
Reviewed by Darin Adler.
diff --git a/WebCore/bindings/scripts/CodeGeneratorCOM.pm b/WebCore/bindings/scripts/CodeGeneratorCOM.pm
deleted file mode 100644
index e98379b..0000000
--- a/WebCore/bindings/scripts/CodeGeneratorCOM.pm
+++ /dev/null
@@ -1,1319 +0,0 @@
-#
-# Copyright (C) 2005, 2006 Nikolas Zimmermann <zimmermann at kde.org>
-# Copyright (C) 2006 Anders Carlsson <andersca at mac.com>
-# Copyright (C) 2006, 2007 Samuel Weinig <sam at webkit.org>
-# Copyright (C) 2006 Alexey Proskuryakov <ap at webkit.org>
-# Copyright (C) 2006, 2007, 2008 Apple 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., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-package CodeGeneratorCOM;
-
-use File::stat;
-
-# Global Variables
-my $module = "";
-my $outputDir = "";
-
-my @IDLHeader = ();
-my @IDLContent = ();
-my %IDLIncludes = ();
-my %IDLForwardDeclarations = ();
-my %IDLDontForwardDeclare = ();
-my %IDLImports = ();
-my %IDLDontImport = ();
-
-my @CPPInterfaceHeader = ();
-
-my @CPPHeaderHeader = ();
-my @CPPHeaderContent = ();
-my %CPPHeaderIncludes = ();
-my %CPPHeaderIncludesAngle = ();
-my %CPPHeaderForwardDeclarations = ();
-my %CPPHeaderDontForwardDeclarations = ();
-
-my @CPPImplementationHeader = ();
-my @CPPImplementationContent = ();
-my %CPPImplementationIncludes = ();
-my %CPPImplementationWebCoreIncludes = ();
-my %CPPImplementationIncludesAngle = ();
-my %CPPImplementationDontIncludes = ();
-
-my @additionalInterfaceDefinitions = ();
-
-my $DASHES = "----------------------------------------";
-my $TEMP_PREFIX = "GEN_";
-
-# Hashes
-
-my %includeCorrector = map {($_, 1)} qw{UIEvent KeyboardEvent MouseEvent
- MutationEvent OverflowEvent WheelEvent};
-
-my %conflictMethod = (
- # FIXME: Add C language keywords?
-);
-
-# Default License Templates
-my @licenseTemplate = split(/\r/, << "EOF");
-/*
- * Copyright (C) 2007 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.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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.
- */
-EOF
-
-# Default constructor
-sub new
-{
- my $object = shift;
- my $reference = { };
-
- $codeGenerator = shift;
- $outputDir = shift;
-
- bless($reference, $object);
- return $reference;
-}
-
-sub finish
-{
- my $object = shift;
-}
-
-# Params: 'domClass' struct
-sub GenerateInterface
-{
- my $object = shift;
- my $dataNode = shift;
- my $defines = shift;
-
- my $name = $dataNode->name;
-
- my $pureInterface = $dataNode->extendedAttributes->{"PureInterface"};
-
- # Start actual generation..
- $object->GenerateIDL($dataNode, $pureInterface);
- if ($pureInterface) {
- $object->GenerateInterfaceHeader($dataNode);
- } else {
- $object->GenerateCPPHeader($dataNode);
- $object->GenerateCPPImplementation($dataNode);
- }
-
- # Write changes.
- $object->WriteData($name, $pureInterface);
-}
-
-# Params: 'idlDocument' struct
-sub GenerateModule
-{
- my $object = shift;
- my $dataNode = shift;
-
- $module = $dataNode->module;
-}
-
-sub GetInterfaceName
-{
- my $name = $codeGenerator->StripModule(shift);
-
- die "GetInterfaceName should only be used on interfaces." if ($codeGenerator->IsStringType($name) or $codeGenerator->IsPrimitiveType($name));
-
- # special cases
- return "I" . $TEMP_PREFIX . "DOMAbstractView" if $name eq "DOMWindow";
- return "I" . $TEMP_PREFIX . $name if $name eq "DOMImplementation" or $name eq "DOMTimeStamp";
-
- # Default, assume COM type has the same type name as
- # idl type prefixed with "IDOM".
- return "I" . $TEMP_PREFIX . "DOM" . $name;
-}
-
-sub GetClassName
-{
- my $name = $codeGenerator->StripModule(shift);
-
- # special cases
- return "BSTR" if $codeGenerator->IsStringType($name);
- return "BOOL" if $name eq "boolean";
- return "unsigned" if $name eq "unsigned long";
- return "int" if $name eq "long";
- return $name if $codeGenerator->IsPrimitiveType($name);
- return $TEMP_PREFIX . "DOMAbstractView" if $name eq "DOMWindow";
- return $TEMP_PREFIX . $name if $name eq "DOMImplementation" or $name eq "DOMTimeStamp";
-
- # Default, assume COM type has the same type name as
- # idl type prefixed with "DOM".
- return $TEMP_PREFIX . "DOM" . $name;
-}
-
-sub GetCOMType
-{
- my ($type) = @_;
-
- die "Don't use GetCOMType for string types, use one of In/Out variants instead." if $codeGenerator->IsStringType($type);
-
- return "BOOL" if $type eq "boolean";
- return "UINT" if $type eq "unsigned long";
- return "INT" if $type eq "long";
- return $type if $codeGenerator->IsPrimitiveType($type) or $type eq "DOMTimeStamp";
- # return "unsigned short" if $type eq "CompareHow" or $type eq "SVGPaintType";
-
- return GetInterfaceName($type) . "*";
-}
-
-sub GetCOMTypeIn
-{
- my ($type) = @_;
- return "LPCTSTR" if $codeGenerator->IsStringType($type);
- return GetCOMType($type);
-}
-
-sub GetCOMTypeOut
-{
- my ($type) = @_;
- return "BSTR" if $codeGenerator->IsStringType($type);
- return GetCOMType($type);
-}
-
-sub IDLTypeToImplementationType
-{
- my $type = $codeGenerator->StripModule(shift);
-
- return "bool" if $type eq "boolean";
- return "unsigned" if $type eq "unsigned long";
- return "int" if $type eq "long";
- return $type if $codeGenerator->IsPrimitiveType($type);
-
- return "WebCore::String" if $codeGenerator->IsStringType($type);
- return "WebCore::${type}";
-}
-
-sub StripNamespace
-{
- my ($type) = @_;
-
- $type =~ s/^WebCore:://;
-
- return $type;
-}
-
-sub GetParentInterface
-{
- my ($dataNode) = @_;
- return "I" . $TEMP_PREFIX . "DOMObject" if (@{$dataNode->parents} == 0);
- return GetInterfaceName($codeGenerator->StripModule($dataNode->parents(0)));
-}
-
-sub GetParentClass
-{
- my ($dataNode) = @_;
- return $TEMP_PREFIX . "DOMObject" if (@{$dataNode->parents} == 0);
- return GetClassName($codeGenerator->StripModule($dataNode->parents(0)));
-}
-
-sub AddForwardDeclarationsForTypeInIDL
-{
- my $type = $codeGenerator->StripModule(shift);
-
- return if $codeGenerator->IsNonPointerType($type) or $codeGenerator->IsStringType($type);
-
- my $interface = GetInterfaceName($type);
- $IDLForwardDeclarations{$interface} = 1;
- $IDLImports{$interface} = 1;
-}
-
-sub AddIncludesForTypeInCPPHeader
-{
- my $type = $codeGenerator->StripModule(shift);
- my $useAngleBrackets = shift;
-
- return if $codeGenerator->IsNonPointerType($type);
-
- # Add special Cases HERE
-
- if ($type =~ m/^I/) {
- $type = "WebKit";
- }
-
- if ($useAngleBrackets) {
- $CPPHeaderIncludesAngle{"$type.h"} = 1;
- return;
- }
-
- if ($type eq "GEN_DOMImplementation") {
- $CPPHeaderIncludes{"GEN_DOMDOMImplementation.h"} = 1;
- return;
- }
-
- if ($type eq "IGEN_DOMImplementation") {
- $CPPHeaderIncludes{"IGEN_DOMDOMImplementation.h"} = 1;
- return;
- }
-
- $CPPHeaderIncludes{"$type.h"} = 1;
-}
-
-sub AddForwardDeclarationsForTypeInCPPHeader
-{
- my $type = $codeGenerator->StripModule(shift);
-
- return if $codeGenerator->IsNonPointerType($type) or $codeGenerator->IsStringType($type);
-
- my $interface = GetInterfaceName($type);
- $CPPHeaderForwardDeclarations{$interface} = 1;
-}
-
-sub AddIncludesForTypeInCPPImplementation
-{
- my $type = $codeGenerator->StripModule(shift);
-
- die "Include type not supported!" if $includeCorrector{$type};
-
- return if $codeGenerator->IsNonPointerType($type);
-
- if ($codeGenerator->IsStringType($type)) {
- $CPPImplementationWebCoreIncludes{"AtomicString.h"} = 1;
- $CPPImplementationWebCoreIncludes{"BString.h"} = 1;
- $CPPImplementationWebCoreIncludes{"KURL.h"} = 1;
- return;
- }
-
- # Special casing
- $CPPImplementationWebCoreIncludes{"NameNodeList.h"} = 1 if $type eq "NodeList";
- $CPPImplementationWebCoreIncludes{"CSSMutableStyleDeclaration.h"} = 1 if $type eq "CSSStyleDeclaration";
-
- # Add implementation type
- $CPPImplementationWebCoreIncludes{StripNamespace(IDLTypeToImplementationType($type)) . ".h"} = 1;
-
- my $COMClassName = GetClassName($type);
- $CPPImplementationIncludes{"${COMClassName}.h"} = 1;
-}
-
-sub GetAdditionalInterfaces
-{
- # This function does nothing, but it stays here for future multiple inheritance support.
- my $type = $codeGenerator->StripModule(shift);
- return ();
-}
-
-sub GenerateIDL
-{
- my ($object, $dataNode, $pureInterface) = @_;
-
- my $inInterfaceName = $dataNode->name;
- my $outInterfaceName = GetInterfaceName($inInterfaceName);
- my $uuid = $dataNode->extendedAttributes->{"InterfaceUUID"} || die "All classes require an InterfaceUUID extended attribute.";
-
- my $parentInterfaceName = ($pureInterface) ? "IUnknown" : GetParentInterface($dataNode);
-
- my $numConstants = @{$dataNode->constants};
- my $numAttributes = @{$dataNode->attributes};
- my $numFunctions = @{$dataNode->functions};
-
- # - Add default header template
- @IDLHeader = @licenseTemplate;
- push(@IDLHeader, "\n");
-
- # - INCLUDES -
- push(@IDLHeader, "#ifndef DO_NO_IMPORTS\n");
- push(@IDLHeader, "import \"oaidl.idl\";\n");
- push(@IDLHeader, "import \"ocidl.idl\";\n");
- push(@IDLHeader, "#endif\n\n");
-
- unless ($pureInterface) {
- push(@IDLHeader, "#ifndef DO_NO_IMPORTS\n");
- push(@IDLHeader, "import \"${parentInterfaceName}.idl\";\n");
- push(@IDLHeader, "#endif\n\n");
-
- $IDLDontForwardDeclare{$outInterfaceName} = 1;
- $IDLDontImport{$outInterfaceName} = 1;
- $IDLDontForwardDeclare{$parentInterfaceName} = 1;
- $IDLDontImport{$parentInterfaceName} = 1;
- }
-
- # - Begin
- # -- Attributes
- push(@IDLContent, "[\n");
- push(@IDLContent, " object,\n");
- push(@IDLContent, " oleautomation,\n");
- push(@IDLContent, " uuid(" . $uuid . "),\n");
- push(@IDLContent, " pointer_default(unique)\n");
- push(@IDLContent, "]\n");
-
- # -- Interface
- push(@IDLContent, "interface " . $outInterfaceName . " : " . $parentInterfaceName . "\n");
- push(@IDLContent, "{\n");
-
-
- # - FIXME: Add constants.
-
-
- # - Add attribute getters/setters.
- if ($numAttributes > 0) {
- foreach my $attribute (@{$dataNode->attributes}) {
- my $attributeName = $attribute->signature->name;
- my $attributeIDLType = $attribute->signature->type;
- my $attributeTypeIn = GetCOMTypeIn($attributeIDLType);
- my $attributeTypeOut = GetCOMTypeOut($attributeIDLType);
- my $attributeIsReadonly = ($attribute->type =~ /^readonly/);
-
- AddForwardDeclarationsForTypeInIDL($attributeIDLType);
-
- unless ($attributeIsReadonly) {
- # Setter
- my $setterName = "set" . $codeGenerator->WK_ucfirst($attributeName);
- my $setter = " HRESULT " . $setterName . "([in] " . $attributeTypeIn . ");\n";
- push(@IDLContent, $setter);
- }
-
- # Getter
- my $getter = " HRESULT " . $attributeName . "([out, retval] " . $attributeTypeOut . "*);\n\n";
- push(@IDLContent, $getter);
- }
- }
-
- # - Add functions.
- if ($numFunctions > 0) {
- foreach my $function (@{$dataNode->functions}) {
- my $functionName = $function->signature->name;
- my $returnIDLType = $function->signature->type;
- my $returnType = GetCOMTypeOut($returnIDLType);
- my $noReturn = ($returnType eq "void");
-
- AddForwardDeclarationsForTypeInIDL($returnIDLType);
-
- my @paramArgList = ();
- foreach my $param (@{$function->parameters}) {
- my $paramName = $param->name;
- my $paramIDLType = $param->type;
- my $paramType = GetCOMTypeIn($param->type);
-
- AddForwardDeclarationsForTypeInIDL($paramIDLType);
-
- # Form parameter
- my $parameter = "[in] ${paramType} ${paramName}";
-
- # Add parameter to function signature
- push(@paramArgList, $parameter);
- }
-
- unless ($noReturn) {
- my $resultParameter = "[out, retval] " . $returnType . "* result";
- push(@paramArgList, $resultParameter);
- }
-
- my $functionSig = " HRESULT " . $functionName . "(";
- $functionSig .= join(", ", @paramArgList);
- $functionSig .= ");\n\n";
- push(@IDLContent, $functionSig);
- }
- }
-
- # - End
- push(@IDLContent, "}\n\n");
-}
-
-sub GenerateInterfaceHeader
-{
- my ($object, $dataNode) = @_;
-
- my $IDLType = $dataNode->name;
- my $implementationClass = IDLTypeToImplementationType($IDLType);
- my $implementationClassWithoutNamespace = StripNamespace($implementationClass);
- my $className = GetClassName($IDLType);
- my $interfaceName = GetInterfaceName($IDLType);
-
- # - Add default header template
- @CPPInterfaceHeader = @licenseTemplate;
- push(@CPPInterfaceHeader, "\n");
-
- # - Header guards -
- push(@CPPInterfaceHeader, "#ifndef " . $className . "_h\n");
- push(@CPPInterfaceHeader, "#define " . $className . "_h\n\n");
-
- # - Forward Declarations -
- push(@CPPInterfaceHeader, "interface ${interfaceName};\n\n");
- push(@CPPInterfaceHeader, "namespace WebCore {\n");
- push(@CPPInterfaceHeader, " class ${implementationClassWithoutNamespace};\n");
- push(@CPPInterfaceHeader, "}\n\n");
-
- # - Default Interface Creator -
- push(@CPPInterfaceHeader, "${interfaceName}* to${interfaceName}(${implementationClass}*) { return 0; }\n\n");
-
- push(@CPPInterfaceHeader, "#endif // " . $className . "_h\n");
-}
-
-# -----------------------------------------------------------------------------
-# CPP Helper Functions
-# -----------------------------------------------------------------------------
-
-sub GenerateCPPAttributeSignature
-{
- my ($attribute, $className, $options) = @_;
-
- my $attributeName = $attribute->signature->name;
- my $isReadonly = ($attribute->type =~ /^readonly/);
-
- my $newline = $$options{"NewLines"} ? "\n" : "";
- my $indent = $$options{"Indent"} ? " " x $$options{"Indent"} : "";
- my $semicolon = $$options{"IncludeSemiColon"} ? ";" : "";
- my $virtual = $$options{"AddVirtualKeyword"} ? "virtual " : "";
- my $class = $$options{"UseClassName"} ? "${className}::" : "";
- my $forwarder = $$options{"Forwarder"} ? 1 : 0;
- my $joiner = ($$options{"NewLines"} ? "\n" . $indent . " " : "");
-
- my %attributeSignatures = ();
-
- unless ($isReadonly) {
- my $attributeTypeIn = GetCOMTypeIn($attribute->signature->type);
- my $setterName = "set" . $codeGenerator->WK_ucfirst($attributeName);
- my $setter = $indent . $virtual . "HRESULT STDMETHODCALLTYPE ". $class . $setterName . "(";
- $setter .= $joiner . "/* [in] */ ${attributeTypeIn} ${attributeName})" . $semicolon . $newline;
- if ($forwarder) {
- $setter .= " { return " . $$options{"Forwarder"} . "::" . $setterName . "(${attributeName}); }\n";
- }
- $attributeSignatures{"Setter"} = $setter;
- }
-
- my $attributeTypeOut = GetCOMTypeOut($attribute->signature->type);
- my $getter = $indent . $virtual . "HRESULT STDMETHODCALLTYPE " . $class . $attributeName . "(";
- $getter .= $joiner . "/* [retval][out] */ ${attributeTypeOut}* result)" . $semicolon . $newline;
- if ($forwarder) {
- $getter .= " { return " . $$options{"Forwarder"} . "::" . $attributeName . "(result); }\n";
- }
- $attributeSignatures{"Getter"} = $getter;
-
- return %attributeSignatures;
-}
-
-
-sub GenerateCPPAttribute
-{
- my ($attribute, $className, $implementationClass, $IDLType) = @_;
-
- my $implementationClassWithoutNamespace = StripNamespace($implementationClass);
-
- my $attributeName = $attribute->signature->name;
- my $attributeIDLType = $attribute->signature->type;
- my $hasSetterException = @{$attribute->setterExceptions};
- my $hasGetterException = @{$attribute->getterExceptions};
- my $isReadonly = ($attribute->type =~ /^readonly/);
- my $attributeTypeIsPrimitive = $codeGenerator->IsPrimitiveType($attributeIDLType);
- my $attributeTypeIsString = $codeGenerator->IsStringType($attributeIDLType);
- my $attributeImplementationType = IDLTypeToImplementationType($attributeIDLType);
- my $attributeImplementationTypeWithoutNamespace = StripNamespace($attributeImplementationType);
- my $attributeTypeCOMClassName = GetClassName($attributeIDLType);
-
- $CPPImplementationWebCoreIncludes{"ExceptionCode.h"} = 1 if $hasSetterException or $hasGetterException;
-
- my %signatures = GenerateCPPAttributeSignature($attribute, $className, { "NewLines" => 1,
- "Indent" => 0,
- "IncludeSemiColon" => 0,
- "UseClassName" => 1,
- "AddVirtualKeyword" => 0 });
-
- my %attrbutesToReturn = ();
-
- unless ($isReadonly) {
- my @setterImplementation = ();
- push(@setterImplementation, $signatures{"Setter"});
- push(@setterImplementation, "{\n");
-
- my $setterName = "set" . $codeGenerator->WK_ucfirst($attributeName);
-
- my @setterParams = ();
- if ($attributeTypeIsString) {
- push(@setterParams, $attributeName);
- if ($hasSetterException) {
- push(@setterImplementation, " WebCore::ExceptionCode ec = 0;\n");
- push(@setterParams, "ec");
- }
- } elsif ($attributeTypeIsPrimitive) {
- if ($attribute->signature->extendedAttributes->{"ConvertFromString"}) {
- push(@setterParams, "WebCore::String::number(${attributeName})");
- } elsif ($attributeIDLType eq "boolean") {
- push(@setterParams, "!!${attributeName}");
- } else {
- my $primitiveImplementationType = IDLTypeToImplementationType($attributeIDLType);
- push(@setterParams, "static_cast<${primitiveImplementationType}>(${attributeName})");
- }
-
- if ($hasSetterException) {
- push(@setterImplementation, " WebCore::ExceptionCode ec = 0;\n");
- push(@setterParams, "ec");
- }
- } else {
- $CPPImplementationWebCoreIncludes{"COMPtr.h"} = 1;
-
- push(@setterImplementation, " if (!${attributeName})\n");
- push(@setterImplementation, " return E_POINTER;\n\n");
- push(@setterImplementation, " COMPtr<${attributeTypeCOMClassName}> ptr(Query, ${attributeName});\n");
- push(@setterImplementation, " if (!ptr)\n");
- push(@setterImplementation, " return E_NOINTERFACE;\n");
-
- push(@setterParams, "ptr->impl${attributeImplementationTypeWithoutNamespace}()");
- if ($hasSetterException) {
- push(@setterImplementation, " WebCore::ExceptionCode ec = 0;\n");
- push(@setterParams, "ec");
- }
- }
-
- # FIXME: CHECK EXCEPTION AND DO SOMETHING WITH IT
-
- my $reflect = $attribute->signature->extendedAttributes->{"Reflect"};
- my $reflectURL = $attribute->signature->extendedAttributes->{"ReflectURL"};
- if ($reflect || $reflectURL) {
- my $contentAttributeName = (($reflect || $reflectURL) eq "1") ? $attributeName : ($reflect || $reflectURL);
- my $namespace = $codeGenerator->NamespaceForAttributeName($IDLType, $contentAttributeName);
- $CPPImplementationWebCoreIncludes{"${namespace}.h"} = 1;
- push(@setterImplementation, " impl${implementationClassWithoutNamespace}()->setAttribute(WebCore::${namespace}::${contentAttributeName}Attr, " . join(", ", @setterParams) . ");\n");
- } else {
- push(@setterImplementation, " impl${implementationClassWithoutNamespace}()->${setterName}(" . join(", ", @setterParams) . ");\n");
- }
- push(@setterImplementation, " return S_OK;\n");
- push(@setterImplementation, "}\n\n");
-
- $attrbutesToReturn{"Setter"} = join("", @setterImplementation);
- }
-
- my @getterImplementation = ();
- push(@getterImplementation, $signatures{"Getter"});
- push(@getterImplementation, "{\n");
- push(@getterImplementation, " if (!result)\n");
- push(@getterImplementation, " return E_POINTER;\n\n");
-
- my $implementationGetter;
- my $reflect = $attribute->signature->extendedAttributes->{"Reflect"};
- my $reflectURL = $attribute->signature->extendedAttributes->{"ReflectURL"};
- if ($reflect || $reflectURL) {
- my $contentAttributeName = (($reflect || $reflectURL) eq "1") ? $attributeName : ($reflect || $reflectURL);
- my $namespace = $codeGenerator->NamespaceForAttributeName($IDLType, $contentAttributeName);
- $implIncludes{"${namespace}.h"} = 1;
- my $getAttributeFunctionName = $reflectURL ? "getURLAttribute" : "getAttribute";
- $implementationGetter = "impl${implementationClassWithoutNamespace}()->${getAttributeFunctionName}(WebCore::${namespace}::${contentAttributeName}Attr)";
- } else {
- $implementationGetter = "impl${implementationClassWithoutNamespace}()->" . $codeGenerator->WK_lcfirst($attributeName) . "(" . ($hasGetterException ? "ec" : ""). ")";
- }
-
- push(@getterImplementation, " WebCore::ExceptionCode ec = 0;\n") if $hasGetterException;
-
- if ($attributeTypeIsString) {
- push(@getterImplementation, " *result = WebCore::BString(${implementationGetter}).release();\n");
- } elsif ($attributeTypeIsPrimitive) {
- if ($attribute->signature->extendedAttributes->{"ConvertFromString"}) {
- push(@getterImplementation, " *result = static_cast<${attributeTypeCOMClassName}>(${implementationGetter}.toInt());\n");
- } else {
- push(@getterImplementation, " *result = static_cast<${attributeTypeCOMClassName}>(${implementationGetter});\n");
- }
- } else {
- $CPPImplementationIncludesAngle{"wtf/GetPtr.h"} = 1;
- my $attributeTypeCOMInterfaceName = GetInterfaceName($attributeIDLType);
- push(@getterImplementation, " *result = 0;\n");
- push(@getterImplementation, " ${attributeImplementationType}* resultImpl = WTF::getPtr(${implementationGetter});\n");
- push(@getterImplementation, " if (!resultImpl)\n");
- push(@getterImplementation, " return E_POINTER;\n\n");
- push(@getterImplementation, " *result = to${attributeTypeCOMInterfaceName}(resultImpl);\n");
- }
-
- # FIXME: CHECK EXCEPTION AND DO SOMETHING WITH IT
-
- push(@getterImplementation, " return S_OK;\n");
- push(@getterImplementation, "}\n\n");
-
- $attrbutesToReturn{"Getter"} = join("", @getterImplementation);
-
- return %attrbutesToReturn;
-}
-
-sub GenerateCPPFunctionSignature
-{
- my ($function, $className, $options) = @_;
-
- my $functionName = $function->signature->name;
- my $returnIDLType = $function->signature->type;
- my $returnType = GetCOMTypeOut($returnIDLType);
- my $noReturn = ($returnType eq "void");
-
- my $newline = $$options{"NewLines"} ? "\n" : "";
- my $indent = $$options{"Indent"} ? " " x $$options{"Indent"} : "";
- my $semicolon = $$options{"IncludeSemiColon"} ? ";" : "";
- my $virtual = $$options{"AddVirtualKeyword"} ? "virtual " : "";
- my $class = $$options{"UseClassName"} ? "${className}::" : "";
- my $forwarder = $$options{"Forwarder"} ? 1 : 0;
- my $joiner = ($$options{"NewLines"} ? "\n" . $indent . " " : " ");
-
- my @paramArgList = ();
- foreach my $param (@{$function->parameters}) {
- my $paramName = $param->name;
- my $paramType = GetCOMTypeIn($param->type);
- my $parameter = "/* [in] */ ${paramType} ${paramName}";
- push(@paramArgList, $parameter);
- }
-
- unless ($noReturn) {
- my $resultParameter .= "/* [out, retval] */ ${returnType}* result";
- push(@paramArgList, $resultParameter);
- }
-
- my $functionSig = $indent . $virtual . "HRESULT STDMETHODCALLTYPE " . $class . $functionName . "(";
- $functionSig .= $joiner . join("," . $joiner, @paramArgList) if @paramArgList > 0;
- $functionSig .= ")" . $semicolon . $newline;
- if ($forwarder) {
- my @paramNameList = ();
- push(@paramNameList, $_->name) foreach (@{$function->parameters});
- push(@paramNameList, "result") unless $noReturn;
- $functionSig .= " { return " . $$options{"Forwarder"} . "::" . $functionName . "(" . join(", ", @paramNameList) . "); }\n";
- }
-
- return $functionSig
-}
-
-sub GenerateCPPFunction
-{
- my ($function, $className, $implementationClass) = @_;
-
- my @functionImplementation = ();
-
- my $signature = GenerateCPPFunctionSignature($function, $className, { "NewLines" => 1,
- "Indent" => 0,
- "IncludeSemiColon" => 0,
- "UseClassName" => 1,
- "AddVirtualKeyword" => 0 });
-
- my $implementationClassWithoutNamespace = StripNamespace($implementationClass);
-
- my $functionName = $function->signature->name;
- my $returnIDLType = $function->signature->type;
- my $noReturn = ($returnIDLType eq "void");
- my $raisesExceptions = @{$function->raisesExceptions};
-
- AddIncludesForTypeInCPPImplementation($returnIDLType);
- $CPPImplementationWebCoreIncludes{"ExceptionCode.h"} = 1 if $raisesExceptions;
-
- my %needsCustom = ();
- my @parameterInitialization = ();
- my @parameterList = ();
- foreach my $param (@{$function->parameters}) {
- my $paramName = $param->name;
- my $paramIDLType = $param->type;
-
- my $paramTypeIsPrimitive = $codeGenerator->IsPrimitiveType($paramIDLType);
- my $paramTypeIsString = $codeGenerator->IsStringType($paramIDLType);
-
- $needsCustom{"NodeToReturn"} = $paramName if $param->extendedAttributes->{"Return"};
-
- AddIncludesForTypeInCPPImplementation($paramIDLType);
-
- # FIXME: We may need to null check the arguments as well
-
- if ($paramTypeIsString) {
- push(@parameterList, $paramName);
- } elsif ($paramTypeIsPrimitive) {
- if ($paramIDLType eq "boolean") {
- push(@parameterList, "!!${paramName}");
- } else {
- my $primitiveImplementationType = IDLTypeToImplementationType($paramIDLType);
- push(@parameterList, "static_cast<${primitiveImplementationType}>(${paramName})");
- }
- } else {
- $CPPImplementationWebCoreIncludes{"COMPtr.h"} = 1;
-
- $needsCustom{"CanReturnEarly"} = 1;
-
- my $paramTypeCOMClassName = GetClassName($paramIDLType);
- my $paramTypeImplementationWithoutNamespace = StripNamespace(IDLTypeToImplementationType($paramIDLType));
- my $ptrName = "ptrFor" . $codeGenerator->WK_ucfirst($paramName);
- my $paramInit = " COMPtr<${paramTypeCOMClassName}> ${ptrName}(Query, ${paramName});\n";
- $paramInit .= " if (!${ptrName})\n";
- $paramInit .= " return E_NOINTERFACE;";
- push(@parameterInitialization, $paramInit);
- push(@parameterList, "${ptrName}->impl${paramTypeImplementationWithoutNamespace}()");
- }
- }
-
- push(@parameterList, "ec") if $raisesExceptions;
-
- my $implementationGetter = "impl${implementationClassWithoutNamespace}()";
-
- my $callSigBegin = " ";
- my $callSigMiddle = "${implementationGetter}->" . $codeGenerator->WK_lcfirst($functionName) . "(" . join(", ", @parameterList) . ")";
- my $callSigEnd = ";\n";
-
- if (defined $needsCustom{"NodeToReturn"}) {
- my $nodeToReturn = $needsCustom{"NodeToReturn"};
- $callSigBegin .= "if (";
- $callSigEnd = ")\n";
- $callSigEnd .= " *result = ${nodeToReturn};";
- } elsif (!$noReturn) {
- my $returnTypeIsString = $codeGenerator->IsStringType($returnIDLType);
- my $returnTypeIsPrimitive = $codeGenerator->IsPrimitiveType($returnIDLType);
-
- if ($returnTypeIsString) {
- $callSigBegin .= "*result = WebCore::BString(";
- $callSigEnd = ").release();\n";
- } elsif ($returnTypeIsPrimitive) {
- my $primitiveCOMType = GetClassName($returnIDLType);
- $callSigBegin .= "*result = static_cast<${primitiveCOMType}>(";
- $callSigEnd = ");";
- } else {
- $CPPImplementationIncludesAngle{"wtf/GetPtr.h"} = 1;
- my $returnImplementationType = IDLTypeToImplementationType($returnIDLType);
- my $returnTypeCOMInterfaceName = GetInterfaceName($returnIDLType);
- $callSigBegin .= "${returnImplementationType}* resultImpl = WTF::getPtr(";
- $callSigEnd = ");\n";
- $callSigEnd .= " if (!resultImpl)\n";
- $callSigEnd .= " return E_POINTER;\n\n";
- $callSigEnd .= " *result = to${returnTypeCOMInterfaceName}(resultImpl);";
- }
- }
-
- push(@functionImplementation, $signature);
- push(@functionImplementation, "{\n");
- unless ($noReturn) {
- push(@functionImplementation, " if (!result)\n");
- push(@functionImplementation, " return E_POINTER;\n\n");
- push(@functionImplementation, " *result = 0;\n\n") if $needsCustom{"CanReturnEarly"};
- }
- push(@functionImplementation, " WebCore::ExceptionCode ec = 0;\n") if $raisesExceptions; # FIXME: CHECK EXCEPTION AND DO SOMETHING WITH IT
- push(@functionImplementation, join("\n", @parameterInitialization) . (@parameterInitialization > 0 ? "\n" : ""));
- push(@functionImplementation, $callSigBegin . $callSigMiddle . $callSigEnd . "\n");
- push(@functionImplementation, " return S_OK;\n");
- push(@functionImplementation, "}\n\n");
-
- return join("", @functionImplementation);
-}
-
-
-# -----------------------------------------------------------------------------
-# CPP Header
-# -----------------------------------------------------------------------------
-
-sub GenerateCPPHeader
-{
- my ($object, $dataNode) = @_;
-
- my $IDLType = $dataNode->name;
- my $implementationClass = IDLTypeToImplementationType($IDLType);
- my $implementationClassWithoutNamespace = StripNamespace($implementationClass);
- my $className = GetClassName($IDLType);
- my $interfaceName = GetInterfaceName($IDLType);
-
- my $parentClassName = GetParentClass($dataNode);
- my @otherInterfacesImplemented = GetAdditionalInterfaces($IDLType);
- foreach my $otherInterface (@otherInterfacesImplemented) {
- push(@additionalInterfaceDefinitions, $codeGenerator->ParseInterface($otherInterface));
- }
-
- # FIXME: strip whitespace from UUID
- my $uuid = $dataNode->extendedAttributes->{"ImplementationUUID"} || die "All classes require an ImplementationUUID extended attribute.";
-
- my $numAttributes = @{$dataNode->attributes};
- my $numFunctions = @{$dataNode->functions};
-
- # - Add default header template
- @CPPHeaderHeader = @licenseTemplate;
- push(@CPPHeaderHeader, "\n");
-
- # - Header guards -
- push(@CPPHeaderHeader, "#ifndef " . $className . "_h\n");
- push(@CPPHeaderHeader, "#define " . $className . "_h\n\n");
-
- AddIncludesForTypeInCPPHeader($interfaceName);
- AddIncludesForTypeInCPPHeader($parentClassName);
- $CPPHeaderDontForwardDeclarations{$className} = 1;
- $CPPHeaderDontForwardDeclarations{$interfaceName} = 1;
- $CPPHeaderDontForwardDeclarations{$parentClassName} = 1;
-
- # -- Forward declare implementation type
- push(@CPPHeaderContent, "namespace WebCore {\n");
- push(@CPPHeaderContent, " class ". StripNamespace($implementationClass) . ";\n");
- push(@CPPHeaderContent, "}\n\n");
-
- # -- Start Class --
- my @parentsClasses = ($parentClassName, $interfaceName);
- push(@parentsClasses, map { GetInterfaceName($_) } @otherInterfacesImplemented);
- push(@CPPHeaderContent, "class __declspec(uuid(\"$uuid\")) ${className} : " . join(", ", map { "public $_" } @parentsClasses) . " {\n");
-
- # Add includes for all additional interfaces to implement
- map { AddIncludesForTypeInCPPHeader(GetInterfaceName($_)) } @otherInterfacesImplemented;
-
- # -- BASICS --
- # FIXME: The constructor and destructor should be protected, but the current design of
- # createInstance requires them to be public. One solution is to friend the constructor
- # of the top-level-class with every one of its child classes, but that requires information
- # this script currently does not have, though possibly could determine.
- push(@CPPHeaderContent, "public:\n");
- push(@CPPHeaderContent, " ${className}(${implementationClass}*);\n");
- push(@CPPHeaderContent, " virtual ~${className}();\n\n");
-
- push(@CPPHeaderContent, "public:\n");
- push(@CPPHeaderContent, " static ${className}* createInstance(${implementationClass}*);\n\n");
-
- push(@CPPHeaderContent, " // IUnknown\n");
- push(@CPPHeaderContent, " virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID, void** ppvObject);\n");
- push(@CPPHeaderContent, " virtual ULONG STDMETHODCALLTYPE AddRef() { return ${parentClassName}::AddRef(); }\n");
- push(@CPPHeaderContent, " virtual ULONG STDMETHODCALLTYPE Release() { return ${parentClassName}::Release(); }\n\n");
-
-
- # -- Parent Class Forwards --
- if (@{$dataNode->parents}) {
- my %attributeNameSet = map {($_->signature->name, 1)} @{$dataNode->attributes};
- my %functionNameSet = map {($_->signature->name, 1)} @{$dataNode->functions};
-
- my @parentLists = $codeGenerator->GetMethodsAndAttributesFromParentClasses($dataNode);
- push(@CPPHeaderContent, "\n");
- foreach my $parentHash (@parentLists) {
-
- push(@CPPHeaderContent, " // " . GetInterfaceName($parentHash->{'name'}) . $DASHES . "\n");
-
- my @attributeList = @{$parentHash->{'attributes'}};
- push(@CPPHeaderContent, " // Attributes\n");
- foreach my $attribute (@attributeList) {
- # Don't forward an attribute that this class redefines.
- next if $attributeNameSet{$attribute->signature->name};
-
- AddForwardDeclarationsForTypeInCPPHeader($attribute->signature->type);
-
- my %attributes = GenerateCPPAttributeSignature($attribute, $className, { "NewLines" => 0,
- "Indent" => 4,
- "IncludeSemiColon" => 0,
- "AddVirtualKeyword" => 1,
- "UseClassName" => 0,
- "Forwarder" => $parentClassName });
- push(@CPPHeaderContent, values(%attributes));
- }
-
- # Add attribute names to attribute names set in case other ancestors
- # also define them.
- $attributeNameSet{$_->signature->name} = 1 foreach @attributeList;
-
- push(@CPPHeaderContent, "\n");
-
- my @functionList = @{$parentHash->{'functions'}};
- push(@CPPHeaderContent, " // Functions\n");
- foreach my $function (@functionList) {
- # Don't forward a function that this class redefines.
- next if $functionNameSet{$function->signature->name};
-
- AddForwardDeclarationsForTypeInCPPHeader($function->signature->type);
- AddForwardDeclarationsForTypeInCPPHeader($_->type) foreach (@{$function->parameters});
-
- my $functionSig = GenerateCPPFunctionSignature($function, $className, { "NewLines" => 0,
- "Indent" => 4,
- "IncludeSemiColon" => 0,
- "AddVirtualKeyword" => 1,
- "UseClassName" => 0,
- "Forwarder" => $parentClassName });
-
- push(@CPPHeaderContent, $functionSig);
- }
- # Add functions names to functions names set in case other ancestors
- # also define them.
- $functionNameSet{$_->signature->name} = 1 foreach @functionList;
-
- push(@CPPHeaderContent, "\n");
- }
- }
-
- # - Additional interfaces to implement -
- foreach my $interfaceToImplement (@additionalInterfaceDefinitions) {
- my $IDLTypeOfInterfaceToImplement = $interfaceToImplement->name;
- my $nameOfInterfaceToImplement = GetInterfaceName($IDLTypeOfInterfaceToImplement);
- my $numAttributesInInterface = @{$interfaceToImplement->attributes};
- my $numFunctionsInInterface = @{$interfaceToImplement->functions};
-
- push(@CPPHeaderContent, " // ${nameOfInterfaceToImplement} ${DASHES}\n\n");
-
- # - Add attribute getters/setters.
- if ($numAttributesInInterface > 0) {
- push(@CPPHeaderContent, " // Attributes\n\n");
- foreach my $attribute (@{$interfaceToImplement->attributes}) {
- AddForwardDeclarationsForTypeInCPPHeader($attribute->signature->type);
-
- my %attributeSigs = GenerateCPPAttributeSignature($attribute, $className, { "NewLines" => 1,
- "Indent" => 4,
- "IncludeSemiColon" => 1,
- "AddVirtualKeyword" => 1,
- "UseClassName" => 0 });
-
- push(@CPPHeaderContent, values(%attributeSigs));
- push(@CPPHeaderContent, "\n");
- }
- }
-
- # - Add functions.
- if ($numFunctionsInInterface > 0) {
- push(@CPPHeaderContent, " // Functions\n\n");
- foreach my $function (@{$interfaceToImplement->functions}) {
- AddForwardDeclarationsForTypeInCPPHeader($function->signature->type);
- AddForwardDeclarationsForTypeInCPPHeader($_->type) foreach (@{$function->parameters});
-
- my $functionSig = GenerateCPPFunctionSignature($function, $className, { "NewLines" => 1,
- "Indent" => 4,
- "IncludeSemiColon" => 1,
- "AddVirtualKeyword" => 1,
- "UseClassName" => 0 });
-
- push(@CPPHeaderContent, $functionSig);
- push(@CPPHeaderContent, "\n");
- }
- }
- }
-
- if ($numAttributes > 0 || $numFunctions > 0) {
- push(@CPPHeaderContent, " // ${interfaceName} ${DASHES}\n\n");
- }
-
- # - Add constants COMING SOON
-
- # - Add attribute getters/setters.
- if ($numAttributes > 0) {
- push(@CPPHeaderContent, " // Attributes\n\n");
- foreach my $attribute (@{$dataNode->attributes}) {
- AddForwardDeclarationsForTypeInCPPHeader($attribute->signature->type);
-
- my %attributeSigs = GenerateCPPAttributeSignature($attribute, $className, { "NewLines" => 1,
- "Indent" => 4,
- "IncludeSemiColon" => 1,
- "AddVirtualKeyword" => 1,
- "UseClassName" => 0 });
-
- push(@CPPHeaderContent, values(%attributeSigs));
- push(@CPPHeaderContent, "\n");
- }
- }
-
- # - Add functions.
- if ($numFunctions > 0) {
- push(@CPPHeaderContent, " // Functions\n\n");
- foreach my $function (@{$dataNode->functions}) {
- AddForwardDeclarationsForTypeInCPPHeader($function->signature->type);
- AddForwardDeclarationsForTypeInCPPHeader($_->type) foreach (@{$function->parameters});
-
- my $functionSig = GenerateCPPFunctionSignature($function, $className, { "NewLines" => 1,
- "Indent" => 4,
- "IncludeSemiColon" => 1,
- "AddVirtualKeyword" => 1,
- "UseClassName" => 0 });
-
- push(@CPPHeaderContent, $functionSig);
- push(@CPPHeaderContent, "\n");
- }
- }
-
- push(@CPPHeaderContent, " ${implementationClass}* impl${implementationClassWithoutNamespace}() const;\n");
-
- if (@{$dataNode->parents} == 0) {
- AddIncludesForTypeInCPPHeader("wtf/RefPtr", 1);
- push(@CPPHeaderContent, "\n");
- push(@CPPHeaderContent, " ${implementationClass}* impl() const { return m_impl.get(); }\n\n");
- push(@CPPHeaderContent, "private:\n");
- push(@CPPHeaderContent, " RefPtr<${implementationClass}> m_impl;\n");
- }
-
- # -- End Class --
- push(@CPPHeaderContent, "};\n\n");
-
- # -- Default Interface Creator --
- push(@CPPHeaderContent, "${interfaceName}* to${interfaceName}(${implementationClass}*);\n\n");
-
- push(@CPPHeaderContent, "#endif // " . $className . "_h\n");
-}
-
-
-# -----------------------------------------------------------------------------
-# CPP Implementation
-# -----------------------------------------------------------------------------
-
-sub GenerateCPPImplementation
-{
- my ($object, $dataNode) = @_;
-
- my $IDLType = $dataNode->name;
- my $implementationClass = IDLTypeToImplementationType($IDLType);
- my $implementationClassWithoutNamespace = StripNamespace($implementationClass);
- my $className = GetClassName($IDLType);
- my $interfaceName = GetInterfaceName($IDLType);
-
- my $parentClassName = GetParentClass($dataNode);
- my $isBaseClass = (@{$dataNode->parents} == 0);
-
- my $uuid = $dataNode->extendedAttributes->{"ImplementationUUID"} || die "All classes require an ImplementationUUID extended attribute.";
-
- my $numAttributes = @{$dataNode->attributes};
- my $numFunctions = @{$dataNode->functions};
-
- # - Add default header template
- @CPPImplementationHeader = @licenseTemplate;
- push(@CPPImplementationHeader, "\n");
-
- push(@CPPImplementationHeader, "#include \"config.h\"\n");
- push(@CPPImplementationHeader, "#include \"WebKitDLL.h\"\n");
- push(@CPPImplementationHeader, "#include " . ($className eq "GEN_DOMImplementation" ? "\"GEN_DOMDOMImplementation.h\"" : "\"${className}.h\"") . "\n");
- $CPPImplementationDontIncludes{"${className}.h"} = 1;
- $CPPImplementationWebCoreIncludes{"${implementationClassWithoutNamespace}.h"} = 1;
-
- # -- Constructor --
- push(@CPPImplementationContent, "${className}::${className}(${implementationClass}* impl)\n");
- if ($isBaseClass) {
- push(@CPPImplementationContent, " : m_impl(impl)\n");
- push(@CPPImplementationContent, "{\n");
- push(@CPPImplementationContent, " ASSERT_ARG(impl, impl);\n");
- push(@CPPImplementationContent, "}\n\n");
- } else {
- push(@CPPImplementationContent, " : ${parentClassName}(impl)\n");
- push(@CPPImplementationContent, "{\n");
- push(@CPPImplementationContent, "}\n\n");
- }
-
- # -- Destructor --
- push(@CPPImplementationContent, "${className}::~${className}()\n");
- push(@CPPImplementationContent, "{\n");
- if ($isBaseClass) {
- $CPPImplementationIncludes{"DOMCreateInstance.h"} = 1;
- push(@CPPImplementationContent, " removeDOMWrapper(impl());\n");
- }
- push(@CPPImplementationContent, "}\n\n");
-
- push(@CPPImplementationContent, "${implementationClass}* ${className}::impl${implementationClassWithoutNamespace}() const\n");
- push(@CPPImplementationContent, "{\n");
- push(@CPPImplementationContent, " return static_cast<${implementationClass}*>(impl());\n");
- push(@CPPImplementationContent, "}\n\n");
-
- # Base classes must implement the createInstance method externally.
- if (@{$dataNode->parents} != 0) {
- push(@CPPImplementationContent, "${className}* ${className}::createInstance(${implementationClass}* impl)\n");
- push(@CPPImplementationContent, "{\n");
- push(@CPPImplementationContent, " return static_cast<${className}*>(${parentClassName}::createInstance(impl));\n");
- push(@CPPImplementationContent, "}\n");
- }
-
- push(@CPPImplementationContent, "// IUnknown $DASHES\n\n");
-
- # -- QueryInterface --
- push(@CPPImplementationContent, "HRESULT STDMETHODCALLTYPE ${className}::QueryInterface(REFIID riid, void** ppvObject)\n");
- push(@CPPImplementationContent, "{\n");
- push(@CPPImplementationContent, " *ppvObject = 0;\n");
- push(@CPPImplementationContent, " if (IsEqualGUID(riid, IID_${interfaceName}))\n");
- push(@CPPImplementationContent, " *ppvObject = reinterpret_cast<${interfaceName}*>(this);\n");
- push(@CPPImplementationContent, " else if (IsEqualGUID(riid, __uuidof(${className})))\n");
- push(@CPPImplementationContent, " *ppvObject = reinterpret_cast<${className}*>(this);\n");
- push(@CPPImplementationContent, " else\n");
- push(@CPPImplementationContent, " return ${parentClassName}::QueryInterface(riid, ppvObject);\n\n");
- push(@CPPImplementationContent, " AddRef();\n");
- push(@CPPImplementationContent, " return S_OK;\n");
- push(@CPPImplementationContent, "}\n\n");
-
- # - Additional interfaces to implement -
- foreach my $interfaceToImplement (@additionalInterfaceDefinitions) {
- my $IDLTypeOfInterfaceToImplement = $interfaceToImplement->name;
- my $nameOfInterfaceToImplement = GetInterfaceName($IDLTypeOfInterfaceToImplement);
- my $numAttributesInInterface = @{$interfaceToImplement->attributes};
- my $numFunctionsInInterface = @{$interfaceToImplement->functions};
-
- push(@CPPImplementationContent, " // ${nameOfInterfaceToImplement} ${DASHES}\n\n");
-
- if ($numAttributesInInterface > 0) {
- push(@CPPImplementationContent, "// Attributes\n\n");
- foreach my $attribute (@{$interfaceToImplement->attributes}) {
- # FIXME: Do this in one step.
- # FIXME: Implement exception handling.
-
- AddIncludesForTypeInCPPImplementation($attribute->signature->type);
-
- my %attributes = GenerateCPPAttribute($attribute, $className, $implementationClass, $IDLType);
- push(@CPPImplementationContent, values(%attributes));
- }
- }
-
- # - Add functions.
- if ($numFunctionsInInterface > 0) {
- push(@CPPImplementationContent, "// Functions\n\n");
-
- foreach my $function (@{$interfaceToImplement->functions}) {
- my $functionImplementation = GenerateCPPFunction($function, $className, $implementationClass);
- push(@CPPImplementationContent, $functionImplementation);
- }
- }
- }
-
- push(@CPPImplementationContent, "// ${interfaceName} $DASHES\n\n");
-
- # - Add attribute getters/setters.
- if ($numAttributes > 0) {
- push(@CPPImplementationContent, "// Attributes\n\n");
- foreach my $attribute (@{$dataNode->attributes}) {
- # FIXME: do this in one step
- my $hasSetterException = @{$attribute->setterExceptions};
- my $hasGetterException = @{$attribute->getterExceptions};
-
- AddIncludesForTypeInCPPImplementation($attribute->signature->type);
-
- my %attributes = GenerateCPPAttribute($attribute, $className, $implementationClass, $IDLType);
- push(@CPPImplementationContent, values(%attributes));
- }
- }
-
- # - Add functions.
- if ($numFunctions > 0) {
- push(@CPPImplementationContent, "// Functions\n\n");
-
- foreach my $function (@{$dataNode->functions}) {
- my $functionImplementation = GenerateCPPFunction($function, $className, $implementationClass);
- push(@CPPImplementationContent, $functionImplementation);
- }
- }
-
- # - Default implementation for interface creator.
- # FIXME: add extended attribute to add custom implementation if necessary.
- push(@CPPImplementationContent, "${interfaceName}* to${interfaceName}(${implementationClass}* impl)\n");
- push(@CPPImplementationContent, "{\n");
- push(@CPPImplementationContent, " return ${className}::createInstance(impl);\n");
- push(@CPPImplementationContent, "}\n");
-}
-
-sub WriteData
-{
- my ($object, $name, $pureInterface) = @_;
-
- # -- IDL --
- my $IDLFileName = "$outputDir/I" . $TEMP_PREFIX . "DOM" . $name . ".idl";
- unlink($IDLFileName);
-
- # Write to output IDL.
- open(OUTPUTIDL, ">$IDLFileName") or die "Couldn't open file $IDLFileName";
-
- # Add header
- print OUTPUTIDL @IDLHeader;
-
- # Add forward declarations and imorts
- delete $IDLForwardDeclarations{keys(%IDLDontForwardDeclare)};
- delete $IDLImports{keys(%IDLDontImport)};
-
- print OUTPUTIDL map { "cpp_quote(\"interface $_;\")\n" } sort keys(%IDLForwardDeclarations);
- print OUTPUTIDL "\n";
-
- print OUTPUTIDL map { "interface $_;\n" } sort keys(%IDLForwardDeclarations);
- print OUTPUTIDL "\n";
- print OUTPUTIDL "#ifndef DO_NO_IMPORTS\n";
- print OUTPUTIDL map { ($_ eq "IGEN_DOMImplementation") ? "import \"IGEN_DOMDOMImplementation.idl\";\n" : "import \"$_.idl\";\n" } sort keys(%IDLImports);
- print OUTPUTIDL "#endif\n";
- print OUTPUTIDL "\n";
-
- # Add content
- print OUTPUTIDL @IDLContent;
-
- close(OUTPUTIDL);
-
- @IDLHeader = ();
- @IDLContent = ();
-
- if ($pureInterface) {
- my $CPPInterfaceHeaderFileName = "$outputDir/" . $TEMP_PREFIX . "DOM" . $name . ".h";
- unlink($CPPInterfaceHeaderFileName);
-
- open(OUTPUTCPPInterfaceHeader, ">$CPPInterfaceHeaderFileName") or die "Couldn't open file $CPPInterfaceHeaderFileName";
-
- print OUTPUTCPPInterfaceHeader @CPPInterfaceHeader;
-
- close(OUTPUTCPPInterfaceHeader);
-
- @CPPInterfaceHeader = ();
- } else {
- my $CPPHeaderFileName = "$outputDir/" . $TEMP_PREFIX . "DOM" . $name . ".h";
- unlink($CPPHeaderFileName);
-
- # -- CPP Header --
- open(OUTPUTCPPHeader, ">$CPPHeaderFileName") or die "Couldn't open file $CPPHeaderFileName";
-
- # Add header
- print OUTPUTCPPHeader @CPPHeaderHeader;
-
- # Add includes
- print OUTPUTCPPHeader map { ($_ eq "GEN_DOMImplementation.h") ? "#include \"GEN_DOMDOMImplementation.h\"\n" : "#include \"$_\"\n" } sort keys(%CPPHeaderIncludes);
- print OUTPUTCPPHeader map { "#include <$_>\n" } sort keys(%CPPHeaderIncludesAngle);
-
- foreach my $dontDeclare (keys(%CPPHeaderDontForwardDeclarations)) {
- delete $CPPHeaderForwardDeclarations{$dontDeclare} if ($CPPHeaderForwardDeclarations{$dontDeclare});
- }
- print OUTPUTCPPHeader "\n";
- print OUTPUTCPPHeader map { "interface $_;\n" } sort keys(%CPPHeaderForwardDeclarations);
- print OUTPUTCPPHeader "\n";
-
- # Add content
- print OUTPUTCPPHeader @CPPHeaderContent;
-
- close(OUTPUTCPPHeader);
-
- @CPPHeaderHeader = ();
- @CPPHeaderContent = ();
-
-
- # -- CPP Implementation --
- my $CPPImplementationFileName = "$outputDir/" . $TEMP_PREFIX . "DOM" . $name . ".cpp";
- unlink($CPPImplementationFileName);
-
- open(OUTPUTCPPImplementation, ">$CPPImplementationFileName") or die "Couldn't open file $CPPImplementationFileName";
-
- # Add header
- print OUTPUTCPPImplementation @CPPImplementationHeader;
- print OUTPUTCPPImplementation "\n";
-
- # Add includes
- foreach my $dontInclude (keys(%CPPImplementationDontIncludes)) {
- delete $CPPImplementationIncludes{$dontInclude} if ($CPPImplementationIncludes{$dontInclude});
- }
- print OUTPUTCPPImplementation map { ($_ eq "GEN_DOMImplementation.h") ? "#include \"GEN_DOMDOMImplementation.h\"\n" : "#include \"$_\"\n" } sort keys(%CPPImplementationIncludes);
- print OUTPUTCPPImplementation map { "#include <$_>\n" } sort keys(%CPPImplementationIncludesAngle);
- print OUTPUTCPPImplementation "\n";
-
- print OUTPUTCPPImplementation "#pragma warning(push, 0)\n";
- print OUTPUTCPPImplementation map { "#include <WebCore/$_>\n" } sort keys(%CPPImplementationWebCoreIncludes);
- print OUTPUTCPPImplementation "#pragma warning(pop)\n";
-
- # Add content
- print OUTPUTCPPImplementation @CPPImplementationContent;
-
- close(OUTPUTCPPImplementation);
-
- @CPPImplementationHeader = ();
- @CPPImplementationContent = ();
- }
-}
-
-1;
diff --git a/WebCore/css/CSSCharsetRule.idl b/WebCore/css/CSSCharsetRule.idl
index 29e74d6..2b158ff 100644
--- a/WebCore/css/CSSCharsetRule.idl
+++ b/WebCore/css/CSSCharsetRule.idl
@@ -21,10 +21,7 @@
module css {
// Introduced in DOM Level 2:
- interface [
- InterfaceUUID=94180bad-a74e-4df9-adbc-6ce4e5b96155,
- ImplementationUUID=354aa39e-ad53-4e9a-a927-80c3966c47f2
- ] CSSCharsetRule : CSSRule {
+ interface CSSCharsetRule : CSSRule {
#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
readonly attribute [ConvertNullStringTo=Null] DOMString encoding;
#else
diff --git a/WebCore/css/CSSFontFaceRule.idl b/WebCore/css/CSSFontFaceRule.idl
index 2239bad..bd38a61 100644
--- a/WebCore/css/CSSFontFaceRule.idl
+++ b/WebCore/css/CSSFontFaceRule.idl
@@ -21,10 +21,7 @@
module css {
// Introduced in DOM Level 2:
- interface [
- InterfaceUUID=8afa4b1a-39fe-49fb-be6d-4d56e81d9b4a,
- ImplementationUUID=5a7971d9-5aad-4ed7-be67-3a1644560256
- ] CSSFontFaceRule : CSSRule {
+ interface CSSFontFaceRule : CSSRule {
readonly attribute CSSStyleDeclaration style;
};
diff --git a/WebCore/css/CSSImportRule.idl b/WebCore/css/CSSImportRule.idl
index 972c4dd..8e60905 100644
--- a/WebCore/css/CSSImportRule.idl
+++ b/WebCore/css/CSSImportRule.idl
@@ -21,10 +21,7 @@
module css {
// Introduced in DOM Level 2:
- interface [
- InterfaceUUID=8f60b3a2-ebf0-484d-a714-47a9974a6a9e,
- ImplementationUUID=437ea93c-68e5-4897-85fe-e161653801eb
- ] CSSImportRule : CSSRule {
+ interface CSSImportRule : CSSRule {
readonly attribute [ConvertNullStringTo=Null] DOMString href;
readonly attribute stylesheets::MediaList media;
readonly attribute CSSStyleSheet styleSheet;
diff --git a/WebCore/css/CSSMediaRule.idl b/WebCore/css/CSSMediaRule.idl
index fcebde3..813bd70 100644
--- a/WebCore/css/CSSMediaRule.idl
+++ b/WebCore/css/CSSMediaRule.idl
@@ -21,10 +21,7 @@
module css {
// Introduced in DOM Level 2:
- interface [
- InterfaceUUID=9c623c09-2677-4d28-ba90-826da0ae316a,
- ImplementationUUID=30493ec9-e139-4e9e-ae24-cc8f532006d9
- ] CSSMediaRule : CSSRule {
+ interface CSSMediaRule : CSSRule {
readonly attribute stylesheets::MediaList media;
readonly attribute CSSRuleList cssRules;
diff --git a/WebCore/css/CSSPageRule.idl b/WebCore/css/CSSPageRule.idl
index 731c12f..6b50b6d 100644
--- a/WebCore/css/CSSPageRule.idl
+++ b/WebCore/css/CSSPageRule.idl
@@ -21,10 +21,7 @@
module css {
// Introduced in DOM Level 2:
- interface [
- InterfaceUUID=4e8d9d26-65ca-483f-a6d4-be1a25905056,
- ImplementationUUID=d8e40379-8b0e-4dce-b1f8-636dcf055a5f
- ] CSSPageRule : CSSRule {
+ interface CSSPageRule : CSSRule {
attribute [ConvertNullStringTo=Null, ConvertNullToNullString] DOMString selectorText
setter raises(DOMException);
diff --git a/WebCore/css/CSSPrimitiveValue.idl b/WebCore/css/CSSPrimitiveValue.idl
index d5d915e..8580664 100644
--- a/WebCore/css/CSSPrimitiveValue.idl
+++ b/WebCore/css/CSSPrimitiveValue.idl
@@ -19,10 +19,7 @@
module css {
- interface [
- InterfaceUUID=a286b0cb-4ff0-4482-aa6e-7c5fb39afaba,
- ImplementationUUID=c310c84d-480f-4bbb-9187-28e00956ac47
- ] CSSPrimitiveValue : CSSValue {
+ interface CSSPrimitiveValue : CSSValue {
// UnitTypes
const unsigned short CSS_UNKNOWN = 0;
@@ -68,11 +65,8 @@ module css {
raises(DOMException);
Rect getRectValue()
raises(DOMException);
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
RGBColor getRGBColorValue()
raises(DOMException);
-#endif
-
};
}
diff --git a/WebCore/css/CSSRule.idl b/WebCore/css/CSSRule.idl
index 06bc6e1..eaf1335 100644
--- a/WebCore/css/CSSRule.idl
+++ b/WebCore/css/CSSRule.idl
@@ -23,9 +23,7 @@ module css {
// Introduced in DOM Level 2:
interface [
CustomToJS,
- Polymorphic,
- InterfaceUUID=548139b4-31ab-4978-b1d5-cfcfdfbaea0e,
- ImplementationUUID=0268e673-2489-4743-9a3a-197dae4b4d9c
+ Polymorphic
] CSSRule {
// RuleType
diff --git a/WebCore/css/CSSRuleList.idl b/WebCore/css/CSSRuleList.idl
index 6be21a1..e253287 100644
--- a/WebCore/css/CSSRuleList.idl
+++ b/WebCore/css/CSSRuleList.idl
@@ -28,9 +28,7 @@ module css {
// Introduced in DOM Level 2:
interface [
CustomMarkFunction,
- HasIndexGetter,
- InterfaceUUID=64c346a0-1e34-49d3-9472-57ec8e0fdccb,
- ImplementationUUID=971a28e0-d0da-4570-9b71-e39fc2cf9a1b
+ HasIndexGetter
] CSSRuleList {
readonly attribute unsigned long length;
CSSRule item(in unsigned long index);
diff --git a/WebCore/css/CSSStyleDeclaration.idl b/WebCore/css/CSSStyleDeclaration.idl
index d7a3d1d..297b732 100644
--- a/WebCore/css/CSSStyleDeclaration.idl
+++ b/WebCore/css/CSSStyleDeclaration.idl
@@ -25,9 +25,7 @@ module css {
CustomMarkFunction,
DelegatingPutFunction,
HasNameGetter,
- HasIndexGetter,
- InterfaceUUID=9989b2c3-a2b6-449b-abf9-c60d2260b1d7,
- ImplementationUUID=985c50c7-9f19-436a-9e45-c0aa02996d0e
+ HasIndexGetter
] CSSStyleDeclaration {
attribute [ConvertNullStringTo=Null, ConvertNullToNullString] DOMString cssText
setter raises(DOMException);
diff --git a/WebCore/css/CSSStyleRule.idl b/WebCore/css/CSSStyleRule.idl
index b912644..862acd8 100644
--- a/WebCore/css/CSSStyleRule.idl
+++ b/WebCore/css/CSSStyleRule.idl
@@ -21,10 +21,7 @@
module css {
// Introduced in DOM Level 2:
- interface [
- InterfaceUUID=ce4e3330-c40b-4430-8ed4-030ab4ddbc93,
- ImplementationUUID=c3d2f1b8-3970-4b36-882e-ce7f5668d8e2
- ] CSSStyleRule : CSSRule {
+ interface CSSStyleRule : CSSRule {
attribute [ConvertNullStringTo=Null, ConvertNullToNullString] DOMString selectorText
setter raises(DOMException);
diff --git a/WebCore/css/CSSStyleSheet.idl b/WebCore/css/CSSStyleSheet.idl
index dacaeb5..e180217 100644
--- a/WebCore/css/CSSStyleSheet.idl
+++ b/WebCore/css/CSSStyleSheet.idl
@@ -21,10 +21,7 @@
module css {
// Introduced in DOM Level 2:
- interface [
- InterfaceUUID=2f547f65-f8c4-4f13-8724-ed10ed79dcc4,
- ImplementationUUID=1b5c24b3-8b6f-43a9-8891-654ba858f42f
- ] CSSStyleSheet : stylesheets::StyleSheet {
+ interface CSSStyleSheet : stylesheets::StyleSheet {
readonly attribute CSSRule ownerRule;
readonly attribute CSSRuleList cssRules;
diff --git a/WebCore/css/CSSUnknownRule.idl b/WebCore/css/CSSUnknownRule.idl
index 059135a..b62ceb8 100644
--- a/WebCore/css/CSSUnknownRule.idl
+++ b/WebCore/css/CSSUnknownRule.idl
@@ -22,8 +22,6 @@ module css {
// Introduced in DOM Level 2:
interface [
- InterfaceUUID=35670098-b732-419c-b7cd-dc0d5e26d5e3,
- ImplementationUUID=4b755f87-2509-4b98-a953-8ecb88fe4b21,
OmitConstructor
] CSSUnknownRule : CSSRule {
};
diff --git a/WebCore/css/CSSValue.idl b/WebCore/css/CSSValue.idl
index eb3c6aa..fe6b8f2 100644
--- a/WebCore/css/CSSValue.idl
+++ b/WebCore/css/CSSValue.idl
@@ -22,9 +22,7 @@ module css {
interface [
CustomToJS,
- Polymorphic,
- InterfaceUUID=9fd62a7b-539d-4500-bd6c-ec075abbc404,
- ImplementationUUID=e10a2860-f98e-4bd3-96b4-1493ad941dfe
+ Polymorphic
] CSSValue {
// UnitTypes
diff --git a/WebCore/css/CSSValueList.idl b/WebCore/css/CSSValueList.idl
index d5aabfa..06df5d7 100644
--- a/WebCore/css/CSSValueList.idl
+++ b/WebCore/css/CSSValueList.idl
@@ -27,9 +27,7 @@ module css {
// Introduced in DOM Level 2:
interface [
- HasIndexGetter,
- InterfaceUUID=2fb74620-9029-400c-bc4b-4ce8e25b081f,
- ImplementationUUID=1d8fc822-f89a-48d5-a2ac-827e5a24357e
+ HasIndexGetter
] CSSValueList : CSSValue {
readonly attribute unsigned long length;
CSSValue item(in unsigned long index);
diff --git a/WebCore/css/Counter.idl b/WebCore/css/Counter.idl
index 83623e3..6236c45 100644
--- a/WebCore/css/Counter.idl
+++ b/WebCore/css/Counter.idl
@@ -20,10 +20,7 @@
module css {
// Introduced in DOM Level 2:
- interface [
- InterfaceUUID=365d0f26-3a6e-457c-a34c-174d98f79798,
- ImplementationUUID=8bfdc968-9a1b-4e4f-8d36-732d49b48eaa
- ] Counter {
+ interface Counter {
readonly attribute DOMString identifier;
readonly attribute DOMString listStyle;
readonly attribute DOMString separator;
diff --git a/WebCore/css/MediaList.idl b/WebCore/css/MediaList.idl
index 074f17b..54ad4f8 100644
--- a/WebCore/css/MediaList.idl
+++ b/WebCore/css/MediaList.idl
@@ -27,9 +27,7 @@ module stylesheets {
// Introduced in DOM Level 2:
interface [
- HasIndexGetter,
- InterfaceUUID=4ed02a0b-15b3-4a20-8f16-d91295aaf2cb,
- ImplementationUUID=6c5095d8-fdcc-4f9a-b04a-23c2a6d2cf49
+ HasIndexGetter
] MediaList {
attribute [ConvertNullToNullString, ConvertNullStringTo=Null] DOMString mediaText
diff --git a/WebCore/css/RGBColor.idl b/WebCore/css/RGBColor.idl
index 2b550fe..1dc87bc 100644
--- a/WebCore/css/RGBColor.idl
+++ b/WebCore/css/RGBColor.idl
@@ -21,10 +21,7 @@
module css {
// Introduced in DOM Level 2:
- interface [
- InterfaceUUID=2e3b1501-2cf7-4a4a-bbf7-d8843d1c3be7,
- ImplementationUUID=cf779953-4898-4800-aa31-6c9e3f4711be
- ] RGBColor {
+ interface RGBColor {
readonly attribute CSSPrimitiveValue red;
readonly attribute CSSPrimitiveValue green;
readonly attribute CSSPrimitiveValue blue;
diff --git a/WebCore/css/Rect.idl b/WebCore/css/Rect.idl
index 4396c5e..60eb70e 100644
--- a/WebCore/css/Rect.idl
+++ b/WebCore/css/Rect.idl
@@ -19,10 +19,7 @@
module css {
- interface [
- InterfaceUUID=696bc4d9-c1d3-4225-a5b3-2cef28967705,
- ImplementationUUID=ae83743f-4dc4-4785-869b-8c3010c7d006
- ] Rect {
+ interface Rect {
readonly attribute CSSPrimitiveValue top;
readonly attribute CSSPrimitiveValue right;
readonly attribute CSSPrimitiveValue bottom;
diff --git a/WebCore/css/StyleSheet.idl b/WebCore/css/StyleSheet.idl
index 0385002..4f53689 100644
--- a/WebCore/css/StyleSheet.idl
+++ b/WebCore/css/StyleSheet.idl
@@ -24,9 +24,7 @@ module stylesheets {
interface [
CustomMarkFunction,
CustomToJS,
- Polymorphic,
- InterfaceUUID=2bd2db5f-aaab-4422-96a0-e05455313f35,
- ImplementationUUID=a8ca694d-71f2-4479-8c76-ee9c1c729b49
+ Polymorphic
] StyleSheet {
readonly attribute [ConvertNullStringTo=Null] DOMString type;
attribute boolean disabled;
diff --git a/WebCore/css/StyleSheetList.idl b/WebCore/css/StyleSheetList.idl
index a486735..6cef99d 100644
--- a/WebCore/css/StyleSheetList.idl
+++ b/WebCore/css/StyleSheetList.idl
@@ -24,9 +24,7 @@ module stylesheets {
interface [
CustomMarkFunction,
HasIndexGetter,
- HasNameGetter,
- InterfaceUUID=707da1d7-7c8f-42b1-bbbf-c009e429663f,
- ImplementationUUID=5991ebaf-ce6c-42db-b1c8-fb34af8d5c76
+ HasNameGetter
] StyleSheetList {
readonly attribute unsigned long length;
StyleSheet item(in unsigned long index);
diff --git a/WebCore/css/WebKitCSSKeyframeRule.idl b/WebCore/css/WebKitCSSKeyframeRule.idl
index 5aa98e6..f6eac77 100644
--- a/WebCore/css/WebKitCSSKeyframeRule.idl
+++ b/WebCore/css/WebKitCSSKeyframeRule.idl
@@ -29,10 +29,7 @@
module css {
// Introduced in DOM Level ?:
- interface [
- InterfaceUUID=87b7cde8-5818-4f68-b554-5382e6d9428c,
- ImplementationUUID=b000d468-bb7a-4866-8946-5dea8b6a3c13
- ] WebKitCSSKeyframeRule : CSSRule {
+ interface WebKitCSSKeyframeRule : CSSRule {
attribute DOMString keyText;
readonly attribute CSSStyleDeclaration style;
diff --git a/WebCore/css/WebKitCSSKeyframesRule.idl b/WebCore/css/WebKitCSSKeyframesRule.idl
index 1eb44a4..c40aff9 100644
--- a/WebCore/css/WebKitCSSKeyframesRule.idl
+++ b/WebCore/css/WebKitCSSKeyframesRule.idl
@@ -30,9 +30,7 @@ module css {
// Introduced in DOM Level ?:
interface [
- HasIndexGetter,
- InterfaceUUID=49f5644a-5dbb-4e31-ac6b-9446ae3895c9,
- ImplementationUUID=a7c78aaa-5883-4ef2-a8bd-f2f1a1fd025a
+ HasIndexGetter
] WebKitCSSKeyframesRule : CSSRule {
attribute [ConvertNullStringTo=Null, ConvertNullToNullString] DOMString name;
diff --git a/WebCore/css/WebKitCSSTransformValue.idl b/WebCore/css/WebKitCSSTransformValue.idl
index 069c588..087aa82 100644
--- a/WebCore/css/WebKitCSSTransformValue.idl
+++ b/WebCore/css/WebKitCSSTransformValue.idl
@@ -29,9 +29,7 @@
module css {
interface [
- HasIndexGetter,
- InterfaceUUID=303fe632-5dcf-4472-b977-33a5481e1d12,
- ImplementationUUID=eb49e5c6-6075-45b8-b5c4-7e775c01e7c4
+ HasIndexGetter
] WebKitCSSTransformValue : CSSValueList {
// OperationTypes
diff --git a/WebCore/dom/Attr.idl b/WebCore/dom/Attr.idl
index 611df53..af84478 100644
--- a/WebCore/dom/Attr.idl
+++ b/WebCore/dom/Attr.idl
@@ -22,9 +22,7 @@ module core {
interface [
CustomMarkFunction,
- GenerateNativeConverter,
- InterfaceUUID=EEE8E22B-22C3-4e50-95F4-5E0B8AAD8231,
- ImplementationUUID=41B16348-D8E7-4d21-BFDB-125705B7E91F
+ GenerateNativeConverter
] Attr : Node {
// DOM Level 1
@@ -43,9 +41,7 @@ module core {
readonly attribute boolean isId;
// extensions
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
readonly attribute CSSStyleDeclaration style;
-#endif
};
}
diff --git a/WebCore/dom/CDATASection.idl b/WebCore/dom/CDATASection.idl
index 1bdb83d..70a4f55 100644
--- a/WebCore/dom/CDATASection.idl
+++ b/WebCore/dom/CDATASection.idl
@@ -19,10 +19,7 @@
module core {
- interface [
- InterfaceUUID=DC8E30FD-42DD-4a12-9B74-78D634321B41,
- ImplementationUUID=10A5D70C-D93E-409c-A6BA-9D7CB4E3D06A
- ] CDATASection : Text {
+ interface CDATASection : Text {
};
}
diff --git a/WebCore/dom/CharacterData.idl b/WebCore/dom/CharacterData.idl
index a5521d0..4ddd782 100644
--- a/WebCore/dom/CharacterData.idl
+++ b/WebCore/dom/CharacterData.idl
@@ -19,10 +19,7 @@
module core {
- interface [
- InterfaceUUID=149159F4-D2BA-4040-8137-6BF6424C972A,
- ImplementationUUID=E2095280-B9BD-446a-8C03-79F78417CDFF
- ] CharacterData : Node {
+ interface CharacterData : Node {
attribute [ConvertNullToNullString] DOMString data
setter raises(DOMException);
diff --git a/WebCore/dom/Comment.idl b/WebCore/dom/Comment.idl
index 8f667c3..b9f4e31 100644
--- a/WebCore/dom/Comment.idl
+++ b/WebCore/dom/Comment.idl
@@ -19,10 +19,7 @@
module core {
- interface [
- InterfaceUUID=5D16069F-7E6B-4b28-8647-C36B2ED81ED1,
- ImplementationUUID=CB55DB55-411F-451f-97C6-284B99E77F8E
- ] Comment : CharacterData {
+ interface Comment : CharacterData {
};
}
diff --git a/WebCore/dom/DOMImplementation.idl b/WebCore/dom/DOMImplementation.idl
index b93dd4e..81df6c8 100644
--- a/WebCore/dom/DOMImplementation.idl
+++ b/WebCore/dom/DOMImplementation.idl
@@ -20,10 +20,7 @@
module core {
- interface [
- InterfaceUUID=B0CC344F-963C-4acc-9FC6-EB22649345E5,
- ImplementationUUID=9E835092-2CA3-426b-826B-8272A8105E49
- ] DOMImplementation {
+ interface DOMImplementation {
// DOM Level 1
@@ -43,7 +40,6 @@ module core {
// DOMImplementationCSS interface from DOM Level 2 CSS
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
[OldStyleObjC] CSSStyleSheet createCSSStyleSheet(in DOMString title,
in DOMString media)
raises(DOMException);
@@ -51,7 +47,6 @@ module core {
// HTMLDOMImplementation interface from DOM Level 2 HTML
HTMLDocument createHTMLDocument(in DOMString title);
-#endif
};
}
diff --git a/WebCore/dom/Document.idl b/WebCore/dom/Document.idl
index 91e5613..7e51e51 100644
--- a/WebCore/dom/Document.idl
+++ b/WebCore/dom/Document.idl
@@ -24,9 +24,7 @@ module core {
CustomToJS,
GenerateNativeConverter,
CustomMarkFunction,
- InlineGetOwnPropertySlot,
- InterfaceUUID=48BB95FC-2D08-4c54-BE65-7558736A4CAE,
- ImplementationUUID=FF5CBE81-F817-429c-A6C2-0CCCD2328062
+ InlineGetOwnPropertySlot
] Document : Node {
// DOM Level 1 Core
@@ -80,7 +78,6 @@ module core {
attribute [ConvertNullStringTo=Null, ConvertNullToNullString] DOMString documentURI;
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
// DOM Level 2 Events (DocumentEvents interface)
Event createEvent(in DOMString eventType)
@@ -128,7 +125,6 @@ module core {
in XPathResult inResult)
raises(DOMException);
#endif // ENABLE_XPATH
-#endif // !defined(LANGUAGE_COM)
// Common extensions
@@ -170,9 +166,7 @@ module core {
attribute HTMLElement body
setter raises (DOMException);
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
readonly attribute HTMLHeadElement head;
-#endif
readonly attribute HTMLCollection images;
readonly attribute HTMLCollection applets;
readonly attribute HTMLCollection links;
@@ -193,9 +187,7 @@ module core {
readonly attribute [ConvertNullStringTo=Undefined] DOMString readyState;
Element elementFromPoint(in long x, in long y);
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
Range caretRangeFromPoint(in long x, in long y);
-#endif
// Mozilla extensions
#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
@@ -208,11 +200,9 @@ module core {
readonly attribute [ConvertNullStringTo=Null] DOMString preferredStylesheetSet;
attribute [ConvertNullStringTo=Null, ConvertNullToNullString] DOMString selectedStylesheetSet;
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
#if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT
CSSStyleDeclaration createCSSStyleDeclaration();
#endif
-#endif
#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
// DOM Level 2 Style Interface
@@ -229,11 +219,9 @@ module core {
#endif
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
[V8Custom] DOMObject getCSSCanvasContext(in DOMString contextId, in DOMString name, in long width, in long height);
#endif
-#endif
// HTML 5
NodeList getElementsByClassName(in DOMString tagname);
@@ -251,7 +239,6 @@ module core {
#endif
#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
// Event handler DOM attributes
attribute [DontEnum] EventListener onabort;
attribute [DontEnum] EventListener onblur;
@@ -325,7 +312,6 @@ module core {
attribute [DontEnum] EventListener ontouchend;
#endif
#endif
-#endif
};
}
diff --git a/WebCore/dom/DocumentFragment.idl b/WebCore/dom/DocumentFragment.idl
index 4965258..882b62d 100644
--- a/WebCore/dom/DocumentFragment.idl
+++ b/WebCore/dom/DocumentFragment.idl
@@ -19,10 +19,7 @@
module core {
- interface [
- InterfaceUUID=F5C8DAF0-D728-4b2b-9D9C-630621B07D35,
- ImplementationUUID=E57BF71F-3FAA-495c-A307-E288F8E5B2EC
- ] DocumentFragment : Node {
+ interface DocumentFragment : Node {
// NodeSelector - Selector API
Element querySelector(in DOMString selectors)
raises(DOMException);
diff --git a/WebCore/dom/DocumentType.idl b/WebCore/dom/DocumentType.idl
index 586b37d..7992dc5 100644
--- a/WebCore/dom/DocumentType.idl
+++ b/WebCore/dom/DocumentType.idl
@@ -20,9 +20,7 @@
module core {
interface [
- GenerateNativeConverter,
- InterfaceUUID=20F04535-A423-4273-8CFE-3AD996100D29,
- ImplementationUUID=736D952F-DBAF-458b-834B-F1638700BD88
+ GenerateNativeConverter
] DocumentType : Node {
// DOM Level 1
diff --git a/WebCore/dom/Element.idl b/WebCore/dom/Element.idl
index e15f395..c881e3a 100644
--- a/WebCore/dom/Element.idl
+++ b/WebCore/dom/Element.idl
@@ -23,9 +23,7 @@ module core {
interface [
CustomMarkFunction,
GenerateNativeConverter,
- InlineGetOwnPropertySlot,
- InterfaceUUID=FEFE9C21-E58C-4b5b-821A-61A514613763,
- ImplementationUUID=12E5B08E-A680-4baf-9D1E-108AEF7ABBFB
+ InlineGetOwnPropertySlot
] Element : Node {
// DOM Level 1 Core
@@ -66,9 +64,7 @@ module core {
[OldStyleObjC] boolean hasAttributeNS(in [ConvertNullToNullString] DOMString namespaceURI,
in DOMString localName);
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
readonly attribute CSSStyleDeclaration style;
-#endif
// Common extensions
@@ -109,7 +105,6 @@ module core {
NodeList querySelectorAll(in DOMString selectors)
raises(DOMException);
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
// WebKit extension, pending specification.
boolean webkitMatchesSelector(in DOMString selectors)
raises(DOMException);
@@ -120,7 +115,6 @@ module core {
readonly attribute Element previousElementSibling;
readonly attribute Element nextElementSibling;
readonly attribute unsigned long childElementCount;
-#endif
#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
// CSSOM View Module API
@@ -134,7 +128,6 @@ module core {
#endif
#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
// Event handler DOM attributes
attribute [DontEnum] EventListener onabort;
attribute [DontEnum] EventListener onblur;
@@ -208,7 +201,6 @@ module core {
attribute [DontEnum] EventListener ontouchend;
#endif
#endif
-#endif
};
}
diff --git a/WebCore/dom/Entity.idl b/WebCore/dom/Entity.idl
index 39d6ce3..8dacbe9 100644
--- a/WebCore/dom/Entity.idl
+++ b/WebCore/dom/Entity.idl
@@ -19,10 +19,7 @@
module core {
- interface [
- InterfaceUUID=5CDB5ACA-F3A7-47ea-B89C-F335E4342C55,
- ImplementationUUID=DDD2A621-59FD-4bb2-9F95-7061C3FB9F06
- ] Entity : Node {
+ interface Entity : Node {
readonly attribute [ConvertNullStringTo=Null] DOMString publicId;
readonly attribute [ConvertNullStringTo=Null] DOMString systemId;
readonly attribute [ConvertNullStringTo=Null] DOMString notationName;
diff --git a/WebCore/dom/EntityReference.idl b/WebCore/dom/EntityReference.idl
index c3bacbd..f652d9a 100644
--- a/WebCore/dom/EntityReference.idl
+++ b/WebCore/dom/EntityReference.idl
@@ -19,10 +19,7 @@
module core {
- interface [
- InterfaceUUID=61BF4A03-19FB-4ac4-A624-5BF0893FDA65,
- ImplementationUUID=486E1182-CF4F-450b-B411-A584CA42BBD0
- ] EntityReference : Node {
+ interface EntityReference : Node {
};
}
diff --git a/WebCore/dom/Event.idl b/WebCore/dom/Event.idl
index 93b6189..d64d122 100644
--- a/WebCore/dom/Event.idl
+++ b/WebCore/dom/Event.idl
@@ -24,9 +24,7 @@ module events {
interface [
CustomToJS,
NoStaticTables,
- Polymorphic,
- InterfaceUUID=D17495FA-ACAD-4d27-9362-E19E057B189D,
- ImplementationUUID=CFDCDDB2-5B3F-412d-BDA4-80B23C721549
+ Polymorphic
] Event {
// DOM PhaseType
@@ -60,9 +58,8 @@ module events {
readonly attribute unsigned short eventPhase;
readonly attribute boolean bubbles;
readonly attribute boolean cancelable;
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
readonly attribute DOMTimeStamp timeStamp;
-#endif
+
void stopPropagation();
void preventDefault();
[OldStyleObjC] void initEvent(in DOMString eventTypeArg,
diff --git a/WebCore/dom/EventListener.idl b/WebCore/dom/EventListener.idl
index eadd9cd..023777b 100644
--- a/WebCore/dom/EventListener.idl
+++ b/WebCore/dom/EventListener.idl
@@ -25,8 +25,7 @@ module events {
NoStaticTables,
ObjCProtocol,
PureInterface,
- OmitConstructor,
- InterfaceUUID=B04F2AE3-71E2-4ebe-ABFE-EF4938354082,
+ OmitConstructor
] EventListener {
void handleEvent(in Event evt);
};
diff --git a/WebCore/dom/EventTarget.idl b/WebCore/dom/EventTarget.idl
index baab021..0cdb6b3 100644
--- a/WebCore/dom/EventTarget.idl
+++ b/WebCore/dom/EventTarget.idl
@@ -24,8 +24,7 @@ module events {
interface [
ObjCProtocol,
PureInterface,
- OmitConstructor,
- InterfaceUUID=1D71C7EC-0BA0-4044-BDFD-56B3E8F5F9D4
+ OmitConstructor
] EventTarget {
[OldStyleObjC] void addEventListener(in DOMString type,
in EventListener listener,
diff --git a/WebCore/dom/NamedNodeMap.idl b/WebCore/dom/NamedNodeMap.idl
index b7e1e8c..4d36577 100644
--- a/WebCore/dom/NamedNodeMap.idl
+++ b/WebCore/dom/NamedNodeMap.idl
@@ -23,9 +23,7 @@ module core {
interface [
CustomMarkFunction,
HasIndexGetter,
- HasNameGetter,
- InterfaceUUID=08DAF7A4-4C32-4709-B72F-622721FF0FB8,
- ImplementationUUID=A1CC9F5B-092D-4a04-96D9-D7718A8D6242
+ HasNameGetter
] NamedNodeMap {
Node getNamedItem(in DOMString name);
diff --git a/WebCore/dom/Node.idl b/WebCore/dom/Node.idl
index 9c6b171..c6cd4b9 100644
--- a/WebCore/dom/Node.idl
+++ b/WebCore/dom/Node.idl
@@ -27,9 +27,7 @@ module core {
EventTarget,
GenerateNativeConverter,
InlineGetOwnPropertySlot,
- Polymorphic,
- InterfaceUUID=84BA0D7A-7E3E-4a7b-B6FB-7653E8FB54ED,
- ImplementationUUID=81B47FDB-94B0-40fd-8E0C-FB2A6E53CC04
+ Polymorphic
] Node
#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
: Object, EventTarget
@@ -134,7 +132,6 @@ module core {
#endif /* defined(LANGUAGE_OBJECTIVE_C) */
#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
[Custom] void addEventListener(in DOMString type,
in EventListener listener,
in boolean useCapture);
@@ -144,7 +141,6 @@ module core {
boolean dispatchEvent(in Event event)
raises(EventException);
#endif
-#endif
};
}
diff --git a/WebCore/dom/NodeList.idl b/WebCore/dom/NodeList.idl
index 2519160..edb2dc7 100644
--- a/WebCore/dom/NodeList.idl
+++ b/WebCore/dom/NodeList.idl
@@ -23,9 +23,7 @@ module core {
interface [
HasIndexGetter,
HasNameGetter,
- CustomCall,
- InterfaceUUID=F9A9F6A9-385C-414e-A6F6-E2E0CF574130,
- ImplementationUUID=BBB49E8B-DB1D-4c4a-B970-D300FB4609FA
+ CustomCall
] NodeList {
Node item(in [IsIndex] unsigned long index);
diff --git a/WebCore/dom/Notation.idl b/WebCore/dom/Notation.idl
index 0ece013..96351d2 100644
--- a/WebCore/dom/Notation.idl
+++ b/WebCore/dom/Notation.idl
@@ -19,10 +19,7 @@
module core {
- interface [
- InterfaceUUID=6580C703-F5FF-40a7-ACF2-AB80EBC83CA1,
- ImplementationUUID=A52869F7-A3CE-4f4c-8C27-E369C4ED9FF9
- ] Notation : Node {
+ interface Notation : Node {
readonly attribute [ConvertNullStringTo=Null] DOMString publicId;
readonly attribute [ConvertNullStringTo=Null] DOMString systemId;
};
diff --git a/WebCore/dom/ProcessingInstruction.idl b/WebCore/dom/ProcessingInstruction.idl
index c13ba8e..efcc9c1 100644
--- a/WebCore/dom/ProcessingInstruction.idl
+++ b/WebCore/dom/ProcessingInstruction.idl
@@ -20,10 +20,7 @@
module core {
- interface [
- InterfaceUUID=5947E8F8-B5CB-4a51-B883-B91F344F1E13,
- ImplementationUUID=7EEC0376-3D76-4643-A964-97B8AC1FB6D3
- ] ProcessingInstruction : Node {
+ interface ProcessingInstruction : Node {
// DOM Level 1
@@ -31,11 +28,8 @@ module core {
attribute [ConvertNullStringTo=Null, ConvertNullToNullString] DOMString data
setter raises(DOMException);
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
// interface LinkStyle from DOM Level 2 Style Sheets
readonly attribute StyleSheet sheet;
-#endif
-
};
}
diff --git a/WebCore/dom/Text.idl b/WebCore/dom/Text.idl
index 3dff7f7..116eab7 100644
--- a/WebCore/dom/Text.idl
+++ b/WebCore/dom/Text.idl
@@ -19,10 +19,7 @@
module core {
- interface [
- InterfaceUUID=4EA6B89C-F8E5-462a-A807-519446123184,
- ImplementationUUID=CB5D61CB-D30D-486e-9BD7-F42B7611C2E5
- ] Text : CharacterData {
+ interface Text : CharacterData {
// DOM Level 1
diff --git a/WebCore/html/HTMLAnchorElement.idl b/WebCore/html/HTMLAnchorElement.idl
index 743b151..03b3986 100644
--- a/WebCore/html/HTMLAnchorElement.idl
+++ b/WebCore/html/HTMLAnchorElement.idl
@@ -20,10 +20,7 @@
module html {
- interface [
- InterfaceUUID=0c74cef8-b1f7-4b44-83a9-8deeb376a257,
- ImplementationUUID=30f797d5-d145-498e-a126-d8e9ddeedea3
- ] HTMLAnchorElement : HTMLElement {
+ interface HTMLAnchorElement : HTMLElement {
attribute [ConvertNullToNullString, Reflect=accesskey] DOMString accessKey;
attribute [ConvertNullToNullString, Reflect] DOMString charset;
attribute [ConvertNullToNullString, Reflect] DOMString coords;
diff --git a/WebCore/html/HTMLAppletElement.idl b/WebCore/html/HTMLAppletElement.idl
index 4b4384a..8d6803e 100644
--- a/WebCore/html/HTMLAppletElement.idl
+++ b/WebCore/html/HTMLAppletElement.idl
@@ -24,9 +24,7 @@ module html {
DelegatingPutFunction,
DelegatingGetOwnPropertySlot,
CustomCall,
- HasOverridingNameGetter,
- InterfaceUUID=9b5cb4a8-c156-4b55-afdb-c60938a4d1b1,
- ImplementationUUID=56544372-675e-40dd-ba39-fa708a4c7678
+ HasOverridingNameGetter
] HTMLAppletElement : HTMLElement {
attribute [ConvertNullToNullString, Reflect] DOMString align;
attribute [ConvertNullToNullString, Reflect] DOMString alt;
diff --git a/WebCore/html/HTMLAreaElement.idl b/WebCore/html/HTMLAreaElement.idl
index 598d85f..210d6e5 100644
--- a/WebCore/html/HTMLAreaElement.idl
+++ b/WebCore/html/HTMLAreaElement.idl
@@ -20,10 +20,7 @@
module html {
- interface [
- InterfaceUUID=aac98729-47d3-4623-8c5b-004783af5bd6,
- ImplementationUUID=f0631a41-5f55-40e5-a879-c09e663c26ba
- ] HTMLAreaElement : HTMLElement {
+ interface HTMLAreaElement : HTMLElement {
attribute [ConvertNullToNullString, Reflect=accesskey] DOMString accessKey;
attribute [ConvertNullToNullString, Reflect] DOMString alt;
attribute [ConvertNullToNullString, Reflect] DOMString coords;
diff --git a/WebCore/html/HTMLBRElement.idl b/WebCore/html/HTMLBRElement.idl
index 8c7cf91..4048911 100644
--- a/WebCore/html/HTMLBRElement.idl
+++ b/WebCore/html/HTMLBRElement.idl
@@ -19,10 +19,7 @@
module html {
- interface [
- InterfaceUUID=e84b14bc-b0aa-431f-83c4-fcc297e354b0,
- ImplementationUUID=c10d45a4-b042-45d0-b170-6ac7173ee823
- ] HTMLBRElement : HTMLElement {
+ interface HTMLBRElement : HTMLElement {
attribute [ConvertNullToNullString, Reflect] DOMString clear;
};
diff --git a/WebCore/html/HTMLBaseElement.idl b/WebCore/html/HTMLBaseElement.idl
index 0df5fcd..087faca 100644
--- a/WebCore/html/HTMLBaseElement.idl
+++ b/WebCore/html/HTMLBaseElement.idl
@@ -19,10 +19,7 @@
module html {
- interface [
- InterfaceUUID=e4112bea-13de-40f6-93d0-41e285ae1491,
- ImplementationUUID=23cec074-660f-490a-996d-167d66c164d5
- ] HTMLBaseElement : HTMLElement {
+ interface HTMLBaseElement : HTMLElement {
attribute [ConvertNullToNullString, Reflect] DOMString href;
attribute [ConvertNullToNullString, Reflect] DOMString target;
};
diff --git a/WebCore/html/HTMLBaseFontElement.idl b/WebCore/html/HTMLBaseFontElement.idl
index c8156c8..d55654e 100644
--- a/WebCore/html/HTMLBaseFontElement.idl
+++ b/WebCore/html/HTMLBaseFontElement.idl
@@ -19,10 +19,7 @@
module html {
- interface [
- InterfaceUUID=434b1be5-408e-45b5-be83-c70e11e9bb37,
- ImplementationUUID=1dc8508e-53c4-4e7e-93c0-16772372b2dc
- ] HTMLBaseFontElement : HTMLElement {
+ interface HTMLBaseFontElement : HTMLElement {
attribute [ConvertNullToNullString, Reflect] DOMString color;
attribute [ConvertNullToNullString, Reflect] DOMString face;
#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
diff --git a/WebCore/html/HTMLBlockquoteElement.idl b/WebCore/html/HTMLBlockquoteElement.idl
index d69ad67..b819236 100644
--- a/WebCore/html/HTMLBlockquoteElement.idl
+++ b/WebCore/html/HTMLBlockquoteElement.idl
@@ -19,10 +19,7 @@
module html {
- interface [
- InterfaceUUID=902d9011-c6d6-4363-b6fe-bd2d28ef553b,
- ImplementationUUID=345db946-ba9c-44b9-87fd-06083aa472e4
- ] HTMLBlockquoteElement : HTMLElement {
+ interface HTMLBlockquoteElement : HTMLElement {
attribute [ConvertNullToNullString, Reflect] DOMString cite;
};
diff --git a/WebCore/html/HTMLBodyElement.idl b/WebCore/html/HTMLBodyElement.idl
index 9a4de26..95140c7 100644
--- a/WebCore/html/HTMLBodyElement.idl
+++ b/WebCore/html/HTMLBodyElement.idl
@@ -20,10 +20,7 @@
module html {
- interface [
- InterfaceUUID=4789afc6-2d9e-4f3b-8c27-12abc9d4a014,
- ImplementationUUID=d2e16911-2f7e-4d58-a92c-94700d445b38
- ] HTMLBodyElement : HTMLElement {
+ interface HTMLBodyElement : HTMLElement {
attribute [ConvertNullToNullString, Reflect=alink] DOMString aLink;
attribute [ConvertNullToNullString, Reflect] DOMString background;
attribute [ConvertNullToNullString, Reflect=bgcolor] DOMString bgColor;
@@ -32,7 +29,6 @@ module html {
attribute [ConvertNullToNullString, Reflect=vlink] DOMString vLink;
#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
// Event handler attributes
attribute [DontEnum] EventListener onbeforeunload;
attribute [DontEnum] EventListener onhashchange;
@@ -60,7 +56,6 @@ module html {
// attribute [DontEnum] EventListener onredo;
// attribute [DontEnum] EventListener onundo;
#endif
-#endif
};
}
diff --git a/WebCore/html/HTMLButtonElement.idl b/WebCore/html/HTMLButtonElement.idl
index 205a049..73098fe 100644
--- a/WebCore/html/HTMLButtonElement.idl
+++ b/WebCore/html/HTMLButtonElement.idl
@@ -20,15 +20,10 @@
module html {
- interface [
- InterfaceUUID=b9715643-5591-442d-ab65-e05309607271,
- ImplementationUUID=1be13b5f-40df-4550-b70e-8c805e546cad
- ] HTMLButtonElement : HTMLElement {
+ interface HTMLButtonElement : HTMLElement {
readonly attribute HTMLFormElement form;
attribute boolean formNoValidate;
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
readonly attribute ValidityState validity;
-#endif
attribute [ConvertNullToNullString] DOMString accessKey;
attribute boolean disabled;
attribute boolean autofocus;
diff --git a/WebCore/html/HTMLCanvasElement.idl b/WebCore/html/HTMLCanvasElement.idl
index d35bb1d..108daf8 100644
--- a/WebCore/html/HTMLCanvasElement.idl
+++ b/WebCore/html/HTMLCanvasElement.idl
@@ -26,9 +26,7 @@
module html {
interface [
- CustomMarkFunction,
- InterfaceUUID=a14d88c8-c6af-4e34-ad17-659700c77a10,
- ImplementationUUID=7ae731bc-c264-4ee3-a4b4-5d4540af26c3
+ CustomMarkFunction
] HTMLCanvasElement : HTMLElement {
attribute long width;
diff --git a/WebCore/html/HTMLCollection.idl b/WebCore/html/HTMLCollection.idl
index fa7206c..a3e4332 100644
--- a/WebCore/html/HTMLCollection.idl
+++ b/WebCore/html/HTMLCollection.idl
@@ -25,9 +25,7 @@ module html {
HasNameGetter,
CustomCall,
CustomToJS,
- Polymorphic,
- InterfaceUUID=b0d215ff-6f9c-4d1f-86c3-f200a65a5134,
- ImplementationUUID=8e81b17f-7f74-4121-8f2f-a339a7e66447
+ Polymorphic
] HTMLCollection {
readonly attribute unsigned long length;
[Custom] Node item(in unsigned long index);
diff --git a/WebCore/html/HTMLDListElement.idl b/WebCore/html/HTMLDListElement.idl
index bb37015..57c5c57 100644
--- a/WebCore/html/HTMLDListElement.idl
+++ b/WebCore/html/HTMLDListElement.idl
@@ -19,10 +19,7 @@
module html {
- interface [
- InterfaceUUID=5665c589-aea9-4322-844f-d3395fd5839e,
- ImplementationUUID=99ac26a3-224b-4bc6-b287-89946a6de9a7
- ] HTMLDListElement : HTMLElement {
+ interface HTMLDListElement : HTMLElement {
attribute boolean compact;
};
diff --git a/WebCore/html/HTMLDirectoryElement.idl b/WebCore/html/HTMLDirectoryElement.idl
index de41a3b..c88e2e0 100644
--- a/WebCore/html/HTMLDirectoryElement.idl
+++ b/WebCore/html/HTMLDirectoryElement.idl
@@ -19,10 +19,7 @@
module html {
- interface [
- InterfaceUUID=49292c6b-2b2e-49cb-98b6-20d4cd806bd2,
- ImplementationUUID=45749798-4afe-4884-a42a-a2c8b3d98795
- ] HTMLDirectoryElement : HTMLElement {
+ interface HTMLDirectoryElement : HTMLElement {
attribute boolean compact;
};
diff --git a/WebCore/html/HTMLDivElement.idl b/WebCore/html/HTMLDivElement.idl
index ea16f6b..9f0b581 100644
--- a/WebCore/html/HTMLDivElement.idl
+++ b/WebCore/html/HTMLDivElement.idl
@@ -19,10 +19,7 @@
module html {
- interface [
- InterfaceUUID=46fb9095-b485-4925-b6fd-2622935fd8bf,
- ImplementationUUID=5f8661b7-96ad-4a8b-864a-85d544319fd2
- ] HTMLDivElement : HTMLElement {
+ interface HTMLDivElement : HTMLElement {
attribute [ConvertNullToNullString] DOMString align;
};
diff --git a/WebCore/html/HTMLDocument.idl b/WebCore/html/HTMLDocument.idl
index b24d7ca..a79b913 100644
--- a/WebCore/html/HTMLDocument.idl
+++ b/WebCore/html/HTMLDocument.idl
@@ -21,9 +21,7 @@
module html {
interface [
- HasOverridingNameGetter,
- InterfaceUUID=a183339c-8d74-412a-933d-6f6a4ad6266e,
- ImplementationUUID=d0f7d966-033c-4cbf-847c-1461dacc2f6a
+ HasOverridingNameGetter
] HTMLDocument : Document {
[Custom] void open();
void close();
diff --git a/WebCore/html/HTMLElement.idl b/WebCore/html/HTMLElement.idl
index a8b1ed3..627dda2 100644
--- a/WebCore/html/HTMLElement.idl
+++ b/WebCore/html/HTMLElement.idl
@@ -22,9 +22,7 @@ module html {
interface [
GenerateNativeConverter,
- CustomPushEventHandlerScope,
- InterfaceUUID=b2f172f1-d209-446f-8143-5f21de678f95,
- ImplementationUUID=c81b0e16-a2b9-448b-ad0a-81c9346d6f8a
+ CustomPushEventHandlerScope
] HTMLElement : Element {
// iht.com relies on id returning the empty string when no id is present.
// Other browsers do this as well. So we don't convert null to JS null.
diff --git a/WebCore/html/HTMLEmbedElement.idl b/WebCore/html/HTMLEmbedElement.idl
index 1cd9135..d491a0d 100644
--- a/WebCore/html/HTMLEmbedElement.idl
+++ b/WebCore/html/HTMLEmbedElement.idl
@@ -24,9 +24,7 @@ module html {
DelegatingPutFunction,
DelegatingGetOwnPropertySlot,
CustomCall,
- HasOverridingNameGetter,
- InterfaceUUID=18f9bd58-6bb3-4b5c-aa30-6da13adfc91e,
- ImplementationUUID=93e0407a-8380-4ff0-978d-f773f2dee6a3
+ HasOverridingNameGetter
] HTMLEmbedElement : HTMLElement {
attribute [ConvertNullToNullString, Reflect] DOMString align;
#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
@@ -43,14 +41,12 @@ module html {
attribute [ConvertFromString] long width;
#endif
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
#if defined(ENABLE_SVG) && ENABLE_SVG
#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C || defined(ENABLE_SVG_DOM_OBJC_BINDINGS) && ENABLE_SVG_DOM_OBJC_BINDINGS
[SVGCheckSecurityDocument] SVGDocument getSVGDocument()
raises(DOMException);
#endif
#endif
-#endif
};
}
diff --git a/WebCore/html/HTMLFieldSetElement.idl b/WebCore/html/HTMLFieldSetElement.idl
index bf7143e..8cffe3d 100644
--- a/WebCore/html/HTMLFieldSetElement.idl
+++ b/WebCore/html/HTMLFieldSetElement.idl
@@ -19,14 +19,9 @@
module html {
- interface [
- InterfaceUUID=cf9e4c4c-a1c9-4740-ad6c-6e5ea94a51a5,
- ImplementationUUID=93573758-96db-415d-9bdc-ee7238604094
- ] HTMLFieldSetElement : HTMLElement {
+ interface HTMLFieldSetElement : HTMLElement {
readonly attribute HTMLFormElement form;
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
readonly attribute ValidityState validity;
-#endif
readonly attribute boolean willValidate;
readonly attribute DOMString validationMessage;
boolean checkValidity();
diff --git a/WebCore/html/HTMLFontElement.idl b/WebCore/html/HTMLFontElement.idl
index 332aae4..fa7d908 100644
--- a/WebCore/html/HTMLFontElement.idl
+++ b/WebCore/html/HTMLFontElement.idl
@@ -19,10 +19,7 @@
module html {
- interface [
- InterfaceUUID=f6a11dbe-7f40-49dc-a304-7997b25b2cb9,
- ImplementationUUID=a37453b9-f7ba-4896-8e91-37d1ecc5b7ce
- ] HTMLFontElement : HTMLElement {
+ interface HTMLFontElement : HTMLElement {
attribute [ConvertNullToNullString] DOMString color;
attribute [ConvertNullToNullString] DOMString face;
attribute [ConvertNullToNullString] DOMString size;
diff --git a/WebCore/html/HTMLFormElement.idl b/WebCore/html/HTMLFormElement.idl
index 0a04eda..d639c34 100644
--- a/WebCore/html/HTMLFormElement.idl
+++ b/WebCore/html/HTMLFormElement.idl
@@ -22,9 +22,7 @@ module html {
interface [
HasIndexGetter,
- HasOverridingNameGetter,
- InterfaceUUID=c7e79252-3b6d-4636-9efb-0667192ca5c3,
- ImplementationUUID=3561288f-5f67-4c45-9290-de4191d4c9c9
+ HasOverridingNameGetter
] HTMLFormElement : HTMLElement {
readonly attribute HTMLCollection elements;
readonly attribute long length;
diff --git a/WebCore/html/HTMLFrameElement.idl b/WebCore/html/HTMLFrameElement.idl
index 0f40619..453de0a 100644
--- a/WebCore/html/HTMLFrameElement.idl
+++ b/WebCore/html/HTMLFrameElement.idl
@@ -20,10 +20,7 @@
module html {
- interface [
- InterfaceUUID=0795de43-e0cb-429e-ae0b-d38dbb641fd7,
- ImplementationUUID=38c9e3c8-3384-40b6-a484-cb845c48b67d
- ] HTMLFrameElement : HTMLElement {
+ interface HTMLFrameElement : HTMLElement {
attribute [ConvertNullToNullString, Reflect=frameborder] DOMString frameBorder;
attribute [ConvertNullToNullString, Reflect=longdesc] DOMString longDesc;
@@ -37,7 +34,6 @@ module html {
// Introduced in DOM Level 2:
readonly attribute [CheckFrameSecurity] Document contentDocument;
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
// Extensions
readonly attribute DOMWindow contentWindow;
@@ -47,7 +43,6 @@ module html {
raises(DOMException);
#endif
#endif
-#endif
attribute [ConvertNullToNullString, CustomSetter] DOMString location;
readonly attribute long width;
diff --git a/WebCore/html/HTMLFrameSetElement.idl b/WebCore/html/HTMLFrameSetElement.idl
index 5577bf7..3a761ae 100644
--- a/WebCore/html/HTMLFrameSetElement.idl
+++ b/WebCore/html/HTMLFrameSetElement.idl
@@ -21,15 +21,12 @@
module html {
interface [
- HasOverridingNameGetter,
- InterfaceUUID=5038a73d-c0db-4847-acb4-4c6d31f48790,
- ImplementationUUID=450f7bf6-fdc0-4a0f-b7e1-baea7f7e5732
+ HasOverridingNameGetter
] HTMLFrameSetElement : HTMLElement {
attribute [ConvertNullToNullString] DOMString cols;
attribute [ConvertNullToNullString] DOMString rows;
#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
// Event handler attributes
attribute [DontEnum] EventListener onbeforeunload;
attribute [DontEnum] EventListener onhashchange;
@@ -57,7 +54,6 @@ module html {
// attribute [DontEnum] EventListener onredo;
// attribute [DontEnum] EventListener onundo;
#endif
-#endif
};
}
diff --git a/WebCore/html/HTMLHRElement.idl b/WebCore/html/HTMLHRElement.idl
index 2ad701c..bb1fdcf 100644
--- a/WebCore/html/HTMLHRElement.idl
+++ b/WebCore/html/HTMLHRElement.idl
@@ -19,10 +19,7 @@
module html {
- interface [
- InterfaceUUID=20477b34-ab22-47e3-b9aa-80c388d32975,
- ImplementationUUID=6cfc8977-172d-48f6-8f08-c7671f02354c
- ] HTMLHRElement : HTMLElement {
+ interface HTMLHRElement : HTMLElement {
attribute [ConvertNullToNullString] DOMString align;
attribute boolean noShade;
attribute [ConvertNullToNullString] DOMString size;
diff --git a/WebCore/html/HTMLHeadElement.idl b/WebCore/html/HTMLHeadElement.idl
index 83e25a1..8559dd3 100644
--- a/WebCore/html/HTMLHeadElement.idl
+++ b/WebCore/html/HTMLHeadElement.idl
@@ -19,10 +19,7 @@
module html {
- interface [
- InterfaceUUID=47e0c1a2-39ca-4be8-a4ef-38af06462d2e,
- ImplementationUUID=f56408fe-6987-4ece-b925-599f517bde50
- ] HTMLHeadElement : HTMLElement {
+ interface HTMLHeadElement : HTMLElement {
attribute [ConvertNullToNullString] DOMString profile;
};
diff --git a/WebCore/html/HTMLHeadingElement.idl b/WebCore/html/HTMLHeadingElement.idl
index 3c5af4e..486a5bd 100644
--- a/WebCore/html/HTMLHeadingElement.idl
+++ b/WebCore/html/HTMLHeadingElement.idl
@@ -19,10 +19,7 @@
module html {
- interface [
- InterfaceUUID=91c029bb-aa3a-4877-8ab5-59f304525fd5,
- ImplementationUUID=ab39e189-5d0c-465d-b518-f57bc920038b
- ] HTMLHeadingElement : HTMLElement {
+ interface HTMLHeadingElement : HTMLElement {
attribute [ConvertNullToNullString] DOMString align;
};
diff --git a/WebCore/html/HTMLHtmlElement.idl b/WebCore/html/HTMLHtmlElement.idl
index d58e3eb..9cee000 100644
--- a/WebCore/html/HTMLHtmlElement.idl
+++ b/WebCore/html/HTMLHtmlElement.idl
@@ -19,10 +19,7 @@
module html {
- interface [
- InterfaceUUID=162828a5-d4d9-4973-b5ca-00ccbb26ded9,
- ImplementationUUID=362f4f5f-99c5-4bbf-91ba-9ae7f9a7b297
- ] HTMLHtmlElement : HTMLElement {
+ interface HTMLHtmlElement : HTMLElement {
attribute [ConvertNullToNullString] DOMString version;
diff --git a/WebCore/html/HTMLIFrameElement.idl b/WebCore/html/HTMLIFrameElement.idl
index 65ce846..e1aed03 100644
--- a/WebCore/html/HTMLIFrameElement.idl
+++ b/WebCore/html/HTMLIFrameElement.idl
@@ -20,10 +20,7 @@
module html {
- interface [
- InterfaceUUID=32265f2e-79b1-4e4e-b0d1-86b050298883,
- ImplementationUUID=370c6318-f804-49f9-bc8a-46b99cd87399
- ] HTMLIFrameElement : HTMLElement {
+ interface HTMLIFrameElement : HTMLElement {
attribute [ConvertNullToNullString, Reflect] DOMString align;
attribute [ConvertNullToNullString, Reflect=frameborder] DOMString frameBorder;
@@ -40,7 +37,6 @@ module html {
// Introduced in DOM Level 2:
readonly attribute [CheckFrameSecurity] Document contentDocument;
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
// Extensions
readonly attribute DOMWindow contentWindow;
@@ -50,7 +46,6 @@ module html {
raises(DOMException);
#endif
#endif
-#endif
};
diff --git a/WebCore/html/HTMLImageElement.idl b/WebCore/html/HTMLImageElement.idl
index fb73249..3862539 100644
--- a/WebCore/html/HTMLImageElement.idl
+++ b/WebCore/html/HTMLImageElement.idl
@@ -20,10 +20,7 @@
module html {
- interface [
- InterfaceUUID=b21b8125-d00b-4bdf-b0e8-659678db3923,
- ImplementationUUID=2121ca21-8118-4f1b-b9fe-4788a9050281
- ] HTMLImageElement : HTMLElement {
+ interface HTMLImageElement : HTMLElement {
attribute [ConvertNullToNullString, Reflect] DOMString name;
attribute [ConvertNullToNullString, Reflect] DOMString align;
attribute [ConvertNullToNullString, Reflect] DOMString alt;
diff --git a/WebCore/html/HTMLInputElement.idl b/WebCore/html/HTMLInputElement.idl
index 3d001de..c1d8936 100644
--- a/WebCore/html/HTMLInputElement.idl
+++ b/WebCore/html/HTMLInputElement.idl
@@ -20,17 +20,12 @@
module html {
- interface [
- InterfaceUUID=8f388ea3-1c31-4cca-8edd-449d14e222e1,
- ImplementationUUID=aeb56b87-a90e-4d9d-a4d5-7eec3687c338
- ] HTMLInputElement : HTMLElement {
+ interface HTMLInputElement : HTMLElement {
attribute [ConvertNullToNullString] DOMString defaultValue;
attribute boolean defaultChecked;
readonly attribute HTMLFormElement form;
attribute boolean formNoValidate;
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
readonly attribute ValidityState validity;
-#endif
attribute [ConvertNullToNullString] DOMString accept;
attribute [ConvertNullToNullString] DOMString accessKey;
attribute [ConvertNullToNullString] DOMString align;
@@ -41,14 +36,10 @@ module html {
#if defined(ENABLE_DATALIST) && ENABLE_DATALIST
readonly attribute HTMLElement list;
#endif
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
attribute [ConvertNullToNullString, Reflect] DOMString max;
-#endif
attribute long maxLength
setter raises(DOMException);
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
attribute [ConvertNullToNullString, Reflect] DOMString min;
-#endif
attribute boolean multiple;
attribute [ConvertNullToNullString] DOMString name;
attribute [ConvertNullToNullString, Reflect] DOMString pattern;
@@ -105,9 +96,7 @@ module html {
readonly attribute URL absoluteImageURL;
#endif
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
readonly attribute FileList files;
-#endif
};
}
diff --git a/WebCore/html/HTMLIsIndexElement.idl b/WebCore/html/HTMLIsIndexElement.idl
index 83bbc16..d968fa7 100644
--- a/WebCore/html/HTMLIsIndexElement.idl
+++ b/WebCore/html/HTMLIsIndexElement.idl
@@ -19,10 +19,7 @@
module html {
- interface [
- InterfaceUUID=94fc4e39-4d81-44e3-a37d-364553b23a37,
- ImplementationUUID=b31d409b-8f68-495d-a0c2-b81520716974
- ] HTMLIsIndexElement : HTMLInputElement {
+ interface HTMLIsIndexElement : HTMLInputElement {
readonly attribute HTMLFormElement form;
attribute [ConvertNullToNullString] DOMString prompt;
};
diff --git a/WebCore/html/HTMLLIElement.idl b/WebCore/html/HTMLLIElement.idl
index 90aa702..946ec18 100644
--- a/WebCore/html/HTMLLIElement.idl
+++ b/WebCore/html/HTMLLIElement.idl
@@ -19,10 +19,7 @@
module html {
- interface [
- InterfaceUUID=83a4a75c-4427-4f53-b974-8107fedb4c2b,
- ImplementationUUID=5747808d-8cbd-49c9-b89b-3fdc315c55fe
- ] HTMLLIElement : HTMLElement {
+ interface HTMLLIElement : HTMLElement {
attribute [ConvertNullToNullString] DOMString type;
attribute long value;
};
diff --git a/WebCore/html/HTMLLabelElement.idl b/WebCore/html/HTMLLabelElement.idl
index a1f3eac..3b25fa9 100644
--- a/WebCore/html/HTMLLabelElement.idl
+++ b/WebCore/html/HTMLLabelElement.idl
@@ -20,10 +20,7 @@
module html {
- interface [
- InterfaceUUID=9978d8e6-1d27-4390-bd2f-56f0e72f16e3,
- ImplementationUUID=165b7633-0377-4853-a647-2b9005f5aaec
- ] HTMLLabelElement : HTMLElement {
+ interface HTMLLabelElement : HTMLElement {
readonly attribute HTMLFormElement form;
attribute [ConvertNullToNullString] DOMString accessKey;
attribute [ConvertNullToNullString] DOMString htmlFor;
diff --git a/WebCore/html/HTMLLegendElement.idl b/WebCore/html/HTMLLegendElement.idl
index 3d24e45..ee21e4c 100644
--- a/WebCore/html/HTMLLegendElement.idl
+++ b/WebCore/html/HTMLLegendElement.idl
@@ -20,10 +20,7 @@
module html {
- interface [
- InterfaceUUID=a6eb4254-6066-465a-a1c0-b4732281c255,
- ImplementationUUID=323e883c-edf8-4b13-a165-8604f4f06ae2
- ] HTMLLegendElement : HTMLElement {
+ interface HTMLLegendElement : HTMLElement {
readonly attribute HTMLFormElement form;
attribute [ConvertNullToNullString] DOMString accessKey;
attribute [ConvertNullToNullString] DOMString align;
diff --git a/WebCore/html/HTMLLinkElement.idl b/WebCore/html/HTMLLinkElement.idl
index 996ab64..dc700df 100644
--- a/WebCore/html/HTMLLinkElement.idl
+++ b/WebCore/html/HTMLLinkElement.idl
@@ -20,10 +20,7 @@
module html {
- interface [
- InterfaceUUID=a9e9ef29-f20b-429d-848e-e5dadd32694a,
- ImplementationUUID=2d9b944e-88e3-451a-8640-06c593c339a8
- ] HTMLLinkElement : HTMLElement {
+ interface HTMLLinkElement : HTMLElement {
attribute boolean disabled;
attribute [ConvertNullToNullString] DOMString charset;
attribute [ConvertNullToNullString] DOMString href;
@@ -34,10 +31,8 @@ module html {
attribute [ConvertNullToNullString] DOMString target;
attribute [ConvertNullToNullString] DOMString type;
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
// DOM Level 2 Style
readonly attribute StyleSheet sheet;
-#endif
#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
// Objective-C extension:
diff --git a/WebCore/html/HTMLMapElement.idl b/WebCore/html/HTMLMapElement.idl
index b7768b2..1a760d1 100644
--- a/WebCore/html/HTMLMapElement.idl
+++ b/WebCore/html/HTMLMapElement.idl
@@ -20,10 +20,7 @@
module html {
- interface [
- InterfaceUUID=8a660b48-4beb-4f9e-855b-e04131eb2519,
- ImplementationUUID=7ad57e02-91e5-4761-a1ca-e967188e5e0d
- ] HTMLMapElement : HTMLElement {
+ interface HTMLMapElement : HTMLElement {
readonly attribute HTMLCollection areas;
attribute [ConvertNullToNullString] DOMString name;
};
diff --git a/WebCore/html/HTMLMarqueeElement.idl b/WebCore/html/HTMLMarqueeElement.idl
index c5f5659..3659f81 100644
--- a/WebCore/html/HTMLMarqueeElement.idl
+++ b/WebCore/html/HTMLMarqueeElement.idl
@@ -19,10 +19,7 @@
module html {
- interface [
- InterfaceUUID=100ca673-eb1e-40b6-8cba-a15abc4cd590,
- ImplementationUUID=b9427505-1f10-4299-8b85-4e2891428988
- ] HTMLMarqueeElement : HTMLElement {
+ interface HTMLMarqueeElement : HTMLElement {
void start();
void stop();
diff --git a/WebCore/html/HTMLMenuElement.idl b/WebCore/html/HTMLMenuElement.idl
index 42d1c8f..238263a 100644
--- a/WebCore/html/HTMLMenuElement.idl
+++ b/WebCore/html/HTMLMenuElement.idl
@@ -19,10 +19,7 @@
module html {
- interface [
- InterfaceUUID=fb353af6-4927-4512-ad43-4ad8191b5615,
- ImplementationUUID=ec26257c-a2a4-43dc-b234-cf644d22b1fb
- ] HTMLMenuElement : HTMLElement {
+ interface HTMLMenuElement : HTMLElement {
attribute boolean compact;
};
diff --git a/WebCore/html/HTMLMetaElement.idl b/WebCore/html/HTMLMetaElement.idl
index 13e713d..ef7e4ab 100644
--- a/WebCore/html/HTMLMetaElement.idl
+++ b/WebCore/html/HTMLMetaElement.idl
@@ -19,10 +19,7 @@
module html {
- interface [
- InterfaceUUID=65e3374d-4789-4c81-983b-1b5a29d2c075,
- ImplementationUUID=a9ac9c73-055d-4c00-bd02-1fa215ae32f1
- ] HTMLMetaElement : HTMLElement {
+ interface HTMLMetaElement : HTMLElement {
attribute [ConvertNullToNullString] DOMString content;
attribute [ConvertNullToNullString] DOMString httpEquiv;
attribute [ConvertNullToNullString] DOMString name;
diff --git a/WebCore/html/HTMLModElement.idl b/WebCore/html/HTMLModElement.idl
index 70fcded..a6e3a02 100644
--- a/WebCore/html/HTMLModElement.idl
+++ b/WebCore/html/HTMLModElement.idl
@@ -19,10 +19,7 @@
module html {
- interface [
- InterfaceUUID=78c2bf89-c6e7-4d81-97df-429d07b91ff8,
- ImplementationUUID=39e7c659-40be-4620-949b-15ec6a25bb90
- ] HTMLModElement : HTMLElement {
+ interface HTMLModElement : HTMLElement {
attribute [ConvertNullToNullString] DOMString cite;
attribute [ConvertNullToNullString] DOMString dateTime;
};
diff --git a/WebCore/html/HTMLOListElement.idl b/WebCore/html/HTMLOListElement.idl
index 30d8210..32d81f2 100644
--- a/WebCore/html/HTMLOListElement.idl
+++ b/WebCore/html/HTMLOListElement.idl
@@ -19,10 +19,7 @@
module html {
- interface [
- InterfaceUUID=64165a4c-8889-4725-a149-abd13d5b4b61,
- ImplementationUUID=a20e9b6a-e3a5-4276-aa43-0097e57df8d8
- ] HTMLOListElement : HTMLElement {
+ interface HTMLOListElement : HTMLElement {
attribute boolean compact;
attribute long start;
attribute [ConvertNullToNullString] DOMString type;
diff --git a/WebCore/html/HTMLObjectElement.idl b/WebCore/html/HTMLObjectElement.idl
index 84e93c5..8d975ba 100644
--- a/WebCore/html/HTMLObjectElement.idl
+++ b/WebCore/html/HTMLObjectElement.idl
@@ -24,9 +24,7 @@ module html {
DelegatingPutFunction,
DelegatingGetOwnPropertySlot,
CustomCall,
- HasOverridingNameGetter,
- InterfaceUUID=9d04a3b8-9016-4b64-913a-3b00d548aca7,
- ImplementationUUID=2dd24554-6784-4ef9-9713-179f3d37b2f9
+ HasOverridingNameGetter
] HTMLObjectElement : HTMLElement {
readonly attribute HTMLFormElement form;
attribute [ConvertNullToNullString, Reflect] DOMString code;
@@ -50,14 +48,12 @@ module html {
// Introduced in DOM Level 2:
readonly attribute [CheckFrameSecurity] Document contentDocument;
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
#if defined(ENABLE_SVG) && ENABLE_SVG
#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C || defined(ENABLE_SVG_DOM_OBJC_BINDINGS) && ENABLE_SVG_DOM_OBJC_BINDINGS
[SVGCheckSecurityDocument] SVGDocument getSVGDocument()
raises(DOMException);
#endif
#endif
-#endif
#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
// Objective-C extension:
diff --git a/WebCore/html/HTMLOptGroupElement.idl b/WebCore/html/HTMLOptGroupElement.idl
index c998a9a..691bd13 100644
--- a/WebCore/html/HTMLOptGroupElement.idl
+++ b/WebCore/html/HTMLOptGroupElement.idl
@@ -19,10 +19,7 @@
module html {
- interface [
- InterfaceUUID=18b0ea8c-d3ea-4b14-abd8-8e1d4269fffc,
- ImplementationUUID=e26d8c4b-5181-4858-8231-f68ccbf819df
- ] HTMLOptGroupElement : HTMLElement {
+ interface HTMLOptGroupElement : HTMLElement {
attribute boolean disabled;
attribute [ConvertNullToNullString] DOMString label;
};
diff --git a/WebCore/html/HTMLOptionElement.idl b/WebCore/html/HTMLOptionElement.idl
index 2491ff3..c43132e 100644
--- a/WebCore/html/HTMLOptionElement.idl
+++ b/WebCore/html/HTMLOptionElement.idl
@@ -21,9 +21,7 @@
module html {
interface [
- GenerateNativeConverter,
- InterfaceUUID=74a7b64a-cf18-4da9-b3aa-e1f4d245d607,
- ImplementationUUID=166915d5-2c93-404b-b076-af3fa5ccbd83
+ GenerateNativeConverter
] HTMLOptionElement : HTMLElement {
readonly attribute HTMLFormElement form;
attribute boolean defaultSelected;
diff --git a/WebCore/html/HTMLOptionsCollection.idl b/WebCore/html/HTMLOptionsCollection.idl
index a7e191a..d9bfd45 100644
--- a/WebCore/html/HTMLOptionsCollection.idl
+++ b/WebCore/html/HTMLOptionsCollection.idl
@@ -23,9 +23,7 @@ module html {
// FIXME: The W3C spec says that HTMLOptionsCollection should not have a parent class.
interface [
GenerateNativeConverter,
- HasCustomIndexSetter,
- InterfaceUUID=a03aaeac-e47d-4bb3-acb4-f1897ae74237,
- ImplementationUUID=99c11fde-6f9f-44a4-a041-49a894c52e70
+ HasCustomIndexSetter
] HTMLOptionsCollection : HTMLCollection {
attribute long selectedIndex;
attribute [Custom] unsigned long length
diff --git a/WebCore/html/HTMLParagraphElement.idl b/WebCore/html/HTMLParagraphElement.idl
index 30e98b7..cd3b940 100644
--- a/WebCore/html/HTMLParagraphElement.idl
+++ b/WebCore/html/HTMLParagraphElement.idl
@@ -19,10 +19,7 @@
module html {
- interface [
- InterfaceUUID=dffe0809-f3f8-499d-8d5c-7d9893f23337,
- ImplementationUUID=21d60b62-4ecb-4849-8729-0a40c64d12aa
- ] HTMLParagraphElement : HTMLElement {
+ interface HTMLParagraphElement : HTMLElement {
attribute [ConvertNullToNullString] DOMString align;
};
diff --git a/WebCore/html/HTMLParamElement.idl b/WebCore/html/HTMLParamElement.idl
index 9b02b85..2473381 100644
--- a/WebCore/html/HTMLParamElement.idl
+++ b/WebCore/html/HTMLParamElement.idl
@@ -19,10 +19,7 @@
module html {
- interface [
- InterfaceUUID=76e05eee-c30d-4d52-a356-271f17b31dbf,
- ImplementationUUID=418d8a82-0a99-4c6f-a630-1e6071a74350
- ] HTMLParamElement : HTMLElement {
+ interface HTMLParamElement : HTMLElement {
attribute [ConvertNullToNullString] DOMString name;
attribute [ConvertNullToNullString] DOMString type;
attribute [ConvertNullToNullString] DOMString value;
diff --git a/WebCore/html/HTMLPreElement.idl b/WebCore/html/HTMLPreElement.idl
index 6f69bb8..5dc0e9e 100644
--- a/WebCore/html/HTMLPreElement.idl
+++ b/WebCore/html/HTMLPreElement.idl
@@ -20,10 +20,7 @@
module html {
- interface [
- InterfaceUUID=84050abc-45e6-4fd8-bdc3-29c7b4efb5cb,
- ImplementationUUID=e6de0d19-883e-4e87-9569-fd068e5ee17d
- ] HTMLPreElement : HTMLElement {
+ interface HTMLPreElement : HTMLElement {
// FIXME: DOM spec says that width should be of type DOMString
// see http://bugs.webkit.org/show_bug.cgi?id=8992
attribute long width;
diff --git a/WebCore/html/HTMLQuoteElement.idl b/WebCore/html/HTMLQuoteElement.idl
index 75e21f3..f95dc20 100644
--- a/WebCore/html/HTMLQuoteElement.idl
+++ b/WebCore/html/HTMLQuoteElement.idl
@@ -19,10 +19,7 @@
module html {
- interface [
- InterfaceUUID=a011e1a3-19ec-4999-a225-79ebdc64abdd,
- ImplementationUUID=85c885ee-cc47-4d98-852c-fb907d573024
- ] HTMLQuoteElement : HTMLElement {
+ interface HTMLQuoteElement : HTMLElement {
attribute [ConvertNullToNullString] DOMString cite;
};
}
diff --git a/WebCore/html/HTMLScriptElement.idl b/WebCore/html/HTMLScriptElement.idl
index 7ada785..8985512 100644
--- a/WebCore/html/HTMLScriptElement.idl
+++ b/WebCore/html/HTMLScriptElement.idl
@@ -19,10 +19,7 @@
module html {
- interface [
- InterfaceUUID=57ddf4da-1c9b-4005-87d7-eb9b2ed78e95,
- ImplementationUUID=2edb1093-08f1-4e76-9728-df5dedb879fe
- ] HTMLScriptElement : HTMLElement {
+ interface HTMLScriptElement : HTMLElement {
attribute [ConvertNullToNullString] DOMString text;
attribute [ConvertNullToNullString] DOMString htmlFor;
attribute [ConvertNullToNullString] DOMString event;
diff --git a/WebCore/html/HTMLSelectElement.idl b/WebCore/html/HTMLSelectElement.idl
index 9ed9267..d260fad 100644
--- a/WebCore/html/HTMLSelectElement.idl
+++ b/WebCore/html/HTMLSelectElement.idl
@@ -22,9 +22,7 @@ module html {
interface [
HasIndexGetter,
- HasCustomIndexSetter,
- InterfaceUUID=99013cd3-d644-4bb5-86a3-2e743821383b,
- ImplementationUUID=afe20462-588d-469a-9b4c-8879c4a461d5
+ HasCustomIndexSetter
] HTMLSelectElement : HTMLElement {
readonly attribute DOMString type;
@@ -40,9 +38,7 @@ module html {
#endif
readonly attribute HTMLFormElement form;
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
readonly attribute ValidityState validity;
-#endif
readonly attribute boolean willValidate;
readonly attribute DOMString validationMessage;
boolean checkValidity();
diff --git a/WebCore/html/HTMLStyleElement.idl b/WebCore/html/HTMLStyleElement.idl
index e8a71c9..562d01b 100644
--- a/WebCore/html/HTMLStyleElement.idl
+++ b/WebCore/html/HTMLStyleElement.idl
@@ -20,18 +20,13 @@
module html {
- interface [
- InterfaceUUID=3aaa334c-9660-48cf-b8e2-6d2b4ac0a1da,
- ImplementationUUID=73024a55-b8a1-461b-ad85-befa4089f80d
- ] HTMLStyleElement : HTMLElement {
+ interface HTMLStyleElement : HTMLElement {
attribute boolean disabled;
attribute [ConvertNullToNullString] DOMString media;
attribute [ConvertNullToNullString] DOMString type;
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
// DOM Level 2 Style
readonly attribute StyleSheet sheet;
-#endif
};
}
diff --git a/WebCore/html/HTMLTableCaptionElement.idl b/WebCore/html/HTMLTableCaptionElement.idl
index c595c47..86a197f 100644
--- a/WebCore/html/HTMLTableCaptionElement.idl
+++ b/WebCore/html/HTMLTableCaptionElement.idl
@@ -21,9 +21,7 @@
module html {
interface [
- GenerateNativeConverter,
- InterfaceUUID=cd92752d-2f0e-44af-b68e-12c178e1f087,
- ImplementationUUID=7c0e3749-0f81-4063-9760-8cec314a5b72
+ GenerateNativeConverter
] HTMLTableCaptionElement : HTMLElement {
attribute [ConvertNullToNullString] DOMString align;
diff --git a/WebCore/html/HTMLTableCellElement.idl b/WebCore/html/HTMLTableCellElement.idl
index 638d38f..a89149f 100644
--- a/WebCore/html/HTMLTableCellElement.idl
+++ b/WebCore/html/HTMLTableCellElement.idl
@@ -20,10 +20,7 @@
module html {
- interface [
- InterfaceUUID=3ad21d30-ce64-4a6f-9296-c07a16170783,
- ImplementationUUID=36fe6075-c9c1-4f22-bbc2-dd440f21f7cf
- ] HTMLTableCellElement : HTMLElement {
+ interface HTMLTableCellElement : HTMLElement {
readonly attribute long cellIndex;
attribute [ConvertNullToNullString] DOMString abbr;
diff --git a/WebCore/html/HTMLTableColElement.idl b/WebCore/html/HTMLTableColElement.idl
index daa7191..453ff3f 100644
--- a/WebCore/html/HTMLTableColElement.idl
+++ b/WebCore/html/HTMLTableColElement.idl
@@ -20,10 +20,7 @@
module html {
- interface [
- InterfaceUUID=4e886641-910e-424a-995c-e525c09dcfd3,
- ImplementationUUID=5f4cdf17-44f1-4b1d-9c68-206737085892
- ] HTMLTableColElement : HTMLElement {
+ interface HTMLTableColElement : HTMLElement {
attribute [ConvertNullToNullString] DOMString align;
attribute [ConvertNullToNullString] DOMString ch;
diff --git a/WebCore/html/HTMLTableElement.idl b/WebCore/html/HTMLTableElement.idl
index cd8f717..9cd72b0 100644
--- a/WebCore/html/HTMLTableElement.idl
+++ b/WebCore/html/HTMLTableElement.idl
@@ -20,10 +20,7 @@
module html {
- interface [
- InterfaceUUID=3f9c6e17-ee0c-43de-94b0-2a21b19b612c,
- ImplementationUUID=159bb8fe-ffee-4ff9-b507-76741118143f
- ] HTMLTableElement : HTMLElement {
+ interface HTMLTableElement : HTMLElement {
// could raise excepetions on setting.
attribute HTMLTableCaptionElement caption
diff --git a/WebCore/html/HTMLTableRowElement.idl b/WebCore/html/HTMLTableRowElement.idl
index fc2697e..052b516 100644
--- a/WebCore/html/HTMLTableRowElement.idl
+++ b/WebCore/html/HTMLTableRowElement.idl
@@ -20,10 +20,7 @@
module html {
- interface [
- InterfaceUUID=f14ea3d9-8643-4cfd-a692-cefe6d5c65ea,
- ImplementationUUID=0ce090da-33bb-4163-bb35-3ca8a2f6be47
- ] HTMLTableRowElement : HTMLElement {
+ interface HTMLTableRowElement : HTMLElement {
readonly attribute long rowIndex;
readonly attribute long sectionRowIndex;
diff --git a/WebCore/html/HTMLTableSectionElement.idl b/WebCore/html/HTMLTableSectionElement.idl
index e05653e..57e4293 100644
--- a/WebCore/html/HTMLTableSectionElement.idl
+++ b/WebCore/html/HTMLTableSectionElement.idl
@@ -21,9 +21,7 @@
module html {
interface [
- GenerateNativeConverter,
- InterfaceUUID=e0cf6b6a-9ba1-400f-b523-dbb22819dfb6,
- ImplementationUUID=85329cf4-1eae-4245-a971-1bddb212a9c5
+ GenerateNativeConverter
] HTMLTableSectionElement : HTMLElement {
attribute [ConvertNullToNullString] DOMString align;
diff --git a/WebCore/html/HTMLTextAreaElement.idl b/WebCore/html/HTMLTextAreaElement.idl
index e1b6653..2d82eed 100644
--- a/WebCore/html/HTMLTextAreaElement.idl
+++ b/WebCore/html/HTMLTextAreaElement.idl
@@ -20,15 +20,10 @@
module html {
- interface [
- InterfaceUUID=8b16bba6-efa9-4887-b863-308b4f9b9202,
- ImplementationUUID=2414be6e-bae0-472d-b124-beed5ca82d3b
- ] HTMLTextAreaElement : HTMLElement {
+ interface HTMLTextAreaElement : HTMLElement {
attribute [ConvertNullToNullString] DOMString defaultValue;
readonly attribute HTMLFormElement form;
-#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
readonly attribute ValidityState validity;
-#endif
attribute [ConvertNullToNullString] DOMString accessKey;
attribute long cols;
attribute boolean disabled;
diff --git a/WebCore/html/HTMLTitleElement.idl b/WebCore/html/HTMLTitleElement.idl
index 9a8b36f..de857e8 100644
--- a/WebCore/html/HTMLTitleElement.idl
+++ b/WebCore/html/HTMLTitleElement.idl
@@ -19,10 +19,7 @@
module html {
- interface [
- InterfaceUUID=036211fb-c1e9-4265-aac5-c5874e4a499c,
- ImplementationUUID=ff577152-4ea3-404f-912d-ed1d0b64e60e
- ] HTMLTitleElement : HTMLElement {
+ interface HTMLTitleElement : HTMLElement {
attribute [ConvertNullToNullString] DOMString text;
};
diff --git a/WebCore/html/HTMLUListElement.idl b/WebCore/html/HTMLUListElement.idl
index e736cc9..38434f1 100644
--- a/WebCore/html/HTMLUListElement.idl
+++ b/WebCore/html/HTMLUListElement.idl
@@ -19,10 +19,7 @@
module html {
- interface [
- InterfaceUUID=6877dee4-be67-4fb0-af8c-5023b108a1b0,
- ImplementationUUID=23e9c21a-618e-42ac-a053-df85918118df
- ] HTMLUListElement : HTMLElement {
+ interface HTMLUListElement : HTMLElement {
attribute boolean compact;
attribute [ConvertNullToNullString] DOMString type;
};
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index c71a6da..70e6496 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-07 Kent Tamura <tkent at chromium.org>
+
+ Reviewed by Maciej Stachowiak.
+
+ Remove COM code generation files.
+ https://bugs.webkit.org/show_bug.cgi?id=32854
+
+ * WebKit.vcproj/DerivedSources.make: Removed.
+ * WebKit.vcproj/build-generated-files.sh: Removed.
+
2010-01-05 Adam Roben <aroben at apple.com>
Make IWebView::close and destroying a WebView's HWND optional for
diff --git a/WebKit/win/WebKit.vcproj/DerivedSources.make b/WebKit/win/WebKit.vcproj/DerivedSources.make
deleted file mode 100644
index 73648a0..0000000
--- a/WebKit/win/WebKit.vcproj/DerivedSources.make
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright (C) 2007 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.
-# 3. Neither the name of Apple puter, Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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.
-
-PREFIX = IGEN_DOM
-
-WEBKIT_IDL = $(WEBKIT)/Interfaces/WebKit.idl
-
-HAND_WRITTEN_INTERFACES = $(filter-out $(WEBKIT_IDL), $(wildcard $(WEBKIT)/Interfaces/*.idl))
-
-GENERATED_INTERFACES = \
- $(PREFIX)Node.idl \
- $(PREFIX)Attr.idl \
- $(PREFIX)NodeList.idl \
- $(PREFIX)Element.idl \
- $(PREFIX)Document.idl \
- $(PREFIX)CharacterData.idl \
- $(PREFIX)CDATASection.idl \
- $(PREFIX)Comment.idl \
- $(PREFIX)Text.idl \
- $(PREFIX)DocumentFragment.idl \
- $(PREFIX)DocumentType.idl \
- $(PREFIX)DOMImplementation.idl \
- $(PREFIX)Entity.idl \
- $(PREFIX)EntityReference.idl \
- $(PREFIX)NamedNodeMap.idl \
- $(PREFIX)Notation.idl \
- $(PREFIX)ProcessingInstruction.idl \
- \
- $(PREFIX)HTMLAnchorElement.idl \
- $(PREFIX)HTMLAppletElement.idl \
- $(PREFIX)HTMLAreaElement.idl \
- $(PREFIX)HTMLBRElement.idl \
- $(PREFIX)HTMLBaseElement.idl \
- $(PREFIX)HTMLBaseFontElement.idl \
- $(PREFIX)HTMLBlockquoteElement.idl \
- $(PREFIX)HTMLBodyElement.idl \
- $(PREFIX)HTMLButtonElement.idl \
- $(PREFIX)HTMLCollection.idl \
- $(PREFIX)HTMLDListElement.idl \
- $(PREFIX)HTMLDirectoryElement.idl \
- $(PREFIX)HTMLDivElement.idl \
- $(PREFIX)HTMLDocument.idl \
- $(PREFIX)HTMLElement.idl \
- $(PREFIX)HTMLEmbedElement.idl \
- $(PREFIX)HTMLFieldSetElement.idl \
- $(PREFIX)HTMLFontElement.idl \
- $(PREFIX)HTMLFormElement.idl \
- $(PREFIX)HTMLFrameElement.idl \
- $(PREFIX)HTMLFrameSetElement.idl \
- $(PREFIX)HTMLHRElement.idl \
- $(PREFIX)HTMLHeadElement.idl \
- $(PREFIX)HTMLHeadingElement.idl \
- $(PREFIX)HTMLHtmlElement.idl \
- $(PREFIX)HTMLIFrameElement.idl \
- $(PREFIX)HTMLImageElement.idl \
- $(PREFIX)HTMLInputElement.idl \
- $(PREFIX)HTMLIsIndexElement.idl \
- $(PREFIX)HTMLLIElement.idl \
- $(PREFIX)HTMLLabelElement.idl \
- $(PREFIX)HTMLLegendElement.idl \
- $(PREFIX)HTMLLinkElement.idl \
- $(PREFIX)HTMLMapElement.idl \
- $(PREFIX)HTMLMarqueeElement.idl \
- $(PREFIX)HTMLMenuElement.idl \
- $(PREFIX)HTMLMetaElement.idl \
- $(PREFIX)HTMLModElement.idl \
- $(PREFIX)HTMLOListElement.idl \
- $(PREFIX)HTMLObjectElement.idl \
- $(PREFIX)HTMLOptGroupElement.idl \
- $(PREFIX)HTMLOptionElement.idl \
- $(PREFIX)HTMLOptionsCollection.idl \
- $(PREFIX)HTMLParagraphElement.idl \
- $(PREFIX)HTMLParamElement.idl \
- $(PREFIX)HTMLPreElement.idl \
- $(PREFIX)HTMLQuoteElement.idl \
- $(PREFIX)HTMLScriptElement.idl \
- $(PREFIX)HTMLSelectElement.idl \
- $(PREFIX)HTMLStyleElement.idl \
- $(PREFIX)HTMLTableCaptionElement.idl \
- $(PREFIX)HTMLTableCellElement.idl \
- $(PREFIX)HTMLTableColElement.idl \
- $(PREFIX)HTMLTableElement.idl \
- $(PREFIX)HTMLTableRowElement.idl \
- $(PREFIX)HTMLTableSectionElement.idl \
- $(PREFIX)HTMLTextAreaElement.idl \
- $(PREFIX)HTMLTitleElement.idl \
- $(PREFIX)HTMLUListElement.idl \
- \
- $(PREFIX)CSSCharsetRule.idl \
- $(PREFIX)CSSFontFaceRule.idl \
- $(PREFIX)CSSImportRule.idl \
- $(PREFIX)CSSMediaRule.idl \
- $(PREFIX)CSSPageRule.idl \
- $(PREFIX)CSSPrimitiveValue.idl \
- $(PREFIX)CSSRule.idl \
- $(PREFIX)CSSRuleList.idl \
- $(PREFIX)CSSStyleDeclaration.idl \
- $(PREFIX)CSSStyleRule.idl \
- $(PREFIX)CSSStyleSheet.idl \
- $(PREFIX)CSSUnknownRule.idl \
- $(PREFIX)CSSValue.idl \
- $(PREFIX)CSSValueList.idl \
- $(PREFIX)Counter.idl \
- $(PREFIX)MediaList.idl \
- $(PREFIX)Rect.idl \
- $(PREFIX)StyleSheet.idl \
- $(PREFIX)StyleSheetList.idl \
- \
- $(PREFIX)Event.idl \
- $(PREFIX)EventTarget.idl \
- $(PREFIX)EventListener.idl \
-#
-
-.PHONY : all
-all : \
- $(GENERATED_INTERFACES) \
- $(WEBKIT_IDL) \
-#
-
-# $(PREFIX)CanvasGradient.idl \
-# $(PREFIX)CanvasPattern.idl \
-# $(PREFIX)CanvasRenderingContext2D.idl \
-# $(PREFIX)HTMLCanvasElement.idl \
-# $(PREFIX)RGBColor.idl \
-
-COM_BINDINGS_SCRIPTS = \
- $(WEBKIT_OUTPUT)/obj/WebKit/DOMInterfaces/CodeGenerator.pm \
- $(WEBKIT_OUTPUT)/obj/WebKit/DOMInterfaces/CodeGeneratorCOM.pm \
- $(WEBKIT_OUTPUT)/obj/WebKit/DOMInterfaces/IDLParser.pm \
- $(WEBKIT_OUTPUT)/obj/WebKit/DOMInterfaces/IDLStructure.pm \
- $(WEBKIT_OUTPUT)/obj/WebKit/DOMInterfaces/generate-bindings.pl \
-#
-
-$(PREFIX)%.idl : $(WEBKIT_OUTPUT)/obj/WebKit/DOMInterfaces/%.idl $(COM_BINDINGS_SCRIPTS)
- perl -I $(WEBKIT_OUTPUT)/obj/WebKit/DOMInterfaces/ $(WEBKIT_OUTPUT)/obj/WebKit/DOMInterfaces/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_COM" --generator COM --include $(WEBKIT_OUTPUT)/obj/WebKit/DOMInterfaces/ --outputdir . $<
-
-$(WEBKIT_IDL) : $(HAND_WRITTEN_INTERFACES) $(GENERATED_INTERFACES)
- touch $@
diff --git a/WebKit/win/WebKit.vcproj/build-generated-files.sh b/WebKit/win/WebKit.vcproj/build-generated-files.sh
deleted file mode 100644
index ac26fd2..0000000
--- a/WebKit/win/WebKit.vcproj/build-generated-files.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/bash
-
-# Copyright (C) 2007 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.
-# 3. Neither the name of Apple puter, Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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.
-
-NUMCPUPATH="../../../WebKitTools/Scripts/num-cpus"
-if [ -x $NUMCPUPATH ]; then
- NUMCPUS=`$NUMCPUPATH`
-else
- NUMCPUS=1
-fi
-
-XSRCROOT="`pwd`/.."
-XSRCROOT=`realpath "$XSRCROOT"`
-# Do a little dance to get the path into 8.3 form to make it safe for gnu make
-# http://bugzilla.opendarwin.org/show_bug.cgi?id=8173
-XSRCROOT=`cygpath -m -s "$XSRCROOT"`
-XSRCROOT=`cygpath -u "$XSRCROOT"`
-export XSRCROOT
-export SOURCE_ROOT=$XSRCROOT
-
-XDSTROOT="$1"
-export XDSTROOT
-# Do a little dance to get the path into 8.3 form to make it safe for gnu make
-# http://bugzilla.opendarwin.org/show_bug.cgi?id=8173
-XDSTROOT=`cygpath -m -s "$XDSTROOT"`
-XDSTROOT=`cygpath -u "$XDSTROOT"`
-export XDSTROOT
-
-export BUILT_PRODUCTS_DIR="$XDSTROOT/obj/WebKit"
-
-mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources"
-cd "${BUILT_PRODUCTS_DIR}/DerivedSources"
-
-export WEBKIT=$XSRCROOT
-export WEBKIT_OUTPUT=$XDSTROOT
-
-export FEATURE_DEFINES="ENABLE_XPATH ENABLE_SVG"
-make -f "$WEBKIT/WebKit.vcproj/DerivedSources.make" -j ${NUMCPUS} || exit 1
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list