Reviewed by Tim H.
authorweinig <weinig@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 24 Sep 2006 19:34:43 +0000 (19:34 +0000)
committerweinig <weinig@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 24 Sep 2006 19:34:43 +0000 (19:34 +0000)
        Patch for http://bugzilla.opendarwin.org/show_bug.cgi?id=11009
        Auto-generate the internal methods interfaces for the Objective-C bindings

        - Auto-generate the internal method declarations into their own files
          named in the form DOMFooBarInternal.h for class DOMFooBar.

        - Remove all use of DOM_cast from code.

        - Assorted cleanups.

        * WebCore.xcodeproj/project.pbxproj:
        * bindings/objc/DOM.mm:
        (-[DOMNode _initWithNode:WebCore::]):
        (-[DOMNode WebCore::]):
        (-[DOMRange dealloc]):
        (-[DOMRange finalize]):
        (-[DOMRange _initWithRange:WebCore::]):
        (-[DOMRange WebCore::]):
        (-[DOMNodeFilter _initWithNodeFilter:WebCore::]):
        (-[DOMNodeFilter WebCore::]):
        (-[DOMNodeFilter dealloc]):
        (-[DOMNodeFilter finalize]):
        (-[DOMNodeIterator _initWithNodeIterator:WebCore::filter:]):
        (-[DOMNodeIterator WebCore::]):
        (-[DOMTreeWalker _initWithTreeWalker:WebCore::filter:]):
        (-[DOMTreeWalker WebCore::]):
        * bindings/objc/DOMAbstractView.mm:
        (-[DOMAbstractView _initWithAbstractView:WebCore::]):
        * bindings/objc/DOMCSS.mm:
        (-[DOMStyleSheet _initWithStyleSheet:WebCore::]):
        (-[DOMCSSRule _initWithRule:WebCore::]):
        (-[DOMCSSValue _initWithValue:WebCore::]):
        * bindings/objc/DOMEvents.mm:
        (-[DOMEvent _initWithEvent:WebCore::]):
        * bindings/objc/DOMHTMLAppletElement.mm:
        (-[DOMHTMLAppletElement align]):
        (-[DOMHTMLAppletElement setAlign:]):
        (-[DOMHTMLAppletElement alt]):
        (-[DOMHTMLAppletElement setAlt:]):
        (-[DOMHTMLAppletElement archive]):
        (-[DOMHTMLAppletElement setArchive:]):
        (-[DOMHTMLAppletElement code]):
        (-[DOMHTMLAppletElement setCode:]):
        (-[DOMHTMLAppletElement codeBase]):
        (-[DOMHTMLAppletElement setCodeBase:]):
        (-[DOMHTMLAppletElement height]):
        (-[DOMHTMLAppletElement setHeight:]):
        (-[DOMHTMLAppletElement hspace]):
        (-[DOMHTMLAppletElement setHspace:]):
        (-[DOMHTMLAppletElement name]):
        (-[DOMHTMLAppletElement setName:]):
        (-[DOMHTMLAppletElement object]):
        (-[DOMHTMLAppletElement setObject:]):
        (-[DOMHTMLAppletElement vspace]):
        (-[DOMHTMLAppletElement setVspace:]):
        (-[DOMHTMLAppletElement width]):
        (-[DOMHTMLAppletElement setWidth:]):
        * bindings/objc/DOMInternal.h:
        (getDOMWrapper):
        (addDOMWrapper):
        (raiseOnDOMError):
        * bindings/objc/DOMXPath.mm:
        (-[DOMNativeXPathNSResolver _initWithXPathNSResolver:WebCore::]):
        * bindings/scripts/CodeGeneratorObjC.pm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16548 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/bindings/objc/DOM.mm
WebCore/bindings/objc/DOMAbstractView.mm
WebCore/bindings/objc/DOMCSS.mm
WebCore/bindings/objc/DOMEvents.mm
WebCore/bindings/objc/DOMHTMLAppletElement.mm
WebCore/bindings/objc/DOMInternal.h
WebCore/bindings/objc/DOMXPath.mm
WebCore/bindings/scripts/CodeGeneratorObjC.pm

index b54fd9399767a60dfeac00040b7084ec92ed0120..3cacf3894e578653c266f552e0920fac0556cbb2 100644 (file)
@@ -1,3 +1,72 @@
+2006-09-24  Sam Weinig  <sam.weinig@gmail.com>
+
+        Reviewed by Tim H.
+
+        Patch for http://bugzilla.opendarwin.org/show_bug.cgi?id=11009
+        Auto-generate the internal methods interfaces for the Objective-C bindings
+
+        - Auto-generate the internal method declarations into their own files
+          named in the form DOMFooBarInternal.h for class DOMFooBar.
+
+        - Remove all use of DOM_cast from code.
+
+        - Assorted cleanups.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/objc/DOM.mm:
+        (-[DOMNode _initWithNode:WebCore::]):
+        (-[DOMNode WebCore::]):
+        (-[DOMRange dealloc]):
+        (-[DOMRange finalize]):
+        (-[DOMRange _initWithRange:WebCore::]):
+        (-[DOMRange WebCore::]):
+        (-[DOMNodeFilter _initWithNodeFilter:WebCore::]):
+        (-[DOMNodeFilter WebCore::]):
+        (-[DOMNodeFilter dealloc]):
+        (-[DOMNodeFilter finalize]):
+        (-[DOMNodeIterator _initWithNodeIterator:WebCore::filter:]):
+        (-[DOMNodeIterator WebCore::]):
+        (-[DOMTreeWalker _initWithTreeWalker:WebCore::filter:]):
+        (-[DOMTreeWalker WebCore::]):
+        * bindings/objc/DOMAbstractView.mm:
+        (-[DOMAbstractView _initWithAbstractView:WebCore::]):
+        * bindings/objc/DOMCSS.mm:
+        (-[DOMStyleSheet _initWithStyleSheet:WebCore::]):
+        (-[DOMCSSRule _initWithRule:WebCore::]):
+        (-[DOMCSSValue _initWithValue:WebCore::]):
+        * bindings/objc/DOMEvents.mm:
+        (-[DOMEvent _initWithEvent:WebCore::]):
+        * bindings/objc/DOMHTMLAppletElement.mm:
+        (-[DOMHTMLAppletElement align]):
+        (-[DOMHTMLAppletElement setAlign:]):
+        (-[DOMHTMLAppletElement alt]):
+        (-[DOMHTMLAppletElement setAlt:]):
+        (-[DOMHTMLAppletElement archive]):
+        (-[DOMHTMLAppletElement setArchive:]):
+        (-[DOMHTMLAppletElement code]):
+        (-[DOMHTMLAppletElement setCode:]):
+        (-[DOMHTMLAppletElement codeBase]):
+        (-[DOMHTMLAppletElement setCodeBase:]):
+        (-[DOMHTMLAppletElement height]):
+        (-[DOMHTMLAppletElement setHeight:]):
+        (-[DOMHTMLAppletElement hspace]):
+        (-[DOMHTMLAppletElement setHspace:]):
+        (-[DOMHTMLAppletElement name]):
+        (-[DOMHTMLAppletElement setName:]):
+        (-[DOMHTMLAppletElement object]):
+        (-[DOMHTMLAppletElement setObject:]):
+        (-[DOMHTMLAppletElement vspace]):
+        (-[DOMHTMLAppletElement setVspace:]):
+        (-[DOMHTMLAppletElement width]):
+        (-[DOMHTMLAppletElement setWidth:]):
+        * bindings/objc/DOMInternal.h:
+        (getDOMWrapper):
+        (addDOMWrapper):
+        (raiseOnDOMError):
+        * bindings/objc/DOMXPath.mm:
+        (-[DOMNativeXPathNSResolver _initWithXPathNSResolver:WebCore::]):
+        * bindings/scripts/CodeGeneratorObjC.pm:
+
 2006-09-24  Nikolas Zimmermann  <zimmermann@kde.org>
 
         Reviewed by eseidel.
index 006bfc765f47a53dac4140b325313e4166a11d56..1c0100de01f33a48b2f1be5c6983ef31f556a6e4 100644 (file)
                85DF82700AA78B8B00486AD7 /* DOMHTMLTableElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 85DF826E0AA78B8A00486AD7 /* DOMHTMLTableElement.h */; };
                85DF82710AA78B8B00486AD7 /* DOMHTMLTableElement.mm in Sources */ = {isa = PBXBuildFile; fileRef = 85DF826F0AA78B8A00486AD7 /* DOMHTMLTableElement.mm */; };
                85DF82740AA78C7300486AD7 /* DOMHTMLTableElement.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 85DF826E0AA78B8A00486AD7 /* DOMHTMLTableElement.h */; };
+               85E7118D0AC5D5350053270F /* DOMAttrInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7113E0AC5D5340053270F /* DOMAttrInternal.h */; };
+               85E7118E0AC5D5350053270F /* DOMCDATASectionInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7113F0AC5D5340053270F /* DOMCDATASectionInternal.h */; };
+               85E7118F0AC5D5350053270F /* DOMCharacterDataInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711400AC5D5340053270F /* DOMCharacterDataInternal.h */; };
+               85E711900AC5D5350053270F /* DOMCommentInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711410AC5D5340053270F /* DOMCommentInternal.h */; };
+               85E711910AC5D5350053270F /* DOMCounterInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711420AC5D5340053270F /* DOMCounterInternal.h */; };
+               85E711920AC5D5350053270F /* DOMCSSRuleListInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711430AC5D5340053270F /* DOMCSSRuleListInternal.h */; };
+               85E711930AC5D5350053270F /* DOMCSSStyleDeclarationInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711440AC5D5340053270F /* DOMCSSStyleDeclarationInternal.h */; };
+               85E711940AC5D5350053270F /* DOMDocumentFragmentInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711450AC5D5340053270F /* DOMDocumentFragmentInternal.h */; };
+               85E711950AC5D5350053270F /* DOMDocumentInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711460AC5D5340053270F /* DOMDocumentInternal.h */; };
+               85E711960AC5D5350053270F /* DOMDocumentTypeInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711470AC5D5340053270F /* DOMDocumentTypeInternal.h */; };
+               85E711970AC5D5350053270F /* DOMDOMImplementationInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711480AC5D5340053270F /* DOMDOMImplementationInternal.h */; };
+               85E711980AC5D5350053270F /* DOMElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711490AC5D5340053270F /* DOMElementInternal.h */; };
+               85E711990AC5D5350053270F /* DOMEntityInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7114A0AC5D5340053270F /* DOMEntityInternal.h */; };
+               85E7119A0AC5D5350053270F /* DOMEntityReferenceInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7114B0AC5D5340053270F /* DOMEntityReferenceInternal.h */; };
+               85E7119B0AC5D5350053270F /* DOMHTMLAnchorElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7114C0AC5D5340053270F /* DOMHTMLAnchorElementInternal.h */; };
+               85E7119C0AC5D5350053270F /* DOMHTMLAreaElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7114D0AC5D5340053270F /* DOMHTMLAreaElementInternal.h */; };
+               85E7119D0AC5D5350053270F /* DOMHTMLBaseElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7114E0AC5D5340053270F /* DOMHTMLBaseElementInternal.h */; };
+               85E7119E0AC5D5350053270F /* DOMHTMLBaseFontElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7114F0AC5D5340053270F /* DOMHTMLBaseFontElementInternal.h */; };
+               85E7119F0AC5D5350053270F /* DOMHTMLBodyElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711500AC5D5340053270F /* DOMHTMLBodyElementInternal.h */; };
+               85E711A00AC5D5350053270F /* DOMHTMLBRElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711510AC5D5340053270F /* DOMHTMLBRElementInternal.h */; };
+               85E711A10AC5D5350053270F /* DOMHTMLButtonElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711520AC5D5340053270F /* DOMHTMLButtonElementInternal.h */; };
+               85E711A20AC5D5350053270F /* DOMHTMLCollectionInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711530AC5D5340053270F /* DOMHTMLCollectionInternal.h */; };
+               85E711A30AC5D5350053270F /* DOMHTMLDirectoryElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711540AC5D5340053270F /* DOMHTMLDirectoryElementInternal.h */; };
+               85E711A40AC5D5350053270F /* DOMHTMLDivElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711550AC5D5340053270F /* DOMHTMLDivElementInternal.h */; };
+               85E711A50AC5D5350053270F /* DOMHTMLDListElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711560AC5D5340053270F /* DOMHTMLDListElementInternal.h */; };
+               85E711A60AC5D5350053270F /* DOMHTMLDocumentInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711570AC5D5340053270F /* DOMHTMLDocumentInternal.h */; };
+               85E711A70AC5D5350053270F /* DOMHTMLElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711580AC5D5340053270F /* DOMHTMLElementInternal.h */; };
+               85E711A80AC5D5350053270F /* DOMHTMLFieldSetElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711590AC5D5340053270F /* DOMHTMLFieldSetElementInternal.h */; };
+               85E711A90AC5D5350053270F /* DOMHTMLFontElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7115A0AC5D5340053270F /* DOMHTMLFontElementInternal.h */; };
+               85E711AA0AC5D5350053270F /* DOMHTMLFormElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7115B0AC5D5340053270F /* DOMHTMLFormElementInternal.h */; };
+               85E711AB0AC5D5350053270F /* DOMHTMLFrameElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7115C0AC5D5340053270F /* DOMHTMLFrameElementInternal.h */; };
+               85E711AC0AC5D5350053270F /* DOMHTMLFrameSetElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7115D0AC5D5340053270F /* DOMHTMLFrameSetElementInternal.h */; };
+               85E711AD0AC5D5350053270F /* DOMHTMLHeadElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7115E0AC5D5350053270F /* DOMHTMLHeadElementInternal.h */; };
+               85E711AE0AC5D5350053270F /* DOMHTMLHeadingElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7115F0AC5D5350053270F /* DOMHTMLHeadingElementInternal.h */; };
+               85E711AF0AC5D5350053270F /* DOMHTMLHRElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711600AC5D5350053270F /* DOMHTMLHRElementInternal.h */; };
+               85E711B00AC5D5350053270F /* DOMHTMLHtmlElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711610AC5D5350053270F /* DOMHTMLHtmlElementInternal.h */; };
+               85E711B10AC5D5350053270F /* DOMHTMLIFrameElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711620AC5D5350053270F /* DOMHTMLIFrameElementInternal.h */; };
+               85E711B20AC5D5350053270F /* DOMHTMLImageElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711630AC5D5350053270F /* DOMHTMLImageElementInternal.h */; };
+               85E711B30AC5D5350053270F /* DOMHTMLInputElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711640AC5D5350053270F /* DOMHTMLInputElementInternal.h */; };
+               85E711B40AC5D5350053270F /* DOMHTMLIsIndexElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711650AC5D5350053270F /* DOMHTMLIsIndexElementInternal.h */; };
+               85E711B50AC5D5350053270F /* DOMHTMLLabelElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711660AC5D5350053270F /* DOMHTMLLabelElementInternal.h */; };
+               85E711B60AC5D5350053270F /* DOMHTMLLegendElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711670AC5D5350053270F /* DOMHTMLLegendElementInternal.h */; };
+               85E711B70AC5D5350053270F /* DOMHTMLLIElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711680AC5D5350053270F /* DOMHTMLLIElementInternal.h */; };
+               85E711B80AC5D5350053270F /* DOMHTMLLinkElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711690AC5D5350053270F /* DOMHTMLLinkElementInternal.h */; };
+               85E711B90AC5D5350053270F /* DOMHTMLMapElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7116A0AC5D5350053270F /* DOMHTMLMapElementInternal.h */; };
+               85E711BA0AC5D5350053270F /* DOMHTMLMenuElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7116B0AC5D5350053270F /* DOMHTMLMenuElementInternal.h */; };
+               85E711BB0AC5D5350053270F /* DOMHTMLMetaElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7116C0AC5D5350053270F /* DOMHTMLMetaElementInternal.h */; };
+               85E711BC0AC5D5350053270F /* DOMHTMLModElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7116D0AC5D5350053270F /* DOMHTMLModElementInternal.h */; };
+               85E711BD0AC5D5350053270F /* DOMHTMLObjectElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7116E0AC5D5350053270F /* DOMHTMLObjectElementInternal.h */; };
+               85E711BE0AC5D5350053270F /* DOMHTMLOListElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7116F0AC5D5350053270F /* DOMHTMLOListElementInternal.h */; };
+               85E711BF0AC5D5350053270F /* DOMHTMLOptGroupElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711700AC5D5350053270F /* DOMHTMLOptGroupElementInternal.h */; };
+               85E711C00AC5D5350053270F /* DOMHTMLOptionsCollectionInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711710AC5D5350053270F /* DOMHTMLOptionsCollectionInternal.h */; };
+               85E711C10AC5D5350053270F /* DOMHTMLParagraphElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711720AC5D5350053270F /* DOMHTMLParagraphElementInternal.h */; };
+               85E711C20AC5D5350053270F /* DOMHTMLParamElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711730AC5D5350053270F /* DOMHTMLParamElementInternal.h */; };
+               85E711C30AC5D5350053270F /* DOMHTMLPreElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711740AC5D5350053270F /* DOMHTMLPreElementInternal.h */; };
+               85E711C40AC5D5350053270F /* DOMHTMLQuoteElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711750AC5D5350053270F /* DOMHTMLQuoteElementInternal.h */; };
+               85E711C50AC5D5350053270F /* DOMHTMLScriptElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711760AC5D5350053270F /* DOMHTMLScriptElementInternal.h */; };
+               85E711C60AC5D5350053270F /* DOMHTMLSelectElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711770AC5D5350053270F /* DOMHTMLSelectElementInternal.h */; };
+               85E711C70AC5D5350053270F /* DOMHTMLStyleElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711780AC5D5350053270F /* DOMHTMLStyleElementInternal.h */; };
+               85E711C80AC5D5350053270F /* DOMHTMLTableCaptionElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711790AC5D5350053270F /* DOMHTMLTableCaptionElementInternal.h */; };
+               85E711C90AC5D5350053270F /* DOMHTMLTableCellElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7117A0AC5D5350053270F /* DOMHTMLTableCellElementInternal.h */; };
+               85E711CA0AC5D5350053270F /* DOMHTMLTableColElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7117B0AC5D5350053270F /* DOMHTMLTableColElementInternal.h */; };
+               85E711CB0AC5D5350053270F /* DOMHTMLTableElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7117C0AC5D5350053270F /* DOMHTMLTableElementInternal.h */; };
+               85E711CC0AC5D5350053270F /* DOMHTMLTableRowElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7117D0AC5D5350053270F /* DOMHTMLTableRowElementInternal.h */; };
+               85E711CD0AC5D5350053270F /* DOMHTMLTableSectionElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7117E0AC5D5350053270F /* DOMHTMLTableSectionElementInternal.h */; };
+               85E711CE0AC5D5350053270F /* DOMHTMLTextAreaElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7117F0AC5D5350053270F /* DOMHTMLTextAreaElementInternal.h */; };
+               85E711CF0AC5D5350053270F /* DOMHTMLTitleElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711800AC5D5350053270F /* DOMHTMLTitleElementInternal.h */; };
+               85E711D00AC5D5350053270F /* DOMHTMLUListElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711810AC5D5350053270F /* DOMHTMLUListElementInternal.h */; };
+               85E711D10AC5D5350053270F /* DOMMediaListInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711820AC5D5350053270F /* DOMMediaListInternal.h */; };
+               85E711D20AC5D5350053270F /* DOMNamedNodeMapInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711830AC5D5350053270F /* DOMNamedNodeMapInternal.h */; };
+               85E711D30AC5D5350053270F /* DOMNodeListInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711840AC5D5350053270F /* DOMNodeListInternal.h */; };
+               85E711D40AC5D5350053270F /* DOMNotationInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711850AC5D5350053270F /* DOMNotationInternal.h */; };
+               85E711D50AC5D5350053270F /* DOMProcessingInstructionInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711860AC5D5350053270F /* DOMProcessingInstructionInternal.h */; };
+               85E711D60AC5D5350053270F /* DOMRectInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711870AC5D5350053270F /* DOMRectInternal.h */; };
+               85E711D70AC5D5350053270F /* DOMStyleSheetListInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711880AC5D5350053270F /* DOMStyleSheetListInternal.h */; };
+               85E711D90AC5D5350053270F /* DOMTextInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7118A0AC5D5350053270F /* DOMTextInternal.h */; };
+               85E711DA0AC5D5350053270F /* DOMXPathExpressionInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7118B0AC5D5350053270F /* DOMXPathExpressionInternal.h */; };
+               85E711DB0AC5D5350053270F /* DOMXPathResultInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7118C0AC5D5350053270F /* DOMXPathResultInternal.h */; };
                85E9E0A10AB3A0C700069CD0 /* DOMXPathExpression.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E9E09B0AB3A0C700069CD0 /* DOMXPathExpression.h */; };
                85E9E0A20AB3A0C700069CD0 /* DOMXPathExpression.mm in Sources */ = {isa = PBXBuildFile; fileRef = 85E9E09C0AB3A0C700069CD0 /* DOMXPathExpression.mm */; };
                85E9E0A40AB3A0C700069CD0 /* DOMXPathNSResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E9E09E0AB3A0C700069CD0 /* DOMXPathNSResolver.h */; };
                85DF821C0AA7849E00486AD7 /* DOMHTMLTableSectionElement.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMHTMLTableSectionElement.mm; sourceTree = "<group>"; };
                85DF826E0AA78B8A00486AD7 /* DOMHTMLTableElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLTableElement.h; sourceTree = "<group>"; };
                85DF826F0AA78B8A00486AD7 /* DOMHTMLTableElement.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMHTMLTableElement.mm; sourceTree = "<group>"; };
+               85E7113E0AC5D5340053270F /* DOMAttrInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMAttrInternal.h; sourceTree = "<group>"; };
+               85E7113F0AC5D5340053270F /* DOMCDATASectionInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMCDATASectionInternal.h; sourceTree = "<group>"; };
+               85E711400AC5D5340053270F /* DOMCharacterDataInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMCharacterDataInternal.h; sourceTree = "<group>"; };
+               85E711410AC5D5340053270F /* DOMCommentInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMCommentInternal.h; sourceTree = "<group>"; };
+               85E711420AC5D5340053270F /* DOMCounterInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMCounterInternal.h; sourceTree = "<group>"; };
+               85E711430AC5D5340053270F /* DOMCSSRuleListInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMCSSRuleListInternal.h; sourceTree = "<group>"; };
+               85E711440AC5D5340053270F /* DOMCSSStyleDeclarationInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMCSSStyleDeclarationInternal.h; sourceTree = "<group>"; };
+               85E711450AC5D5340053270F /* DOMDocumentFragmentInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMDocumentFragmentInternal.h; sourceTree = "<group>"; };
+               85E711460AC5D5340053270F /* DOMDocumentInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMDocumentInternal.h; sourceTree = "<group>"; };
+               85E711470AC5D5340053270F /* DOMDocumentTypeInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMDocumentTypeInternal.h; sourceTree = "<group>"; };
+               85E711480AC5D5340053270F /* DOMDOMImplementationInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMDOMImplementationInternal.h; sourceTree = "<group>"; };
+               85E711490AC5D5340053270F /* DOMElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMElementInternal.h; sourceTree = "<group>"; };
+               85E7114A0AC5D5340053270F /* DOMEntityInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMEntityInternal.h; sourceTree = "<group>"; };
+               85E7114B0AC5D5340053270F /* DOMEntityReferenceInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMEntityReferenceInternal.h; sourceTree = "<group>"; };
+               85E7114C0AC5D5340053270F /* DOMHTMLAnchorElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLAnchorElementInternal.h; sourceTree = "<group>"; };
+               85E7114D0AC5D5340053270F /* DOMHTMLAreaElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLAreaElementInternal.h; sourceTree = "<group>"; };
+               85E7114E0AC5D5340053270F /* DOMHTMLBaseElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLBaseElementInternal.h; sourceTree = "<group>"; };
+               85E7114F0AC5D5340053270F /* DOMHTMLBaseFontElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLBaseFontElementInternal.h; sourceTree = "<group>"; };
+               85E711500AC5D5340053270F /* DOMHTMLBodyElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLBodyElementInternal.h; sourceTree = "<group>"; };
+               85E711510AC5D5340053270F /* DOMHTMLBRElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLBRElementInternal.h; sourceTree = "<group>"; };
+               85E711520AC5D5340053270F /* DOMHTMLButtonElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLButtonElementInternal.h; sourceTree = "<group>"; };
+               85E711530AC5D5340053270F /* DOMHTMLCollectionInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLCollectionInternal.h; sourceTree = "<group>"; };
+               85E711540AC5D5340053270F /* DOMHTMLDirectoryElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLDirectoryElementInternal.h; sourceTree = "<group>"; };
+               85E711550AC5D5340053270F /* DOMHTMLDivElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLDivElementInternal.h; sourceTree = "<group>"; };
+               85E711560AC5D5340053270F /* DOMHTMLDListElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLDListElementInternal.h; sourceTree = "<group>"; };
+               85E711570AC5D5340053270F /* DOMHTMLDocumentInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLDocumentInternal.h; sourceTree = "<group>"; };
+               85E711580AC5D5340053270F /* DOMHTMLElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLElementInternal.h; sourceTree = "<group>"; };
+               85E711590AC5D5340053270F /* DOMHTMLFieldSetElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLFieldSetElementInternal.h; sourceTree = "<group>"; };
+               85E7115A0AC5D5340053270F /* DOMHTMLFontElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLFontElementInternal.h; sourceTree = "<group>"; };
+               85E7115B0AC5D5340053270F /* DOMHTMLFormElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLFormElementInternal.h; sourceTree = "<group>"; };
+               85E7115C0AC5D5340053270F /* DOMHTMLFrameElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLFrameElementInternal.h; sourceTree = "<group>"; };
+               85E7115D0AC5D5340053270F /* DOMHTMLFrameSetElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLFrameSetElementInternal.h; sourceTree = "<group>"; };
+               85E7115E0AC5D5350053270F /* DOMHTMLHeadElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLHeadElementInternal.h; sourceTree = "<group>"; };
+               85E7115F0AC5D5350053270F /* DOMHTMLHeadingElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLHeadingElementInternal.h; sourceTree = "<group>"; };
+               85E711600AC5D5350053270F /* DOMHTMLHRElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLHRElementInternal.h; sourceTree = "<group>"; };
+               85E711610AC5D5350053270F /* DOMHTMLHtmlElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLHtmlElementInternal.h; sourceTree = "<group>"; };
+               85E711620AC5D5350053270F /* DOMHTMLIFrameElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLIFrameElementInternal.h; sourceTree = "<group>"; };
+               85E711630AC5D5350053270F /* DOMHTMLImageElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLImageElementInternal.h; sourceTree = "<group>"; };
+               85E711640AC5D5350053270F /* DOMHTMLInputElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLInputElementInternal.h; sourceTree = "<group>"; };
+               85E711650AC5D5350053270F /* DOMHTMLIsIndexElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLIsIndexElementInternal.h; sourceTree = "<group>"; };
+               85E711660AC5D5350053270F /* DOMHTMLLabelElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLLabelElementInternal.h; sourceTree = "<group>"; };
+               85E711670AC5D5350053270F /* DOMHTMLLegendElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLLegendElementInternal.h; sourceTree = "<group>"; };
+               85E711680AC5D5350053270F /* DOMHTMLLIElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLLIElementInternal.h; sourceTree = "<group>"; };
+               85E711690AC5D5350053270F /* DOMHTMLLinkElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLLinkElementInternal.h; sourceTree = "<group>"; };
+               85E7116A0AC5D5350053270F /* DOMHTMLMapElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLMapElementInternal.h; sourceTree = "<group>"; };
+               85E7116B0AC5D5350053270F /* DOMHTMLMenuElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLMenuElementInternal.h; sourceTree = "<group>"; };
+               85E7116C0AC5D5350053270F /* DOMHTMLMetaElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLMetaElementInternal.h; sourceTree = "<group>"; };
+               85E7116D0AC5D5350053270F /* DOMHTMLModElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLModElementInternal.h; sourceTree = "<group>"; };
+               85E7116E0AC5D5350053270F /* DOMHTMLObjectElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLObjectElementInternal.h; sourceTree = "<group>"; };
+               85E7116F0AC5D5350053270F /* DOMHTMLOListElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLOListElementInternal.h; sourceTree = "<group>"; };
+               85E711700AC5D5350053270F /* DOMHTMLOptGroupElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLOptGroupElementInternal.h; sourceTree = "<group>"; };
+               85E711710AC5D5350053270F /* DOMHTMLOptionsCollectionInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLOptionsCollectionInternal.h; sourceTree = "<group>"; };
+               85E711720AC5D5350053270F /* DOMHTMLParagraphElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLParagraphElementInternal.h; sourceTree = "<group>"; };
+               85E711730AC5D5350053270F /* DOMHTMLParamElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLParamElementInternal.h; sourceTree = "<group>"; };
+               85E711740AC5D5350053270F /* DOMHTMLPreElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLPreElementInternal.h; sourceTree = "<group>"; };
+               85E711750AC5D5350053270F /* DOMHTMLQuoteElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLQuoteElementInternal.h; sourceTree = "<group>"; };
+               85E711760AC5D5350053270F /* DOMHTMLScriptElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLScriptElementInternal.h; sourceTree = "<group>"; };
+               85E711770AC5D5350053270F /* DOMHTMLSelectElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLSelectElementInternal.h; sourceTree = "<group>"; };
+               85E711780AC5D5350053270F /* DOMHTMLStyleElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLStyleElementInternal.h; sourceTree = "<group>"; };
+               85E711790AC5D5350053270F /* DOMHTMLTableCaptionElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLTableCaptionElementInternal.h; sourceTree = "<group>"; };
+               85E7117A0AC5D5350053270F /* DOMHTMLTableCellElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLTableCellElementInternal.h; sourceTree = "<group>"; };
+               85E7117B0AC5D5350053270F /* DOMHTMLTableColElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLTableColElementInternal.h; sourceTree = "<group>"; };
+               85E7117C0AC5D5350053270F /* DOMHTMLTableElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLTableElementInternal.h; sourceTree = "<group>"; };
+               85E7117D0AC5D5350053270F /* DOMHTMLTableRowElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLTableRowElementInternal.h; sourceTree = "<group>"; };
+               85E7117E0AC5D5350053270F /* DOMHTMLTableSectionElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLTableSectionElementInternal.h; sourceTree = "<group>"; };
+               85E7117F0AC5D5350053270F /* DOMHTMLTextAreaElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLTextAreaElementInternal.h; sourceTree = "<group>"; };
+               85E711800AC5D5350053270F /* DOMHTMLTitleElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLTitleElementInternal.h; sourceTree = "<group>"; };
+               85E711810AC5D5350053270F /* DOMHTMLUListElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLUListElementInternal.h; sourceTree = "<group>"; };
+               85E711820AC5D5350053270F /* DOMMediaListInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMMediaListInternal.h; sourceTree = "<group>"; };
+               85E711830AC5D5350053270F /* DOMNamedNodeMapInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMNamedNodeMapInternal.h; sourceTree = "<group>"; };
+               85E711840AC5D5350053270F /* DOMNodeListInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMNodeListInternal.h; sourceTree = "<group>"; };
+               85E711850AC5D5350053270F /* DOMNotationInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMNotationInternal.h; sourceTree = "<group>"; };
+               85E711860AC5D5350053270F /* DOMProcessingInstructionInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMProcessingInstructionInternal.h; sourceTree = "<group>"; };
+               85E711870AC5D5350053270F /* DOMRectInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMRectInternal.h; sourceTree = "<group>"; };
+               85E711880AC5D5350053270F /* DOMStyleSheetListInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMStyleSheetListInternal.h; sourceTree = "<group>"; };
+               85E7118A0AC5D5350053270F /* DOMTextInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMTextInternal.h; sourceTree = "<group>"; };
+               85E7118B0AC5D5350053270F /* DOMXPathExpressionInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMXPathExpressionInternal.h; sourceTree = "<group>"; };
+               85E7118C0AC5D5350053270F /* DOMXPathResultInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMXPathResultInternal.h; sourceTree = "<group>"; };
                85E9E09B0AB3A0C700069CD0 /* DOMXPathExpression.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMXPathExpression.h; sourceTree = "<group>"; };
                85E9E09C0AB3A0C700069CD0 /* DOMXPathExpression.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMXPathExpression.mm; sourceTree = "<group>"; };
                85E9E09E0AB3A0C700069CD0 /* DOMXPathNSResolver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMXPathNSResolver.h; sourceTree = "<group>"; };
                                85C78A670ABDE1B40044FC16 /* DOMException.h */,
                                856C8AE20A912649005C687B /* DOMObject.h */,
                                856C8AE30A912649005C687B /* DOMObject.mm */,
+                               93C841FE09CE858300DFF5E5 /* DOMImplementationFront.cpp */,
+                               93C841F709CE855C00DFF5E5 /* DOMImplementationFront.h */,
                        );
                        name = Core;
                        sourceTree = "<group>";
                                850657040AAB476C002D15C0 /* StyleSheets */,
                                85526C150AB0A12A000302EA /* Traversal */,
                                85E9E0A70AB3A0CC00069CD0 /* XPath */,
+                               85E7113D0AC5D4A10053270F /* Internal */,
                        );
                        name = "Derived Sources";
                        path = DerivedSources/WebCore;
                        name = Events;
                        sourceTree = "<group>";
                };
+               85E7113D0AC5D4A10053270F /* Internal */ = {
+                       isa = PBXGroup;
+                       children = (
+                               85E7113E0AC5D5340053270F /* DOMAttrInternal.h */,
+                               85E7113F0AC5D5340053270F /* DOMCDATASectionInternal.h */,
+                               85E711400AC5D5340053270F /* DOMCharacterDataInternal.h */,
+                               85E711410AC5D5340053270F /* DOMCommentInternal.h */,
+                               85E711420AC5D5340053270F /* DOMCounterInternal.h */,
+                               85E711430AC5D5340053270F /* DOMCSSRuleListInternal.h */,
+                               85E711440AC5D5340053270F /* DOMCSSStyleDeclarationInternal.h */,
+                               85E711450AC5D5340053270F /* DOMDocumentFragmentInternal.h */,
+                               85E711460AC5D5340053270F /* DOMDocumentInternal.h */,
+                               85E711470AC5D5340053270F /* DOMDocumentTypeInternal.h */,
+                               85E711480AC5D5340053270F /* DOMDOMImplementationInternal.h */,
+                               85E711490AC5D5340053270F /* DOMElementInternal.h */,
+                               85E7114A0AC5D5340053270F /* DOMEntityInternal.h */,
+                               85E7114B0AC5D5340053270F /* DOMEntityReferenceInternal.h */,
+                               85E7114C0AC5D5340053270F /* DOMHTMLAnchorElementInternal.h */,
+                               85E7114D0AC5D5340053270F /* DOMHTMLAreaElementInternal.h */,
+                               85E7114E0AC5D5340053270F /* DOMHTMLBaseElementInternal.h */,
+                               85E7114F0AC5D5340053270F /* DOMHTMLBaseFontElementInternal.h */,
+                               85E711500AC5D5340053270F /* DOMHTMLBodyElementInternal.h */,
+                               85E711510AC5D5340053270F /* DOMHTMLBRElementInternal.h */,
+                               85E711520AC5D5340053270F /* DOMHTMLButtonElementInternal.h */,
+                               85E711530AC5D5340053270F /* DOMHTMLCollectionInternal.h */,
+                               85E711540AC5D5340053270F /* DOMHTMLDirectoryElementInternal.h */,
+                               85E711550AC5D5340053270F /* DOMHTMLDivElementInternal.h */,
+                               85E711560AC5D5340053270F /* DOMHTMLDListElementInternal.h */,
+                               85E711570AC5D5340053270F /* DOMHTMLDocumentInternal.h */,
+                               85E711580AC5D5340053270F /* DOMHTMLElementInternal.h */,
+                               85E711590AC5D5340053270F /* DOMHTMLFieldSetElementInternal.h */,
+                               85E7115A0AC5D5340053270F /* DOMHTMLFontElementInternal.h */,
+                               85E7115B0AC5D5340053270F /* DOMHTMLFormElementInternal.h */,
+                               85E7115C0AC5D5340053270F /* DOMHTMLFrameElementInternal.h */,
+                               85E7115D0AC5D5340053270F /* DOMHTMLFrameSetElementInternal.h */,
+                               85E7115E0AC5D5350053270F /* DOMHTMLHeadElementInternal.h */,
+                               85E7115F0AC5D5350053270F /* DOMHTMLHeadingElementInternal.h */,
+                               85E711600AC5D5350053270F /* DOMHTMLHRElementInternal.h */,
+                               85E711610AC5D5350053270F /* DOMHTMLHtmlElementInternal.h */,
+                               85E711620AC5D5350053270F /* DOMHTMLIFrameElementInternal.h */,
+                               85E711630AC5D5350053270F /* DOMHTMLImageElementInternal.h */,
+                               85E711640AC5D5350053270F /* DOMHTMLInputElementInternal.h */,
+                               85E711650AC5D5350053270F /* DOMHTMLIsIndexElementInternal.h */,
+                               85E711660AC5D5350053270F /* DOMHTMLLabelElementInternal.h */,
+                               85E711670AC5D5350053270F /* DOMHTMLLegendElementInternal.h */,
+                               85E711680AC5D5350053270F /* DOMHTMLLIElementInternal.h */,
+                               85E711690AC5D5350053270F /* DOMHTMLLinkElementInternal.h */,
+                               85E7116A0AC5D5350053270F /* DOMHTMLMapElementInternal.h */,
+                               85E7116B0AC5D5350053270F /* DOMHTMLMenuElementInternal.h */,
+                               85E7116C0AC5D5350053270F /* DOMHTMLMetaElementInternal.h */,
+                               85E7116D0AC5D5350053270F /* DOMHTMLModElementInternal.h */,
+                               85E7116E0AC5D5350053270F /* DOMHTMLObjectElementInternal.h */,
+                               85E7116F0AC5D5350053270F /* DOMHTMLOListElementInternal.h */,
+                               85E711700AC5D5350053270F /* DOMHTMLOptGroupElementInternal.h */,
+                               85E711710AC5D5350053270F /* DOMHTMLOptionsCollectionInternal.h */,
+                               85E711720AC5D5350053270F /* DOMHTMLParagraphElementInternal.h */,
+                               85E711730AC5D5350053270F /* DOMHTMLParamElementInternal.h */,
+                               85E711740AC5D5350053270F /* DOMHTMLPreElementInternal.h */,
+                               85E711750AC5D5350053270F /* DOMHTMLQuoteElementInternal.h */,
+                               85E711760AC5D5350053270F /* DOMHTMLScriptElementInternal.h */,
+                               85E711770AC5D5350053270F /* DOMHTMLSelectElementInternal.h */,
+                               85E711780AC5D5350053270F /* DOMHTMLStyleElementInternal.h */,
+                               85E711790AC5D5350053270F /* DOMHTMLTableCaptionElementInternal.h */,
+                               85E7117A0AC5D5350053270F /* DOMHTMLTableCellElementInternal.h */,
+                               85E7117B0AC5D5350053270F /* DOMHTMLTableColElementInternal.h */,
+                               85E7117C0AC5D5350053270F /* DOMHTMLTableElementInternal.h */,
+                               85E7117D0AC5D5350053270F /* DOMHTMLTableRowElementInternal.h */,
+                               85E7117E0AC5D5350053270F /* DOMHTMLTableSectionElementInternal.h */,
+                               85E7117F0AC5D5350053270F /* DOMHTMLTextAreaElementInternal.h */,
+                               85E711800AC5D5350053270F /* DOMHTMLTitleElementInternal.h */,
+                               85E711810AC5D5350053270F /* DOMHTMLUListElementInternal.h */,
+                               85E711820AC5D5350053270F /* DOMMediaListInternal.h */,
+                               85E711830AC5D5350053270F /* DOMNamedNodeMapInternal.h */,
+                               85E711840AC5D5350053270F /* DOMNodeListInternal.h */,
+                               85E711850AC5D5350053270F /* DOMNotationInternal.h */,
+                               85E711860AC5D5350053270F /* DOMProcessingInstructionInternal.h */,
+                               85E711870AC5D5350053270F /* DOMRectInternal.h */,
+                               85E711880AC5D5350053270F /* DOMStyleSheetListInternal.h */,
+                               85E7118A0AC5D5350053270F /* DOMTextInternal.h */,
+                               85E7118B0AC5D5350053270F /* DOMXPathExpressionInternal.h */,
+                               85E7118C0AC5D5350053270F /* DOMXPathResultInternal.h */,
+                       );
+                       name = Internal;
+                       sourceTree = "<group>";
+               };
                85E9E0A70AB3A0CC00069CD0 /* XPath */ = {
                        isa = PBXGroup;
                        children = (
                                BC1A379F097C715F0019F3D8 /* DOMExtensions.h */,
                                BC1A37A0097C715F0019F3D8 /* DOMHTML.h */,
                                BC1A37A1097C715F0019F3D8 /* DOMHTML.mm */,
-                               93C841FE09CE858300DFF5E5 /* DOMImplementationFront.cpp */,
-                               93C841F709CE855C00DFF5E5 /* DOMImplementationFront.h */,
                                BC1A37A3097C715F0019F3D8 /* DOMInternal.h */,
                                BC1A37A4097C715F0019F3D8 /* DOMInternal.mm */,
                                BC1A37A5097C715F0019F3D8 /* DOMPrivate.h */,
                                A8415F9E0AC10C5D00F7D0DF /* KCanvasMasker.h in Headers */,
                                A8415FA00AC10C5D00F7D0DF /* KCanvasMarker.h in Headers */,
                                BC3FCAA90AC3DB5800BA54AD /* PlatformScrollBar.h in Headers */,
+                               85E7118D0AC5D5350053270F /* DOMAttrInternal.h in Headers */,
+                               85E7118E0AC5D5350053270F /* DOMCDATASectionInternal.h in Headers */,
+                               85E7118F0AC5D5350053270F /* DOMCharacterDataInternal.h in Headers */,
+                               85E711900AC5D5350053270F /* DOMCommentInternal.h in Headers */,
+                               85E711910AC5D5350053270F /* DOMCounterInternal.h in Headers */,
+                               85E711920AC5D5350053270F /* DOMCSSRuleListInternal.h in Headers */,
+                               85E711930AC5D5350053270F /* DOMCSSStyleDeclarationInternal.h in Headers */,
+                               85E711940AC5D5350053270F /* DOMDocumentFragmentInternal.h in Headers */,
+                               85E711950AC5D5350053270F /* DOMDocumentInternal.h in Headers */,
+                               85E711960AC5D5350053270F /* DOMDocumentTypeInternal.h in Headers */,
+                               85E711970AC5D5350053270F /* DOMDOMImplementationInternal.h in Headers */,
+                               85E711980AC5D5350053270F /* DOMElementInternal.h in Headers */,
+                               85E711990AC5D5350053270F /* DOMEntityInternal.h in Headers */,
+                               85E7119A0AC5D5350053270F /* DOMEntityReferenceInternal.h in Headers */,
+                               85E7119B0AC5D5350053270F /* DOMHTMLAnchorElementInternal.h in Headers */,
+                               85E7119C0AC5D5350053270F /* DOMHTMLAreaElementInternal.h in Headers */,
+                               85E7119D0AC5D5350053270F /* DOMHTMLBaseElementInternal.h in Headers */,
+                               85E7119E0AC5D5350053270F /* DOMHTMLBaseFontElementInternal.h in Headers */,
+                               85E7119F0AC5D5350053270F /* DOMHTMLBodyElementInternal.h in Headers */,
+                               85E711A00AC5D5350053270F /* DOMHTMLBRElementInternal.h in Headers */,
+                               85E711A10AC5D5350053270F /* DOMHTMLButtonElementInternal.h in Headers */,
+                               85E711A20AC5D5350053270F /* DOMHTMLCollectionInternal.h in Headers */,
+                               85E711A30AC5D5350053270F /* DOMHTMLDirectoryElementInternal.h in Headers */,
+                               85E711A40AC5D5350053270F /* DOMHTMLDivElementInternal.h in Headers */,
+                               85E711A50AC5D5350053270F /* DOMHTMLDListElementInternal.h in Headers */,
+                               85E711A60AC5D5350053270F /* DOMHTMLDocumentInternal.h in Headers */,
+                               85E711A70AC5D5350053270F /* DOMHTMLElementInternal.h in Headers */,
+                               85E711A80AC5D5350053270F /* DOMHTMLFieldSetElementInternal.h in Headers */,
+                               85E711A90AC5D5350053270F /* DOMHTMLFontElementInternal.h in Headers */,
+                               85E711AA0AC5D5350053270F /* DOMHTMLFormElementInternal.h in Headers */,
+                               85E711AB0AC5D5350053270F /* DOMHTMLFrameElementInternal.h in Headers */,
+                               85E711AC0AC5D5350053270F /* DOMHTMLFrameSetElementInternal.h in Headers */,
+                               85E711AD0AC5D5350053270F /* DOMHTMLHeadElementInternal.h in Headers */,
+                               85E711AE0AC5D5350053270F /* DOMHTMLHeadingElementInternal.h in Headers */,
+                               85E711AF0AC5D5350053270F /* DOMHTMLHRElementInternal.h in Headers */,
+                               85E711B00AC5D5350053270F /* DOMHTMLHtmlElementInternal.h in Headers */,
+                               85E711B10AC5D5350053270F /* DOMHTMLIFrameElementInternal.h in Headers */,
+                               85E711B20AC5D5350053270F /* DOMHTMLImageElementInternal.h in Headers */,
+                               85E711B30AC5D5350053270F /* DOMHTMLInputElementInternal.h in Headers */,
+                               85E711B40AC5D5350053270F /* DOMHTMLIsIndexElementInternal.h in Headers */,
+                               85E711B50AC5D5350053270F /* DOMHTMLLabelElementInternal.h in Headers */,
+                               85E711B60AC5D5350053270F /* DOMHTMLLegendElementInternal.h in Headers */,
+                               85E711B70AC5D5350053270F /* DOMHTMLLIElementInternal.h in Headers */,
+                               85E711B80AC5D5350053270F /* DOMHTMLLinkElementInternal.h in Headers */,
+                               85E711B90AC5D5350053270F /* DOMHTMLMapElementInternal.h in Headers */,
+                               85E711BA0AC5D5350053270F /* DOMHTMLMenuElementInternal.h in Headers */,
+                               85E711BB0AC5D5350053270F /* DOMHTMLMetaElementInternal.h in Headers */,
+                               85E711BC0AC5D5350053270F /* DOMHTMLModElementInternal.h in Headers */,
+                               85E711BD0AC5D5350053270F /* DOMHTMLObjectElementInternal.h in Headers */,
+                               85E711BE0AC5D5350053270F /* DOMHTMLOListElementInternal.h in Headers */,
+                               85E711BF0AC5D5350053270F /* DOMHTMLOptGroupElementInternal.h in Headers */,
+                               85E711C00AC5D5350053270F /* DOMHTMLOptionsCollectionInternal.h in Headers */,
+                               85E711C10AC5D5350053270F /* DOMHTMLParagraphElementInternal.h in Headers */,
+                               85E711C20AC5D5350053270F /* DOMHTMLParamElementInternal.h in Headers */,
+                               85E711C30AC5D5350053270F /* DOMHTMLPreElementInternal.h in Headers */,
+                               85E711C40AC5D5350053270F /* DOMHTMLQuoteElementInternal.h in Headers */,
+                               85E711C50AC5D5350053270F /* DOMHTMLScriptElementInternal.h in Headers */,
+                               85E711C60AC5D5350053270F /* DOMHTMLSelectElementInternal.h in Headers */,
+                               85E711C70AC5D5350053270F /* DOMHTMLStyleElementInternal.h in Headers */,
+                               85E711C80AC5D5350053270F /* DOMHTMLTableCaptionElementInternal.h in Headers */,
+                               85E711C90AC5D5350053270F /* DOMHTMLTableCellElementInternal.h in Headers */,
+                               85E711CA0AC5D5350053270F /* DOMHTMLTableColElementInternal.h in Headers */,
+                               85E711CB0AC5D5350053270F /* DOMHTMLTableElementInternal.h in Headers */,
+                               85E711CC0AC5D5350053270F /* DOMHTMLTableRowElementInternal.h in Headers */,
+                               85E711CD0AC5D5350053270F /* DOMHTMLTableSectionElementInternal.h in Headers */,
+                               85E711CE0AC5D5350053270F /* DOMHTMLTextAreaElementInternal.h in Headers */,
+                               85E711CF0AC5D5350053270F /* DOMHTMLTitleElementInternal.h in Headers */,
+                               85E711D00AC5D5350053270F /* DOMHTMLUListElementInternal.h in Headers */,
+                               85E711D10AC5D5350053270F /* DOMMediaListInternal.h in Headers */,
+                               85E711D20AC5D5350053270F /* DOMNamedNodeMapInternal.h in Headers */,
+                               85E711D30AC5D5350053270F /* DOMNodeListInternal.h in Headers */,
+                               85E711D40AC5D5350053270F /* DOMNotationInternal.h in Headers */,
+                               85E711D50AC5D5350053270F /* DOMProcessingInstructionInternal.h in Headers */,
+                               85E711D60AC5D5350053270F /* DOMRectInternal.h in Headers */,
+                               85E711D70AC5D5350053270F /* DOMStyleSheetListInternal.h in Headers */,
+                               85E711D90AC5D5350053270F /* DOMTextInternal.h in Headers */,
+                               85E711DA0AC5D5350053270F /* DOMXPathExpressionInternal.h in Headers */,
+                               85E711DB0AC5D5350053270F /* DOMXPathResultInternal.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
index b7399812e7612253ece5304af230e9b506e885ec..7c087c97033f60b3b1f405f2598e1780295c0253 100644 (file)
@@ -280,7 +280,7 @@ static Class elementClass(const WebCore::AtomicString& tagName)
     ASSERT(impl);
 
     [super _init];
-    _internal = DOM_cast<DOMObjectInternal*>(impl);
+    _internal = reinterpret_cast<DOMObjectInternal*>(impl);
     impl->ref();
     addDOMWrapper(self, impl);
     return self;
@@ -350,7 +350,7 @@ static Class elementClass(const WebCore::AtomicString& tagName)
 
 - (WebCore::Node *)_node
 {
-    return DOM_cast<WebCore::Node*>(_internal);
+    return reinterpret_cast<WebCore::Node*>(_internal);
 }
 
 - (const KJS::Bindings::RootObject *)_executionContext
@@ -521,14 +521,14 @@ static Class elementClass(const WebCore::AtomicString& tagName)
 - (void)dealloc
 {
     if (_internal)
-        DOM_cast<WebCore::Range*>(_internal)->deref();
+        reinterpret_cast<WebCore::Range*>(_internal)->deref();
     [super dealloc];
 }
 
 - (void)finalize
 {
     if (_internal)
-        DOM_cast<WebCore::Range*>(_internal)->deref();
+        reinterpret_cast<WebCore::Range*>(_internal)->deref();
     [super finalize];
 }
 
@@ -733,7 +733,7 @@ static Class elementClass(const WebCore::AtomicString& tagName)
     ASSERT(impl);
 
     [super _init];
-    _internal = DOM_cast<DOMObjectInternal*>(impl);
+    _internal = reinterpret_cast<DOMObjectInternal*>(impl);
     impl->ref();
     addDOMWrapper(self, impl);
     return self;
@@ -754,7 +754,7 @@ static Class elementClass(const WebCore::AtomicString& tagName)
 
 - (WebCore::Range *)_range
 {
-    return DOM_cast<WebCore::Range*>(_internal);
+    return reinterpret_cast<WebCore::Range*>(_internal);
 }
 
 @end
@@ -779,7 +779,7 @@ static Class elementClass(const WebCore::AtomicString& tagName)
     ASSERT(impl);
 
     [super _init];
-    _internal = DOM_cast<DOMObjectInternal*>(impl);
+    _internal = reinterpret_cast<DOMObjectInternal*>(impl);
     impl->ref();
     addDOMWrapper(self, impl);
     return self;
@@ -800,20 +800,20 @@ static Class elementClass(const WebCore::AtomicString& tagName)
 
 - (WebCore::NodeFilter *)_nodeFilter
 {
-    return DOM_cast<WebCore::NodeFilter*>(_internal);
+    return reinterpret_cast<WebCore::NodeFilter*>(_internal);
 }
 
 - (void)dealloc
 {
     if (_internal)
-        DOM_cast<WebCore::NodeFilter*>(_internal)->deref();
+        reinterpret_cast<WebCore::NodeFilter*>(_internal)->deref();
     [super dealloc];
 }
 
 - (void)finalize
 {
     if (_internal)
-        DOM_cast<WebCore::NodeFilter*>(_internal)->deref();
+        reinterpret_cast<WebCore::NodeFilter*>(_internal)->deref();
     [super finalize];
 }
 
@@ -835,7 +835,7 @@ static Class elementClass(const WebCore::AtomicString& tagName)
     ASSERT(impl);
 
     [super _init];
-    _internal = DOM_cast<DOMObjectInternal*>(impl);
+    _internal = reinterpret_cast<DOMObjectInternal*>(impl);
     impl->ref();
     addDOMWrapper(self, impl);
     m_filter = [filter retain];
@@ -844,7 +844,7 @@ static Class elementClass(const WebCore::AtomicString& tagName)
 
 - (WebCore::NodeIterator *)_nodeIterator
 {
-    return DOM_cast<WebCore::NodeIterator*>(_internal);
+    return reinterpret_cast<WebCore::NodeIterator*>(_internal);
 }
 
 + (DOMNodeIterator *)_nodeIteratorWith:(WebCore::NodeIterator *)impl filter:(id <DOMNodeFilter>)filter
@@ -873,7 +873,7 @@ static Class elementClass(const WebCore::AtomicString& tagName)
     ASSERT(impl);
 
     [super _init];
-    _internal = DOM_cast<DOMObjectInternal*>(impl);
+    _internal = reinterpret_cast<DOMObjectInternal*>(impl);
     impl->ref();
     addDOMWrapper(self, impl);
     m_filter = [filter retain];
@@ -882,7 +882,7 @@ static Class elementClass(const WebCore::AtomicString& tagName)
 
 - (WebCore::TreeWalker *)_treeWalker
 {
-    return DOM_cast<WebCore::TreeWalker *>(_internal);
+    return reinterpret_cast<WebCore::TreeWalker *>(_internal);
 }
 
 + (DOMTreeWalker *)_treeWalkerWith:(WebCore::TreeWalker *)impl filter:(id <DOMNodeFilter>)filter
index 75059ea1efc0ffe491f85f0438a58ab8a2f5550b..cc7fc4ef4448f5a85c1ccdadcd00056fa008f551 100644 (file)
@@ -38,8 +38,6 @@ namespace WebCore {
     typedef DOMWindow AbstractView;
 }
 
-ALLOW_DOM_CAST(DOMWindow)
-
 @implementation DOMAbstractView
 
 #define IMPL reinterpret_cast<WebCore::DOMWindow*>(_internal)
@@ -63,7 +61,7 @@ ALLOW_DOM_CAST(DOMWindow)
     ASSERT(impl);
 
     [super _init];
-    _internal = DOM_cast<DOMObjectInternal *>(impl);
+    _internal = reinterpret_cast<DOMObjectInternal *>(impl);
     impl->ref();
     addDOMWrapper(self, impl);
     return self;
index a78c24c64bcd9e8cc9d4f47e83a25cf13c2aa3c8..be7c6d7cf47a0d9a104af011a05f91efd54194a0 100644 (file)
@@ -61,7 +61,7 @@ namespace WebCore {
 - (id)_initWithStyleSheet:(WebCore::StyleSheet *)impl
 {
     [super _init];
-    _internal = DOM_cast<DOMObjectInternal*>(impl);
+    _internal = reinterpret_cast<DOMObjectInternal*>(impl);
     impl->ref();
     addDOMWrapper(self, impl);
     return self;
@@ -109,7 +109,7 @@ namespace WebCore {
 - (id)_initWithRule:(WebCore::CSSRule *)impl
 {
     [super _init];
-    _internal = DOM_cast<DOMObjectInternal*>(impl);
+    _internal = reinterpret_cast<DOMObjectInternal*>(impl);
     impl->ref();
     addDOMWrapper(self, impl);
     return self;
@@ -163,7 +163,7 @@ namespace WebCore {
 - (id)_initWithValue:(WebCore::CSSValue *)impl
 {
     [super _init];
-    _internal = DOM_cast<DOMObjectInternal*>(impl);
+    _internal = reinterpret_cast<DOMObjectInternal*>(impl);
     impl->ref();
     addDOMWrapper(self, impl);
     return self;
index a628804cf64984243eb5401682ed7a9b203dec70..6c42aae8faa7f1eb29d0628c45eb459bfdd07d0f 100644 (file)
@@ -53,7 +53,7 @@
     ASSERT(impl);
 
     [super _init];
-    _internal = DOM_cast<DOMObjectInternal *>(impl);
+    _internal = reinterpret_cast<DOMObjectInternal *>(impl);
     impl->ref();
     addDOMWrapper(self, impl);
     return self;
index 591901dcb64a5e838259e12da38d15a43cf00141..aac67ee6e09212c1c523e44c415b44133dc9ff1c 100644 (file)
 
 @implementation DOMHTMLAppletElement
 
-- (WebCore::HTMLAppletElement *)_appletElement
-{
-    return static_cast<WebCore::HTMLAppletElement *>(DOM_cast<WebCore::Node *>(_internal));
-}
+#define IMPL static_cast<WebCore::HTMLAppletElement*>(reinterpret_cast<WebCore::Node*>(_internal))
 
 - (NSString *)align
 {
-    return [self _appletElement]->align();
+    return IMPL->align();
 }
 
 - (void)setAlign:(NSString *)align
 {
-    [self _appletElement]->setAlign(align);
+    IMPL->setAlign(align);
 }
 
 - (NSString *)alt
 {
-    return [self _appletElement]->alt();
+    return IMPL->alt();
 }
 
 - (void)setAlt:(NSString *)alt
 {
-    [self _appletElement]->setAlt(alt);
+    IMPL->setAlt(alt);
 }
 
 - (NSString *)archive
 {
-    return [self _appletElement]->archive();
+    return IMPL->archive();
 }
 
 - (void)setArchive:(NSString *)archive
 {
-    [self _appletElement]->setArchive(archive);
+    IMPL->setArchive(archive);
 }
 
 - (NSString *)code
 {
-    return [self _appletElement]->code();
+    return IMPL->code();
 }
 
 - (void)setCode:(NSString *)code
 {
-    [self _appletElement]->setCode(code);
+    IMPL->setCode(code);
 }
 
 - (NSString *)codeBase
 {
-    return [self _appletElement]->codeBase();
+    return IMPL->codeBase();
 }
 
 - (void)setCodeBase:(NSString *)codeBase
 {
-    [self _appletElement]->setCodeBase(codeBase);
+    IMPL->setCodeBase(codeBase);
 }
 
 - (NSString *)height
 {
-    return [self _appletElement]->height();
+    return IMPL->height();
 }
 
 - (void)setHeight:(NSString *)height
 {
-    [self _appletElement]->setHeight(height);
+    IMPL->setHeight(height);
 }
 
 //FIXME: DOM spec says hspace should be a DOMString, not an int
 - (int)hspace
 {
-    return [self _appletElement]->hspace().toInt();
+    return IMPL->hspace().toInt();
 }
 
 - (void)setHspace:(int)hspace
 {
-    [self _appletElement]->setHspace(WebCore::String::number(hspace));
+    IMPL->setHspace(WebCore::String::number(hspace));
 }
 
 - (NSString *)name
 {
-    return [self _appletElement]->name();
+    return IMPL->name();
 }
 
 - (void)setName:(NSString *)name
 {
-    [self _appletElement]->setName(name);
+    IMPL->setName(name);
 }
 
 - (NSString *)object
 {
-    return [self _appletElement]->object();
+    return IMPL->object();
 }
 
 - (void)setObject:(NSString *)object
 {
-    [self _appletElement]->setObject(object);
+    IMPL->setObject(object);
 }
 
 //FIXME: DOM spec says vspace should be a DOMString, not an int
 - (int)vspace
 {
-    return [self _appletElement]->vspace().toInt();
+    return IMPL->vspace().toInt();
 }
 
 - (void)setVspace:(int)vspace
 {
-    [self _appletElement]->setVspace(WebCore::String::number(vspace));
+    IMPL->setVspace(WebCore::String::number(vspace));
 }
 
 - (NSString *)width
 {
-    return [self _appletElement]->width();
+    return IMPL->width();
 }
 
 - (void)setWidth:(NSString *)width
 {
-    [self _appletElement]->setWidth(width);
+    IMPL->setWidth(width);
 }
 
 @end
index b01a610f9451cafaa806f577dc20f9a31f0311f5..49dbf58e5bae98bd46c4219538b7ef6ad96eaf1a 100644 (file)
 #import "DOM.h"
 
 #import "Color.h"
-#import "DOMAttr.h"
-#import "DOMCDATASection.h"
+#import "DOMAbstractView.h"
 #import "DOMCSSPrimitiveValue.h"
 #import "DOMCSSRule.h"
-#import "DOMCSSRuleList.h"
-#import "DOMCSSStyleDeclaration.h"
 #import "DOMCSSStyleSheet.h"
 #import "DOMCSSValue.h"
-#import "DOMComment.h"
-#import "DOMCounter.h"
-#import "DOMDOMImplementation.h"
-#import "DOMDocument.h"
-#import "DOMDocumentFragment.h"
-#import "DOMDocumentType.h"
-#import "DOMElement.h"
-#import "DOMEntityReference.h"
 #import "DOMEvents.h"
-#import "DOMHTMLCollection.h"
-#import "DOMHTMLDocument.h"
-#import "DOMHTMLElement.h"
-#import "DOMHTMLFormElement.h"
-#import "DOMHTMLImageElement.h"
-#import "DOMHTMLInputElement.h"
-#import "DOMHTMLObjectElement.h"
 #import "DOMHTMLOptionElement.h"
-#import "DOMHTMLOptionsCollection.h"
-#import "DOMHTMLTableCaptionElement.h"
-#import "DOMHTMLTableCellElement.h"
-#import "DOMHTMLTableElement.h"
-#import "DOMHTMLTableSectionElement.h"
-#import "DOMMediaList.h"
-#import "DOMNamedNodeMap.h"
 #import "DOMNode.h"
-#import "DOMNodeList.h"
 #import "DOMObject.h"
-#import "DOMProcessingInstruction.h"
 #import "DOMRGBColor.h"
-#import "DOMRect.h"
 #import "DOMStyleSheet.h"
-#import "DOMStyleSheetList.h"
-#import "DOMText.h"
-#import "DOMViews.h"
 
 #ifdef XPATH_SUPPORT
-#import "DOMXPath.h"
+#import "DOMXPathNSResolver.h"
+#endif // XPATH_SUPPORT
+
+// Auto-generated internal interfaces
+#import "DOMAttrInternal.h"
+#import "DOMCDATASectionInternal.h"
+#import "DOMCSSRuleListInternal.h"
+#import "DOMCSSStyleDeclarationInternal.h"
+#import "DOMCharacterDataInternal.h"
+#import "DOMCommentInternal.h"
+#import "DOMCounterInternal.h"
+#import "DOMDOMImplementationInternal.h"
+#import "DOMDocumentFragmentInternal.h"
+#import "DOMDocumentInternal.h"
+#import "DOMDocumentTypeInternal.h"
+#import "DOMElementInternal.h"
+#import "DOMEntityInternal.h"
+#import "DOMEntityReferenceInternal.h"
+#import "DOMHTMLAnchorElementInternal.h"
+#import "DOMHTMLAreaElementInternal.h"
+#import "DOMHTMLBRElementInternal.h"
+#import "DOMHTMLBaseElementInternal.h"
+#import "DOMHTMLBaseFontElementInternal.h"
+#import "DOMHTMLBodyElementInternal.h"
+#import "DOMHTMLButtonElementInternal.h"
+#import "DOMHTMLCollectionInternal.h"
+#import "DOMHTMLDListElementInternal.h"
+#import "DOMHTMLDirectoryElementInternal.h"
+#import "DOMHTMLDivElementInternal.h"
+#import "DOMHTMLDocumentInternal.h"
+#import "DOMHTMLElementInternal.h"
+#import "DOMHTMLFieldSetElementInternal.h"
+#import "DOMHTMLFontElementInternal.h"
+#import "DOMHTMLFormElementInternal.h"
+#import "DOMHTMLFrameElementInternal.h"
+#import "DOMHTMLFrameSetElementInternal.h"
+#import "DOMHTMLHRElementInternal.h"
+#import "DOMHTMLHeadElementInternal.h"
+#import "DOMHTMLHeadingElementInternal.h"
+#import "DOMHTMLHtmlElementInternal.h"
+#import "DOMHTMLIFrameElementInternal.h"
+#import "DOMHTMLImageElementInternal.h"
+#import "DOMHTMLInputElementInternal.h"
+#import "DOMHTMLIsIndexElementInternal.h"
+#import "DOMHTMLLIElementInternal.h"
+#import "DOMHTMLLabelElementInternal.h"
+#import "DOMHTMLLegendElementInternal.h"
+#import "DOMHTMLLinkElementInternal.h"
+#import "DOMHTMLMapElementInternal.h"
+#import "DOMHTMLMenuElementInternal.h"
+#import "DOMHTMLMetaElementInternal.h"
+#import "DOMHTMLModElementInternal.h"
+#import "DOMHTMLOListElementInternal.h"
+#import "DOMHTMLObjectElementInternal.h"
+#import "DOMHTMLOptGroupElementInternal.h"
+#import "DOMHTMLOptionsCollectionInternal.h"
+#import "DOMHTMLParagraphElementInternal.h"
+#import "DOMHTMLParamElementInternal.h"
+#import "DOMHTMLPreElementInternal.h"
+#import "DOMHTMLQuoteElementInternal.h"
+#import "DOMHTMLScriptElementInternal.h"
+#import "DOMHTMLSelectElementInternal.h"
+#import "DOMHTMLStyleElementInternal.h"
+#import "DOMHTMLTableCaptionElementInternal.h"
+#import "DOMHTMLTableCellElementInternal.h"
+#import "DOMHTMLTableColElementInternal.h"
+#import "DOMHTMLTableElementInternal.h"
+#import "DOMHTMLTableRowElementInternal.h"
+#import "DOMHTMLTableSectionElementInternal.h"
+#import "DOMHTMLTextAreaElementInternal.h"
+#import "DOMHTMLTitleElementInternal.h"
+#import "DOMHTMLUListElementInternal.h"
+#import "DOMMediaListInternal.h"
+#import "DOMNamedNodeMapInternal.h"
+#import "DOMNodeListInternal.h"
+#import "DOMNotationInternal.h"
+#import "DOMProcessingInstructionInternal.h"
+#import "DOMRectInternal.h"
+#import "DOMStyleSheetListInternal.h"
+#import "DOMTextInternal.h"
+
+#ifdef XPATH_SUPPORT
+#import "DOMXPathExpressionInternal.h"
+#import "DOMXPathResultInternal.h"
 #endif // XPATH_SUPPORT
 
 namespace WebCore {
-    class Attr;
-    class CDATASection;
     class CSSPrimitiveValue;
     class CSSRule;
-    class CSSRuleList;
-    class CSSStyleDeclaration;
     class CSSStyleSheet;
     class CSSValue;
-    class Comment;
-    class Counter;
-    class DOMImplementationFront;
     class DOMWindow;
-    class Document;
-    class DocumentFragment;
-    class DocumentType;
-    class Element;
-    class EntityReference;
     class Event;
-    class HTMLCollection;
-    class HTMLDocument;
-    class HTMLElement;
-    class HTMLFormElement;
-    class HTMLImageElement;
-    class HTMLInputElement;
-    class HTMLObjectElement;
     class HTMLOptionElement;
-    class HTMLOptionsCollection;
-    class HTMLTableCaptionElement;
-    class HTMLTableCellElement;
-    class HTMLTableElement;
-    class HTMLTableSectionElement;
-    class MediaList;
-    class NamedNodeMap;
     class Node;
     class NodeFilter;
     class NodeIterator;
-    class NodeList;
-    class ProcessingInstruction;
     class Range;
-    class RectImpl;
     class StyleSheet;
-    class StyleSheetList;
-    class Text;
     class TreeWalker;
 
 #ifdef XPATH_SUPPORT
-    class XPathExpression;
     class XPathNSResolver;
-    class XPathResult;
 #endif // XPATH_SUPPORT
 
     typedef int ExceptionCode;
@@ -142,71 +161,6 @@ namespace WebCore {
 - (WebCore::Node *)_node;
 @end
 
-@interface DOMNamedNodeMap (WebCoreInternal)
-+ (DOMNamedNodeMap *)_namedNodeMapWith:(WebCore::NamedNodeMap *)impl;
-- (WebCore::NamedNodeMap *)_namedNodeMap;
-@end
-
-@interface DOMNodeList (WebCoreInternal)
-+ (DOMNodeList *)_nodeListWith:(WebCore::NodeList *)impl;
-- (WebCore::NodeList *)_nodeList;
-@end
-
-@interface DOMText (WebCoreInternal)
-+ (DOMText *)_textWith:(WebCore::Text *)impl;
-- (WebCore::Text *)_text;
-@end
-
-@interface DOMComment (WebCoreInternal)
-+ (DOMComment *)_commentWith:(WebCore::Comment *)impl;
-- (WebCore::Comment *)_comment;
-@end
-
-@interface DOMCDATASection (WebCoreInternal)
-+ (DOMCDATASection *)_CDATASectionWith:(WebCore::CDATASection *)impl;
-- (WebCore::CDATASection *)_CDATASection;
-@end
-
-@interface DOMProcessingInstruction (WebCoreInternal)
-+ (DOMProcessingInstruction *)_processingInstructionWith:(WebCore::ProcessingInstruction *)impl;
-- (WebCore::ProcessingInstruction *)_processingInstruction;
-@end
-
-@interface DOMEntityReference (WebCoreInternal)
-+ (DOMEntityReference *)_entityReferenceWith:(WebCore::EntityReference *)impl;
-- (WebCore::EntityReference *)_entityReference;
-@end
-
-@interface DOMElement (WebCoreInternal)
-+ (DOMElement *)_elementWith:(WebCore::Element *)impl;
-- (WebCore::Element *)_element;
-@end
-
-@interface DOMAttr (WebCoreInternal)
-+ (DOMAttr *)_attrWith:(WebCore::Attr *)impl;
-- (WebCore::Attr *)_attr;
-@end
-
-@interface DOMDocumentType (WebCoreInternal)
-+ (DOMDocumentType *)_documentTypeWith:(WebCore::DocumentType *)impl;
-- (WebCore::DocumentType *)_documentType;
-@end
-
-@interface DOMImplementation (WebCoreInternal)
-+ (DOMImplementation *)_DOMImplementationWith:(WebCore::DOMImplementationFront *)impl;
-- (WebCore::DOMImplementationFront *)_DOMImplementation;
-@end
-
-@interface DOMDocument (WebCoreInternal)
-+ (DOMDocument *)_documentWith:(WebCore::Document *)impl;
-- (WebCore::Document *)_document;
-@end
-
-@interface DOMDocumentFragment (WebCoreInternal)
-+ (DOMDocumentFragment *)_documentFragmentWith:(WebCore::DocumentFragment *)impl;
-- (WebCore::DocumentFragment *)_documentFragment;
-@end
-
 // HTML Internal Interfaces
 
 @interface DOMHTMLOptionElement (WebCoreInternal)
@@ -214,73 +168,8 @@ namespace WebCore {
 - (WebCore::HTMLOptionElement *)_HTMLOptionElement;
 @end
 
-@interface DOMHTMLOptionsCollection (WebCoreInternal)
-+ (DOMHTMLOptionsCollection *)_HTMLOptionsCollectionWith:(WebCore::HTMLOptionsCollection *)impl;
-- (WebCore::HTMLOptionsCollection *)_HTMLOptionsCollection;
-@end
-
-@interface DOMHTMLCollection (WebCoreInternal)
-+ (DOMHTMLCollection *)_HTMLCollectionWith:(WebCore::HTMLCollection *)impl;
-- (WebCore::HTMLCollection *)_HTMLCollection;
-@end
-
-@interface DOMHTMLDocument (WebCoreInternal)
-+ (DOMHTMLDocument *)_HTMLDocumentWith:(WebCore::HTMLDocument *)impl;
-- (WebCore::HTMLDocument *)_HTMLDocument;
-@end
-
-@interface DOMHTMLElement (WebCoreInternal)
-+ (DOMHTMLElement *)_HTMLElementWith:(WebCore::HTMLElement *)impl;
-- (WebCore::HTMLElement *)_HTMLElement;
-@end
-
-@interface DOMHTMLFormElement (WebCoreInternal)
-+ (DOMHTMLFormElement *)_HTMLFormElementWith:(WebCore::HTMLFormElement *)impl;
-- (WebCore::HTMLFormElement *)_HTMLFormElement;
-@end
-
-@interface DOMHTMLTableCaptionElement (WebCoreInternal)
-+ (DOMHTMLTableCaptionElement *)_HTMLTableCaptionElementWith:(WebCore::HTMLTableCaptionElement *)impl;
-- (WebCore::HTMLTableCaptionElement *)_HTMLTableCaptionElement;
-@end
-
-@interface DOMHTMLTableSectionElement (WebCoreInternal)
-+ (DOMHTMLTableSectionElement *)_HTMLTableSectionElementWith:(WebCore::HTMLTableSectionElement *)impl;
-- (WebCore::HTMLTableSectionElement *)_HTMLTableSectionElement;
-@end
-
-@interface DOMHTMLTableElement (WebCoreInternal)
-+ (DOMHTMLTableElement *)_HTMLTableElementWith:(WebCore::HTMLTableElement *)impl;
-- (WebCore::HTMLTableElement *)_HTMLTableElement;
-@end
-
-@interface DOMHTMLTableCellElement (WebCoreInternal)
-+ (DOMHTMLTableCellElement *)_HTMLTableCellElementWith:(WebCore::HTMLTableCellElement *)impl;
-- (WebCore::HTMLTableCellElement *)_HTMLTableCellElement;
-@end
-
-@interface DOMHTMLImageElement (WebCoreInternal)
-+ (DOMHTMLImageElement *)_HTMLImageElementWith:(WebCore::HTMLImageElement *)impl;
-- (WebCore::HTMLImageElement *)_HTMLImageElement;
-@end
-
-@interface DOMHTMLObjectElement (WebCoreInternal)
-+ (DOMHTMLObjectElement *)_HTMLObjectElementWith:(WebCore::HTMLObjectElement *)impl;
-- (WebCore::HTMLObjectElement *)_HTMLObjectElement;
-@end
-
-@interface DOMHTMLInputElement (WebCoreInternal)
-+ (DOMHTMLInputElement *)_HTMLInputElementWith:(WebCore::HTMLInputElement *)impl;
-- (WebCore::HTMLInputElement *)_HTMLInputElement;
-@end
-
 // CSS Internal Interfaces
 
-@interface DOMCSSRuleList (WebCoreInternal)
-+ (DOMCSSRuleList *)_CSSRuleListWith:(WebCore::CSSRuleList *)impl;
-- (WebCore::CSSRuleList *)_CSSRuleList;
-@end
-
 @interface DOMCSSRule (WebCoreInternal)
 + (DOMCSSRule *)_CSSRuleWith:(WebCore::CSSRule *)impl;
 @end
@@ -298,21 +187,6 @@ namespace WebCore {
 + (DOMRGBColor *)_RGBColorWithRGB:(WebCore::RGBA32)value;
 @end
 
-@interface DOMRect (WebCoreInternal)
-+ (DOMRect *)_rectWith:(WebCore::RectImpl *)impl;
-- (WebCore::RectImpl *)_rect;
-@end
-
-@interface DOMCounter (WebCoreInternal)
-+ (DOMCounter *)_counterWith:(WebCore::Counter *)impl;
-- (WebCore::Counter *)_counter;
-@end
-
-@interface DOMCSSStyleDeclaration (WebCoreInternal)
-+ (DOMCSSStyleDeclaration *)_CSSStyleDeclarationWith:(WebCore::CSSStyleDeclaration *)impl;
-- (WebCore::CSSStyleDeclaration *)_CSSStyleDeclaration;
-@end
-
 @interface DOMCSSStyleSheet (WebCoreInternal)
 + (DOMCSSStyleSheet *)_CSSStyleSheetWith:(WebCore::CSSStyleSheet *)impl;
 @end
@@ -323,16 +197,6 @@ namespace WebCore {
 + (DOMStyleSheet *)_styleSheetWith:(WebCore::StyleSheet *)impl;
 @end
 
-@interface DOMStyleSheetList (WebCoreInternal)
-+ (DOMStyleSheetList *)_styleSheetListWith:(WebCore::StyleSheetList *)impl;
-- (WebCore::StyleSheetList *)_styleSheetList;
-@end
-
-@interface DOMMediaList (WebCoreInternal)
-+ (DOMMediaList *)_mediaListWith:(WebCore::MediaList *)impl;
-- (WebCore::MediaList *)_mediaList;
-@end
-
 // Events Internal Interfaces
 
 @interface DOMEvent (WebCoreInternal)
@@ -371,16 +235,6 @@ namespace WebCore {
 #ifdef XPATH_SUPPORT
 // XPath Internal Interfaces
 
-@interface DOMXPathResult (WebCoreInternal)
-+ (DOMXPathResult *)_xpathResultWith:(WebCore::XPathResult *)impl;
-- (WebCore::XPathResult *)_xpathResult;
-@end
-
-@interface DOMXPathExpression (WebCoreInternal)
-+ (DOMXPathExpression *)_xpathExpressionWith:(WebCore::XPathExpression *)impl;
-- (WebCore::XPathExpression *)_xpathExpression;
-@end
-
 @interface DOMNativeXPathNSResolver : DOMObject <DOMXPathNSResolver>
 + (DOMNativeXPathNSResolver *)_xpathNSResolverWith:(WebCore::XPathNSResolver *)impl;
 - (WebCore::XPathNSResolver *)_xpathNSResolver;
@@ -391,16 +245,11 @@ namespace WebCore {
 
 // Helper functions for DOM wrappers and gluing to Objective-C
 
-// Like reinterpret_cast, but a compiler error if you use it on the wrong type.
-template <class Target, class Source> Target DOM_cast(Source) { Source::failToCompile(); }
-
-// Type safe DOM wrapper access.
-
 NSObject* getDOMWrapper(DOMObjectInternal*);
 void addDOMWrapper(NSObject* wrapper, DOMObjectInternal*);
 
-template <class Source> inline id getDOMWrapper(Source impl) { return getDOMWrapper(DOM_cast<DOMObjectInternal*>(impl)); }
-template <class Source> inline void addDOMWrapper(NSObject* wrapper, Source impl) { addDOMWrapper(wrapper, DOM_cast<DOMObjectInternal*>(impl)); }
+template <class Source> inline id getDOMWrapper(Source impl) { return getDOMWrapper(reinterpret_cast<DOMObjectInternal*>(impl)); }
+template <class Source> inline void addDOMWrapper(NSObject* wrapper, Source impl) { addDOMWrapper(wrapper, reinterpret_cast<DOMObjectInternal*>(impl)); }
 void removeDOMWrapper(DOMObjectInternal*);
 
 void raiseDOMException(WebCore::ExceptionCode);
@@ -410,40 +259,3 @@ inline void raiseOnDOMError(WebCore::ExceptionCode ec)
     if (ec) 
         raiseDOMException(ec);
 }
-
-// Implementation details for the above.
-
-#define ALLOW_DOM_CAST(type) \
-    namespace WebCore { class type; } \
-    template <> inline DOMObjectInternal* DOM_cast<DOMObjectInternal*, class WebCore::type*>(class WebCore::type* p) \
-        { return reinterpret_cast<DOMObjectInternal *>(p); } \
-    template <> inline class WebCore::type* DOM_cast<class WebCore::type*, DOMObjectInternal*>(DOMObjectInternal* p) \
-        { return reinterpret_cast<class WebCore::type*>(p); }
-
-// No class should appear in this list if its base class is already here.
-ALLOW_DOM_CAST(CSSRule)
-ALLOW_DOM_CAST(CSSRuleList)
-ALLOW_DOM_CAST(CSSStyleDeclaration)
-ALLOW_DOM_CAST(CSSStyleSheet)
-ALLOW_DOM_CAST(CSSValue)
-ALLOW_DOM_CAST(Counter)
-ALLOW_DOM_CAST(DOMImplementationFront)
-ALLOW_DOM_CAST(Event)
-ALLOW_DOM_CAST(HTMLCollection)
-ALLOW_DOM_CAST(HTMLOptionsCollection)
-ALLOW_DOM_CAST(MediaList)
-ALLOW_DOM_CAST(NamedNodeMap)
-ALLOW_DOM_CAST(Node)
-ALLOW_DOM_CAST(NodeFilter)
-ALLOW_DOM_CAST(NodeIterator)
-ALLOW_DOM_CAST(NodeList)
-ALLOW_DOM_CAST(Range)
-ALLOW_DOM_CAST(RectImpl)
-ALLOW_DOM_CAST(StyleSheet)
-ALLOW_DOM_CAST(StyleSheetList)
-ALLOW_DOM_CAST(TreeWalker)
-#ifdef XPATH_SUPPORT
-ALLOW_DOM_CAST(XPathExpression)
-ALLOW_DOM_CAST(XPathNSResolver)
-ALLOW_DOM_CAST(XPathResult)
-#endif // XPATH_SUPPORT
index 96cbd4080360dfffb2eedc4c1e9905c6e372c283..7450e558b8f831ca38de334f02abcabafbcf8cd5 100644 (file)
@@ -65,7 +65,7 @@
     ASSERT(impl);
     
     [super _init];
-    _internal = DOM_cast<DOMObjectInternal *>(impl);
+    _internal = reinterpret_cast<DOMObjectInternal *>(impl);
     impl->ref();
     addDOMWrapper(self, impl);
     return self;    
index 63570acd486357b30910040ac7d590606243f53e..7b7d85785a3a531fa3f8f10f3d9055254876de0c 100644 (file)
@@ -27,23 +27,34 @@ use File::stat;
 # Global Variables
 my $module = "";
 my $outputDir = "";
-my %implIncludes = ();
-my %headerForwardDeclarations = ();
-my %privateHeaderForwardDeclarations = ();
-my %headerForwardDeclarationsForProtocols = ();
-my %privateHeaderForwardDeclarationsForProtocols = ();
 my %publicInterfaces = ();
 my $newPublicClass = 0;
 my $isProtocol = 0;
 my @ivars = ();
-my $buildingForTigerOrEarlier = 1 if $ENV{"MACOSX_DEPLOYMENT_TARGET"} and $ENV{"MACOSX_DEPLOYMENT_TARGET"} <= 10.4;
-my $buildingForLeopardOrLater = 1 if $ENV{"MACOSX_DEPLOYMENT_TARGET"} and $ENV{"MACOSX_DEPLOYMENT_TARGET"} >= 10.5;
+
+my @headerContentHeader = ();
+my @headerContent = ();
+my %headerForwardDeclarations = ();
+my %headerForwardDeclarationsForProtocols = ();
+
+my @privateHeaderContentHeader = ();
+my @privateHeaderContent = ();
+my %privateHeaderForwardDeclarations = ();
+my %privateHeaderForwardDeclarationsForProtocols = ();
+
+my @intenalHeaderContent = ();
+
+my @implContentHeader = ();
+my @implContent = ();
+my %implIncludes = ();
 
 # Hashes
 my %protocolTypeHash = ("XPathNSResolver" => 1, "EventListener" => 1, "EventTarget" => 1, "NodeFilter" => 1);
 my %stringTypeHash = ("DOMString" => 1, "AtomicString" => 1);
 
 # Constants
+my $buildingForTigerOrEarlier = 1 if $ENV{"MACOSX_DEPLOYMENT_TARGET"} and $ENV{"MACOSX_DEPLOYMENT_TARGET"} <= 10.4;
+my $buildingForLeopardOrLater = 1 if $ENV{"MACOSX_DEPLOYMENT_TARGET"} and $ENV{"MACOSX_DEPLOYMENT_TARGET"} >= 10.5;
 my $exceptionInit = "WebCore::ExceptionCode ec = 0;";
 my $exceptionRaiseOnError = "raiseOnDOMError(ec);";
 
@@ -191,9 +202,9 @@ sub GenerateInterface
 sub GenerateModule
 {
     my $object = shift;
-    my $dataNode = shift;  
+    my $dataNode = shift;
     
-    $module = $dataNode->module;    
+    $module = $dataNode->module;
 }
 
 sub GetClassName
@@ -211,13 +222,14 @@ sub GetClassName
 
     # Default, assume Objective-C type has the same type name as
     # idl type prefixed with "DOM".
-    return "DOM" . $name;
+    return "DOM$name";
 }
 
 sub GetClassHeaderName
 {
     my $name = shift;
-    $name = "DOM" . $name if $name eq "DOMImplementation";
+
+    return "DOMDOMImplementation" if $name eq "DOMImplementation";
     return $name;
 }
 
@@ -268,9 +280,9 @@ sub GetObjCType
     my $type = shift;
     my $name = GetClassName($type);
 
-    return "id <" . $name . ">" if IsProtocolType($type);
+    return "id <$name>" if IsProtocolType($type);
     return $name if $codeGenerator->IsPrimitiveType($type) or $type eq "DOMTimeStamp";
-    return $name . " *";
+    return "$name *";
 }
 
 sub GetObjCTypeMaker
@@ -281,7 +293,7 @@ sub GetObjCTypeMaker
     return "_RGBColorWithRGB" if $type eq "RGBColor";
 
     my $typeMaker = "";
-    if ($type =~ /^(HTML|CSS)/ or $type eq "DOMImplementation" or $type eq "CDATASection") {
+    if ($type =~ /^(HTML|CSS|SVG)/ or $type eq "DOMImplementation" or $type eq "CDATASection") {
         $typeMaker = $type;
     } elsif ($type =~ /^XPath(.+)/) {
         $typeMaker = "xpath" . $1;
@@ -305,7 +317,7 @@ sub GetObjCTypeGetterName
     return "" if $codeGenerator->IsPrimitiveType($type) or IsStringType($type) or $type eq "URL" or $type eq "DOMTimeStamp";
 
     my $typeGetter = "";
-    if ($type =~ /^(HTML|CSS)/ or $type eq "DOMImplementation" or $type eq "CDATASection") {
+    if ($type =~ /^(HTML|CSS|SVG)/ or $type eq "DOMImplementation" or $type eq "CDATASection") {
         $typeGetter = $type;
     } elsif ($type =~ /^XPath(.+)/) {
         $typeGetter = "xpath" . $1;
@@ -387,7 +399,7 @@ sub AddIncludesForType
 
     # Temp DOMViews.h
     if ($type eq "DOMWindow") {
-        $implIncludes{"DOMViews.h"} = 1;
+        $implIncludes{"DOMAbstractView.h"} = 1;
         $implIncludes{"$type.h"} = 1;
         return;
     }
@@ -405,16 +417,9 @@ sub AddIncludesForType
         return;
     }
 
-    # FIXME: for some reason it won't compile without both CSSStyleDeclaration.h
-    # and CSSMutableStyleDeclaration.h
+    # FIXME: won't compile without these
     $implIncludes{"CSSMutableStyleDeclaration.h"} = 1 if $type eq "CSSStyleDeclaration";
-
-    # FIXME: for some reason it won't compile without both NamedNodeMap.h
-    # and NamedAttrMap.h
     $implIncludes{"NamedAttrMap.h"} = 1 if $type eq "NamedNodeMap";
-
-    # FIXME: for some reason it won't compile without both NodeList.h
-    # and NameNodeList.h
     $implIncludes{"NameNodeList.h"} = 1 if $type eq "NodeList";
 
     # Default, include the same named file (the implementation) and the same name prefixed with "DOM". 
@@ -427,8 +432,11 @@ sub GenerateHeader
     my $object = shift;
     my $dataNode = shift;
 
-    # Make sure that we don't have more than one parent.
-    die "A class can't have more than one parent in ObjC." if @{$dataNode->parents} > 1;
+    # We only support multiple parents with SVG (for now).
+    if (@{$dataNode->parents} > 1) {
+        die "A class can't have more than one parent" unless $module eq "SVG";
+        $codeGenerator->AddMethodsConstantsAndAttributesFromParentClasses($dataNode);
+    }
 
     my $interfaceName = $dataNode->name;
     my $className = GetClassName($interfaceName);
@@ -442,9 +450,6 @@ sub GenerateHeader
     # - Add default header template
     @headerContentHeader = split("\r", $headerLicenceTemplate);
     push(@headerContentHeader, "\n");
-    
-    # - Add a check for the appropriate conditional variable
-    push(@headerContent, "#ifdef ${conditional}_SUPPORT\n\n") if $conditional;
 
     # - INCLUDES -
     unless ($isProtocol) {
@@ -629,9 +634,6 @@ sub GenerateHeader
         @privateHeaderContentHeader = split("\r", $headerLicenceTemplate);
         push(@headerContentHeader, "\n");
 
-        # - Add a check for the appropriate conditional variable
-        push(@privateHeaderContentHeader, "#ifdef ${conditional}_SUPPORT\n\n") if $conditional;
-        
         my $classHeaderName = GetClassHeaderName($className);
         push(@privateHeaderContentHeader, "#import <WebCore/$classHeaderName.h>\n\n");
 
@@ -641,13 +643,7 @@ sub GenerateHeader
         push(@privateHeaderContent, "\n") if $buildingForLeopardOrLater and @privateHeaderAttributes > 0 and @privateHeaderFunctions > 0;
         push(@privateHeaderContent, @privateHeaderFunctions) if @privateHeaderFunctions > 0;
         push(@privateHeaderContent, "\@end\n");
-        
-        # - End the ifdef conditional if necessary (for the private header)
-        push(@privateHeaderContent, "\n#endif // ${conditional}_SUPPORT\n\n") if $conditional;
     }
-    
-    # - End the ifdef conditional if necessary
-    push(@headerContent, "\n#endif // ${conditional}_SUPPORT\n\n") if $conditional;
 }
 
 sub GenerateImplementation
@@ -660,6 +656,7 @@ sub GenerateImplementation
     my $implClassName = GetImplClassName($interfaceName);
     my $parentImplClassName = GetParentImplClassName($dataNode);
     my $implClassNameWithNamespace = "WebCore::" . $implClassName;
+    my $classHeaderName = GetClassHeaderName($className);
     my $conditional = $dataNode->extendedAttributes->{"Conditional"};
 
     my $numAttributes = @{$dataNode->attributes};
@@ -669,12 +666,9 @@ sub GenerateImplementation
     @implContentHeader = split("\r", $implementationLicenceTemplate);
 
     # - INCLUDES -
-    push(@implContentHeader, "\n#import \"config.h\"\n\n");
-    push(@implContentHeader, "#ifdef ${conditional}_SUPPORT\n\n") if $conditional;
-
-    my $classHeaderName = GetClassHeaderName($className);
+    push(@implContentHeader, "\n#import \"config.h\"\n");
+    push(@implContentHeader, "\n#ifdef ${conditional}_SUPPORT\n\n") if $conditional;
     push(@implContentHeader, "#import \"$classHeaderName.h\"\n\n");
-
     push(@implContentHeader, "#import <wtf/GetPtr.h>\n\n");
 
     $implIncludes{"$implClassName.h"} = 1;
@@ -682,9 +676,6 @@ sub GenerateImplementation
 
     @implContent = ();
 
-    # START implementation
-    push(@implContent, "\@implementation $className\n\n");
-
     # add implementation accessor
     # FIXME: CSSStyleSheet should not need special casing like this.
     if ($parentImplClassName eq "Object" or $interfaceName eq "CSSStyleSheet") {
@@ -702,6 +693,9 @@ sub GenerateImplementation
         push(@implContent, "#define IMPL static_cast<$implClassNameWithNamespace*>(reinterpret_cast<$internalBaseType*>(_internal))\n\n");
     }
 
+    # START implementation
+    push(@implContent, "\@implementation $className\n\n");
+
     # Only generate 'dealloc' and 'finalize' methods for direct subclasses of DOMObject.
     if ($parentImplClassName eq "Object") {
         my @ivarsToRelease = ();
@@ -1054,12 +1048,15 @@ sub GenerateImplementation
         # - Type-Getter
         # - (WebCore::FooBar *)_fooBar for implementation class FooBar
         my $typeGetterName = GetObjCTypeGetterName($interfaceName);
-        push(@implContent, "- ($implClassNameWithNamespace *)$typeGetterName\n");
+        my $typeGetterSig = "- ($implClassNameWithNamespace *)$typeGetterName";
+        push(@implContent, "$typeGetterSig\n");
         push(@implContent, "{\n");
         push(@implContent, "    return IMPL;\n");
         push(@implContent, "}\n\n");            
 
         # - Type-Maker
+        my $typeMakerName = GetObjCTypeMaker($interfaceName);
+        my $typeMakerSig = "+ ($className *)$typeMakerName:($implClassNameWithNamespace *)impl";
         if ($parentImplClassName eq "Object") {        
             # - (id)_initWithFooBar:(WebCore::FooBar *)impl for implementation class FooBar
             my $initWithImplName = "_initWith" . $implClassName;
@@ -1073,8 +1070,7 @@ sub GenerateImplementation
             push(@implContent, "}\n\n");
     
             # - (DOMFooBar)_FooBarWith:(WebCore::FooBar *)impl for implementation class FooBar
-            my $typeMakerName = GetObjCTypeMaker($interfaceName);
-            push(@implContent, "+ ($className *)$typeMakerName:($implClassNameWithNamespace *)impl\n");
+            push(@implContent, "$typeMakerSig\n");
             push(@implContent, "{\n");
             push(@implContent, "    if (!impl)\n");
             push(@implContent, "        return nil;\n");
@@ -1086,16 +1082,24 @@ sub GenerateImplementation
             push(@implContent, "}\n\n");
         } else {
             # - (DOMFooBar)_FooBarWith:(WebCore::FooBar *)impl for implementation class FooBar
-            my $typeMakerName = GetObjCTypeMaker($interfaceName);
-            push(@implContent, "+ ($className *)$typeMakerName:($implClassNameWithNamespace *)impl\n");
+            push(@implContent, "$typeMakerSig\n");
             push(@implContent, "{\n");
             push(@implContent, "    return static_cast<$className*>([DOMNode _nodeWith:impl]);\n");
             push(@implContent, "}\n\n");
         }
-
         # END WebCoreInternal category
         push(@implContent, "\@end\n");
+        
+        # Generate interface definitions. 
+        @intenalHeaderContent = split("\r", $implementationLicenceTemplate);
+        push(@intenalHeaderContent, "\n#import \"$className.h\"\n\n");
+        push(@intenalHeaderContent, "namespace WebCore { class $implClassName; }\n\n");
+        push(@intenalHeaderContent, "\@interface $className (WebCoreInternal)\n");
+        push(@intenalHeaderContent, "- ($implClassNameWithNamespace *)$typeGetterName;\n");
+        push(@intenalHeaderContent, "+ ($className *)$typeMakerName:($implClassNameWithNamespace *)impl;\n");
+        push(@intenalHeaderContent, "\@end\n");
     }
+
     # - End the ifdef conditional if necessary
     push(@implContent, "\n#endif // ${conditional}_SUPPORT\n\n") if $conditional;
 }
@@ -1110,83 +1114,76 @@ sub WriteData
     my $headerFileName = "$outputDir/" . $name . ".h";
     my $privateHeaderFileName = "$outputDir/" . $name . "Private.h";
     my $implFileName = "$outputDir/" . $name . ".mm";
+    my $internalHeaderFileName = "$outputDir/" . $name . "Internal.h";
 
     # Remove old files.
     unlink($headerFileName);
     unlink($privateHeaderFileName);
     unlink($implFileName);
+    unlink($internalHeaderFileName);
 
-    # Write implementation file.
-    unless ($isProtocol) {
-        open($IMPL, ">$implFileName") or die "Couldn't open file $implFileName";
+    # Write public header.
+    open(HEADER, ">$headerFileName") or die "Couldn't open file $headerFileName";
+    
+    print HEADER @headerContentHeader;
+    print HEADER map { "\@class $_;\n" } sort keys(%headerForwardDeclarations);
+    print HEADER map { "\@protocol $_;\n" } sort keys(%headerForwardDeclarationsForProtocols);
 
-        print $IMPL @implContentHeader;
+    my $hasForwardDeclarations =  keys(%headerForwardDeclarations) + keys(%headerForwardDeclarationsForProtocols);
+    print HEADER "\n" if $hasForwardDeclarations;
+    print HEADER @headerContent;
 
-        foreach my $implInclude (sort keys(%implIncludes)) {
-            print $IMPL "#import \"$implInclude\"\n";
-        }
+    close(HEADER);
 
-        print $IMPL "\n" if keys(%implIncludes) > 0;
-        print $IMPL @implContent;
+    @headerContentHeader = ();
+    @headerContent = ();
+    %headerForwardDeclarations = ();
+    %headerForwardDeclarationsForProtocols = ();
 
-        close($IMPL);
-        undef($IMPL);
+    if (@privateHeaderContent > 0) {
+        open(PRIVATE_HEADER, ">$privateHeaderFileName") or die "Couldn't open file $privateHeaderFileName";
 
-        @implHeaderContent = "";
-        @implContent = "";    
-        %implIncludes = ();
-    }
+        print PRIVATE_HEADER @privateHeaderContentHeader;
+        print PRIVATE_HEADER map { "\@class $_;\n" } sort keys(%privateHeaderForwardDeclarations);
+        print PRIVATE_HEADER map { "\@protocol $_;\n" } sort keys(%privateHeaderForwardDeclarationsForProtocols);
 
-    # Write public header.
-    open($HEADER, ">$headerFileName") or die "Couldn't open file $headerFileName";
-    print $HEADER @headerContentHeader;
+        $hasForwardDeclarations =  keys(%privateHeaderForwardDeclarations) + keys(%privateHeaderForwardDeclarationsForProtocols);
+        print PRIVATE_HEADER "\n" if $hasForwardDeclarations;
+        print PRIVATE_HEADER @privateHeaderContent;
 
-    my $forwardDeclarationCount = 0;
-    foreach my $forwardClassDeclaration (sort keys(%headerForwardDeclarations)) {
-        print $HEADER "\@class $forwardClassDeclaration;\n";
-        $forwardDeclarationCount++;
-    }
+        close(PRIVATE_HEADER);
 
-    foreach my $forwardProtocolDeclaration (sort keys(%headerForwardDeclarationsForProtocols)) {
-        print $HEADER "\@protocol $forwardProtocolDeclaration;\n";
-        $forwardDeclarationCount++;
+        @privateHeaderContentHeader = ();
+        @privateHeaderContent = ();
+        %privateHeaderForwardDeclarations = ();
+        %privateHeaderForwardDeclarationsForProtocols = ();
     }
 
-    print $HEADER "\n" if $forwardDeclarationCount;
-    print $HEADER @headerContent;
+    # Write implementation file.
+    unless ($isProtocol) {
+        open(IMPL, ">$implFileName") or die "Couldn't open file $implFileName";
 
-    close($HEADER);
-    undef($HEADER);
+        print IMPL @implContentHeader;
+        print IMPL map { "#import \"$_\"\n" } sort keys(%implIncludes);
 
-    @headerContentHeader = "";
-    @headerContent = "";
-    %headerForwardDeclarations = ();
-    %headerForwardDeclarationsForProtocols = ();
+        print IMPL "\n" if keys(%implIncludes);
+        print IMPL @implContent;
 
-    if (@privateHeaderContent > 0) {
-        open($PRIVATE_HEADER, ">$privateHeaderFileName") or die "Couldn't open file $privateHeaderFileName";
-        print $PRIVATE_HEADER @privateHeaderContentHeader;
+        close(IMPL);
 
-        $forwardDeclarationCount = 0;
-        foreach my $forwardClassDeclaration (sort keys(%privateHeaderForwardDeclarations)) {
-            print $PRIVATE_HEADER "\@class $forwardClassDeclaration;\n";
-            $forwardDeclarationCount++;
-        }
-
-        foreach my $forwardProtocolDeclaration (sort keys(%privateHeaderForwardDeclarationsForProtocols)) {
-            print $PRIVATE_HEADER "\@protocol $forwardProtocolDeclaration;\n";
-            $forwardDeclarationCount++;
-        }
+        @implContentHeader = ();
+        @implContent = ();
+        %implIncludes = ();
+    }
+    
+    if (@intenalHeaderContent > 0) {
+       open(INTERNAL_HEADER, ">$internalHeaderFileName") or die "Couldn't open file $internalHeaderFileName";
 
-        print $PRIVATE_HEADER "\n" if $forwardDeclarationCount;
-        print $PRIVATE_HEADER @privateHeaderContent;
+       print INTERNAL_HEADER @intenalHeaderContent;
 
-        close($PRIVATE_HEADER);
-        undef($PRIVATE_HEADER);
+       close(INTERNAL_HEADER);
 
-        @privateHeaderContent = "";
-        %privateHeaderForwardDeclarations = ();
-        %privateHeaderForwardDeclarationsForProtocols = ();
+       @intenalHeaderContent = ();
     }
 }