+2006-10-07 Sam Weinig <sam.weinig@gmail.com>
+
+ Reviewed by Tim H.
+
+ Patch for http://bugs.webkit.org/show_bug.cgi?id=11198
+ Auto-generate a few more Objective-C DOM interfaces
+
+ - Fully auto-generate DOMAbstractView and DOMRange.
+
+ - Auto-generate just the interface for DOMRGBColor.
+
+ - Add DOMRanges.h as the new top level file for Ranges
+ module.
+
+ - Add DOMRanges.h and DOMXPath.h to DOM.mm
+
+ * DerivedSources.make:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/objc/DOM.h:
+ * bindings/objc/DOM.mm:
+ * bindings/objc/DOMAbstractView.h: Removed.
+ * bindings/objc/DOMAbstractView.mm: Removed.
+ * bindings/objc/DOMInternal.h:
+ * bindings/objc/DOMPrivate.h:
+ * bindings/objc/DOMRGBColor.h: Removed.
+ * bindings/objc/DOMRGBColor.mm:
+ * bindings/objc/DOMRange.h: Removed.
+ * bindings/objc/DOMRanges.h: Added.
+ * bindings/objc/PublicDOMInterfaces.h:
+ * bindings/scripts/CodeGeneratorObjC.pm:
+ * css/RGBColor.idl:
+ * dom/Range.idl:
+ * page/AbstractView.idl: Added.
+
2006-10-07 Andrew Wellington <proton@wiretapped.net>
Reviewed by Eric.
ifeq ($(OS),MACOS)
all : \
+ DOMAbstractView.h \
DOMAttr.h \
DOMCDATASection.h \
DOMCSSCharsetRule.h \
DOMNotation.h \
DOMOverflowEvent.h \
DOMProcessingInstruction.h \
+ DOMRGBColor.h \
+ DOMRange.h \
DOMRect.h \
DOMSVGAElement.h \
DOMSVGAngle.h \
8518DCEA0A9CC80D0091B7A6 /* DOMDOMImplementation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8518DCE80A9CC80D0091B7A6 /* DOMDOMImplementation.mm */; };
8518DD780A9CF31B0091B7A6 /* DOMNamedNodeMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 8518DD760A9CF31B0091B7A6 /* DOMNamedNodeMap.h */; settings = {ATTRIBUTES = (); }; };
8518DD790A9CF31B0091B7A6 /* DOMNamedNodeMap.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8518DD770A9CF31B0091B7A6 /* DOMNamedNodeMap.mm */; };
- 851EE80C0ABCA28F00A6AA33 /* DOMAbstractView.h in Headers */ = {isa = PBXBuildFile; fileRef = 851EE80A0ABCA28F00A6AA33 /* DOMAbstractView.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 851EE80D0ABCA28F00A6AA33 /* DOMAbstractView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 851EE80B0ABCA28F00A6AA33 /* DOMAbstractView.mm */; };
851EE8110ABCA39600A6AA33 /* DOMEventException.h in Headers */ = {isa = PBXBuildFile; fileRef = 851EE8100ABCA39600A6AA33 /* DOMEventException.h */; settings = {ATTRIBUTES = (Private, ); }; };
851EE8210ABCA58100A6AA33 /* DOMRangeException.h in Headers */ = {isa = PBXBuildFile; fileRef = 851EE8200ABCA58100A6AA33 /* DOMRangeException.h */; settings = {ATTRIBUTES = (Private, ); }; };
85217E020A5ECD4700DB8D00 /* XSLImportRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 85217E000A5ECD4700DB8D00 /* XSLImportRule.cpp */; };
85217E030A5ECD4700DB8D00 /* XSLImportRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 85217E010A5ECD4700DB8D00 /* XSLImportRule.h */; };
852B9E880AA79C47002ADA6E /* DOMHTMLAppletElement.mm in Sources */ = {isa = PBXBuildFile; fileRef = 852B9E840AA79C47002ADA6E /* DOMHTMLAppletElement.mm */; };
+ 8538F0190AD718D8006A81D1 /* DOMAbstractView.h in Headers */ = {isa = PBXBuildFile; fileRef = 8538F0160AD718D8006A81D1 /* DOMAbstractView.h */; };
+ 8538F01A0AD718D8006A81D1 /* DOMAbstractView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8538F0170AD718D8006A81D1 /* DOMAbstractView.mm */; };
+ 8538F01B0AD718D8006A81D1 /* DOMAbstractViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 8538F0180AD718D8006A81D1 /* DOMAbstractViewInternal.h */; };
+ 8538F0300AD71CDB006A81D1 /* DOMAbstractView.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8538F0160AD718D8006A81D1 /* DOMAbstractView.h */; };
+ 8538F05B0AD722F1006A81D1 /* DOMRange.h in Headers */ = {isa = PBXBuildFile; fileRef = 8538F0580AD722F1006A81D1 /* DOMRange.h */; };
+ 8538F05C0AD722F1006A81D1 /* DOMRange.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8538F0590AD722F1006A81D1 /* DOMRange.mm */; };
+ 8538F05D0AD722F1006A81D1 /* DOMRangeInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 8538F05A0AD722F1006A81D1 /* DOMRangeInternal.h */; };
+ 8538F0850AD72CB6006A81D1 /* DOMRanges.h in Headers */ = {isa = PBXBuildFile; fileRef = 8538F0840AD72CB6006A81D1 /* DOMRanges.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 8538F08C0AD72E0A006A81D1 /* DOMRange.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8538F0580AD722F1006A81D1 /* DOMRange.h */; };
853BF4DB0ABB6B55008647BB /* DOMNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 853BF4D90ABB6B55008647BB /* DOMNode.h */; };
853BF4DC0ABB6B55008647BB /* DOMNode.mm in Sources */ = {isa = PBXBuildFile; fileRef = 853BF4DA0ABB6B55008647BB /* DOMNode.mm */; };
853BF4EB0ABB6E97008647BB /* DOMNodePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 853BF4EA0ABB6E97008647BB /* DOMNodePrivate.h */; };
8559F1200AC9BF4200A3439C /* DOMSVGAnimatedNumberInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 8559F11D0AC9BF4100A3439C /* DOMSVGAnimatedNumberInternal.h */; };
8559F1210AC9BF4200A3439C /* DOMSVGMetadataElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 8559F11E0AC9BF4100A3439C /* DOMSVGMetadataElementInternal.h */; };
8559F1220AC9BF4200A3439C /* DOMSVGStyleElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 8559F11F0AC9BF4200A3439C /* DOMSVGStyleElementInternal.h */; };
+ 855D358A0AD707310019AAC7 /* DOMRGBColor.h in Headers */ = {isa = PBXBuildFile; fileRef = 855D35890AD707310019AAC7 /* DOMRGBColor.h */; };
+ 855D358D0AD707CC0019AAC7 /* DOMRGBColor.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 855D35890AD707310019AAC7 /* DOMRGBColor.h */; };
856C8AE40A912649005C687B /* DOMObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 856C8AE20A912649005C687B /* DOMObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
856C8AE50A912649005C687B /* DOMObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = 856C8AE30A912649005C687B /* DOMObject.mm */; };
8575DF7E0AA6127E00F5DBB5 /* DOMHTMLStyleElement.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 859A9C450AA5E3BD00B694B2 /* DOMHTMLStyleElement.h */; };
858C38A80AA8F20400B187A4 /* DOMRect.mm in Sources */ = {isa = PBXBuildFile; fileRef = 858C38A40AA8F20400B187A4 /* DOMRect.mm */; };
858C39280AA8FF9D00B187A4 /* DOMCSSStyleSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 858C39260AA8FF9D00B187A4 /* DOMCSSStyleSheet.h */; };
858C39290AA8FF9D00B187A4 /* DOMCSSStyleSheet.mm in Sources */ = {isa = PBXBuildFile; fileRef = 858C39270AA8FF9D00B187A4 /* DOMCSSStyleSheet.mm */; };
- 858C395F0AA902A900B187A4 /* DOMRGBColor.h in Headers */ = {isa = PBXBuildFile; fileRef = 858C395D0AA902A900B187A4 /* DOMRGBColor.h */; settings = {ATTRIBUTES = (Private, ); }; };
858C39600AA902A900B187A4 /* DOMRGBColor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 858C395E0AA902A900B187A4 /* DOMRGBColor.mm */; };
858C39B80AA905EF00B187A4 /* DOMCSSValue.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 858C381A0AA8E29600B187A4 /* DOMCSSValue.h */; };
858C39B90AA905EF00B187A4 /* DOMCSSPrimitiveValue.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 858C382A0AA8E40500B187A4 /* DOMCSSPrimitiveValue.h */; };
859C9C400ACACCCC00791611 /* DOMSVGRectElement.mm in Sources */ = {isa = PBXBuildFile; fileRef = 859C9C3E0ACACCCC00791611 /* DOMSVGRectElement.mm */; };
859C9C420ACACD6D00791611 /* DOMSVGRectElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 859C9C410ACACD6D00791611 /* DOMSVGRectElementInternal.h */; };
85A0F97E0AC7163D00161FDC /* DOMSVG.h in Headers */ = {isa = PBXBuildFile; fileRef = 85A0F97D0AC7163D00161FDC /* DOMSVG.h */; };
+ 85A795BA0AD754A30006B9D8 /* DOMRangePrivate.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 85C320780AD7401500BC15C4 /* DOMRangePrivate.h */; };
85ACA9860A9B520300671E90 /* DOMCharacterData.h in Headers */ = {isa = PBXBuildFile; fileRef = 85ACA9840A9B520300671E90 /* DOMCharacterData.h */; settings = {ATTRIBUTES = (); }; };
85ACA9870A9B520300671E90 /* DOMCharacterData.mm in Sources */ = {isa = PBXBuildFile; fileRef = 85ACA9850A9B520300671E90 /* DOMCharacterData.mm */; };
85ACA99C0A9B575900671E90 /* DOMText.h in Headers */ = {isa = PBXBuildFile; fileRef = 85ACA99A0A9B575900671E90 /* DOMText.h */; settings = {ATTRIBUTES = (); }; };
85C239810AD5907D003533E7 /* DOMSVGNumberList.h in Headers */ = {isa = PBXBuildFile; fileRef = 85C2397F0AD5907D003533E7 /* DOMSVGNumberList.h */; };
85C239820AD5907D003533E7 /* DOMSVGNumberList.mm in Sources */ = {isa = PBXBuildFile; fileRef = 85C239800AD5907D003533E7 /* DOMSVGNumberList.mm */; };
85C239840AD59098003533E7 /* DOMSVGNumberListInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85C239830AD59098003533E7 /* DOMSVGNumberListInternal.h */; };
+ 85C320790AD7401500BC15C4 /* DOMRangePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 85C320780AD7401500BC15C4 /* DOMRangePrivate.h */; };
85C78A680ABDE1B40044FC16 /* DOMException.h in Headers */ = {isa = PBXBuildFile; fileRef = 85C78A670ABDE1B40044FC16 /* DOMException.h */; settings = {ATTRIBUTES = (Private, ); }; };
85C7F3E60AAF5D5E004014DD /* DOMEvent.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 85AFA8200AAF528A00E84305 /* DOMEvent.h */; };
85C7F4910AAF79DC004014DD /* DOMUIEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 85C7F48F0AAF79DC004014DD /* DOMUIEvent.h */; };
BC1A37B9097C715F0019F3D8 /* DOMInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = BC1A37A3097C715F0019F3D8 /* DOMInternal.h */; };
BC1A37BA097C715F0019F3D8 /* DOMInternal.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC1A37A4097C715F0019F3D8 /* DOMInternal.mm */; };
BC1A37BB097C715F0019F3D8 /* DOMPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = BC1A37A5097C715F0019F3D8 /* DOMPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
- BC1A37BC097C715F0019F3D8 /* DOMRange.h in Headers */ = {isa = PBXBuildFile; fileRef = BC1A37A6097C715F0019F3D8 /* DOMRange.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC1A37BD097C715F0019F3D8 /* DOMStylesheets.h in Headers */ = {isa = PBXBuildFile; fileRef = BC1A37A7097C715F0019F3D8 /* DOMStylesheets.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC1A37BE097C715F0019F3D8 /* DOMTraversal.h in Headers */ = {isa = PBXBuildFile; fileRef = BC1A37A8097C715F0019F3D8 /* DOMTraversal.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC1A37BF097C715F0019F3D8 /* DOMUtility.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC1A37A9097C715F0019F3D8 /* DOMUtility.mm */; };
dstPath = Versions/A/PrivateHeaders;
dstSubfolderSpec = 1;
files = (
+ 85A795BA0AD754A30006B9D8 /* DOMRangePrivate.h in CopyFiles */,
+ 8538F08C0AD72E0A006A81D1 /* DOMRange.h in CopyFiles */,
+ 8538F0300AD71CDB006A81D1 /* DOMAbstractView.h in CopyFiles */,
+ 855D358D0AD707CC0019AAC7 /* DOMRGBColor.h in CopyFiles */,
854075830AD6CF1400620C57 /* DOMHTMLAppletElement.h in CopyFiles */,
854075840AD6CF1400620C57 /* DOMHTMLEmbedElement.h in CopyFiles */,
854075850AD6CF1400620C57 /* DOMHTMLOptionElement.h in CopyFiles */,
8518DCE80A9CC80D0091B7A6 /* DOMDOMImplementation.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMDOMImplementation.mm; sourceTree = "<group>"; };
8518DD760A9CF31B0091B7A6 /* DOMNamedNodeMap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMNamedNodeMap.h; sourceTree = "<group>"; };
8518DD770A9CF31B0091B7A6 /* DOMNamedNodeMap.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMNamedNodeMap.mm; sourceTree = "<group>"; };
- 851EE80A0ABCA28F00A6AA33 /* DOMAbstractView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMAbstractView.h; sourceTree = "<group>"; };
- 851EE80B0ABCA28F00A6AA33 /* DOMAbstractView.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMAbstractView.mm; sourceTree = "<group>"; };
851EE8100ABCA39600A6AA33 /* DOMEventException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMEventException.h; sourceTree = "<group>"; };
851EE8200ABCA58100A6AA33 /* DOMRangeException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMRangeException.h; sourceTree = "<group>"; };
85217E000A5ECD4700DB8D00 /* XSLImportRule.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = XSLImportRule.cpp; sourceTree = "<group>"; };
85217E010A5ECD4700DB8D00 /* XSLImportRule.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = XSLImportRule.h; sourceTree = "<group>"; };
852B9E840AA79C47002ADA6E /* DOMHTMLAppletElement.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMHTMLAppletElement.mm; sourceTree = "<group>"; };
+ 8538F0000AD71770006A81D1 /* AbstractView.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AbstractView.idl; sourceTree = "<group>"; };
+ 8538F0160AD718D8006A81D1 /* DOMAbstractView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMAbstractView.h; sourceTree = "<group>"; };
+ 8538F0170AD718D8006A81D1 /* DOMAbstractView.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMAbstractView.mm; sourceTree = "<group>"; };
+ 8538F0180AD718D8006A81D1 /* DOMAbstractViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMAbstractViewInternal.h; sourceTree = "<group>"; };
+ 8538F0580AD722F1006A81D1 /* DOMRange.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMRange.h; sourceTree = "<group>"; };
+ 8538F0590AD722F1006A81D1 /* DOMRange.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMRange.mm; sourceTree = "<group>"; };
+ 8538F05A0AD722F1006A81D1 /* DOMRangeInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMRangeInternal.h; sourceTree = "<group>"; };
+ 8538F0840AD72CB6006A81D1 /* DOMRanges.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMRanges.h; sourceTree = "<group>"; };
853BF4D90ABB6B55008647BB /* DOMNode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMNode.h; sourceTree = "<group>"; };
853BF4DA0ABB6B55008647BB /* DOMNode.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMNode.mm; sourceTree = "<group>"; };
853BF4EA0ABB6E97008647BB /* DOMNodePrivate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMNodePrivate.h; sourceTree = "<group>"; };
8559F11D0AC9BF4100A3439C /* DOMSVGAnimatedNumberInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMSVGAnimatedNumberInternal.h; sourceTree = "<group>"; };
8559F11E0AC9BF4100A3439C /* DOMSVGMetadataElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMSVGMetadataElementInternal.h; sourceTree = "<group>"; };
8559F11F0AC9BF4200A3439C /* DOMSVGStyleElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMSVGStyleElementInternal.h; sourceTree = "<group>"; };
+ 855D35890AD707310019AAC7 /* DOMRGBColor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMRGBColor.h; sourceTree = "<group>"; };
856C8AE20A912649005C687B /* DOMObject.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMObject.h; sourceTree = "<group>"; };
856C8AE30A912649005C687B /* DOMObject.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMObject.mm; sourceTree = "<group>"; };
857E0B230AB043460036E447 /* DOMMouseEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMMouseEvent.h; sourceTree = "<group>"; };
858C39100AA8FF0000B187A4 /* CSSStyleSheet.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CSSStyleSheet.idl; sourceTree = "<group>"; };
858C39260AA8FF9D00B187A4 /* DOMCSSStyleSheet.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMCSSStyleSheet.h; sourceTree = "<group>"; };
858C39270AA8FF9D00B187A4 /* DOMCSSStyleSheet.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMCSSStyleSheet.mm; sourceTree = "<group>"; };
- 858C395D0AA902A900B187A4 /* DOMRGBColor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMRGBColor.h; sourceTree = "<group>"; };
858C395E0AA902A900B187A4 /* DOMRGBColor.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMRGBColor.mm; sourceTree = "<group>"; };
85909CD30ACC7A7E00DF01F1 /* DOMCSSCharsetRuleInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMCSSCharsetRuleInternal.h; sourceTree = "<group>"; };
85909CD40ACC7A7E00DF01F1 /* DOMCSSFontFaceRuleInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMCSSFontFaceRuleInternal.h; sourceTree = "<group>"; };
85C2397F0AD5907D003533E7 /* DOMSVGNumberList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMSVGNumberList.h; sourceTree = "<group>"; };
85C239800AD5907D003533E7 /* DOMSVGNumberList.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMSVGNumberList.mm; sourceTree = "<group>"; };
85C239830AD59098003533E7 /* DOMSVGNumberListInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMSVGNumberListInternal.h; sourceTree = "<group>"; };
+ 85C320780AD7401500BC15C4 /* DOMRangePrivate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMRangePrivate.h; sourceTree = "<group>"; };
85C56C5B0AA87AFD00D95755 /* MediaList.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = MediaList.idl; sourceTree = "<group>"; };
85C56CA10AA89AB400D95755 /* CSSStyleRule.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CSSStyleRule.idl; sourceTree = "<group>"; };
85C56CA20AA89C1000D95755 /* CSSMediaRule.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CSSMediaRule.idl; sourceTree = "<group>"; };
BC1A37A3097C715F0019F3D8 /* DOMInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMInternal.h; sourceTree = "<group>"; };
BC1A37A4097C715F0019F3D8 /* DOMInternal.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMInternal.mm; sourceTree = "<group>"; };
BC1A37A5097C715F0019F3D8 /* DOMPrivate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMPrivate.h; sourceTree = "<group>"; };
- BC1A37A6097C715F0019F3D8 /* DOMRange.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMRange.h; sourceTree = "<group>"; };
BC1A37A7097C715F0019F3D8 /* DOMStylesheets.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMStylesheets.h; sourceTree = "<group>"; };
BC1A37A8097C715F0019F3D8 /* DOMTraversal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMTraversal.h; sourceTree = "<group>"; };
BC1A37A9097C715F0019F3D8 /* DOMUtility.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMUtility.mm; sourceTree = "<group>"; };
65BF02180974806300C43196 /* page */ = {
isa = PBXGroup;
children = (
+ 8538F0000AD71770006A81D1 /* AbstractView.idl */,
1403B99609EB13AF00797C7F /* DOMWindow.cpp */,
1403B99509EB13AF00797C7F /* DOMWindow.h */,
1403B90C09EB124500797C7F /* DOMWindow.idl */,
name = StyleSheets;
sourceTree = "<group>";
};
- 851EE8060ABCA25200A6AA33 /* Views */ = {
+ 8538F0150AD718AF006A81D1 /* Views */ = {
isa = PBXGroup;
children = (
- 851EE80A0ABCA28F00A6AA33 /* DOMAbstractView.h */,
- 851EE80B0ABCA28F00A6AA33 /* DOMAbstractView.mm */,
+ 8538F0160AD718D8006A81D1 /* DOMAbstractView.h */,
+ 8538F0170AD718D8006A81D1 /* DOMAbstractView.mm */,
);
name = Views;
sourceTree = "<group>";
};
+ 8538F0570AD722B9006A81D1 /* Ranges */ = {
+ isa = PBXGroup;
+ children = (
+ 8538F0580AD722F1006A81D1 /* DOMRange.h */,
+ 8538F0590AD722F1006A81D1 /* DOMRange.mm */,
+ 85C320780AD7401500BC15C4 /* DOMRangePrivate.h */,
+ );
+ name = Ranges;
+ sourceTree = "<group>";
+ };
854075420AD6C73E00620C57 /* DOMExceptions */ = {
isa = PBXGroup;
children = (
858C39510AA9024C00B187A4 /* CSS */ = {
isa = PBXGroup;
children = (
- 858C395D0AA902A900B187A4 /* DOMRGBColor.h */,
858C395E0AA902A900B187A4 /* DOMRGBColor.mm */,
);
name = CSS;
858C38A20AA8F20400B187A4 /* DOMCounter.mm */,
858C38A30AA8F20400B187A4 /* DOMRect.h */,
858C38A40AA8F20400B187A4 /* DOMRect.mm */,
+ 855D35890AD707310019AAC7 /* DOMRGBColor.h */,
);
name = CSS;
sourceTree = "<group>";
85967DCA0AA8BF0F005FEDEE /* CSS */,
85AFA7AB0AAF3BB000E84305 /* Events */,
85C56D030AA8BAA700D95755 /* HTML */,
+ 8538F0570AD722B9006A81D1 /* Ranges */,
850657040AAB476C002D15C0 /* StyleSheets */,
85A0F98E0AC716F400161FDC /* SVG */,
85526C150AB0A12A000302EA /* Traversal */,
+ 8538F0150AD718AF006A81D1 /* Views */,
85E9E0A70AB3A0CC00069CD0 /* XPath */,
85E7113D0AC5D4A10053270F /* Internal */,
);
85E7113D0AC5D4A10053270F /* Internal */ = {
isa = PBXGroup;
children = (
+ 8538F0180AD718D8006A81D1 /* DOMAbstractViewInternal.h */,
85E7113E0AC5D5340053270F /* DOMAttrInternal.h */,
85E7113F0AC5D5340053270F /* DOMCDATASectionInternal.h */,
85E711400AC5D5340053270F /* DOMCharacterDataInternal.h */,
85E711850AC5D5350053270F /* DOMNotationInternal.h */,
85989DC80ACC8BBD00A0BC51 /* DOMOverflowEventInternal.h */,
85E711860AC5D5350053270F /* DOMProcessingInstructionInternal.h */,
+ 8538F05A0AD722F1006A81D1 /* DOMRangeInternal.h */,
85E711870AC5D5350053270F /* DOMRectInternal.h */,
85E711880AC5D5350053270F /* DOMStyleSheetListInternal.h */,
85ACEF850ACDD04A001214FF /* DOMSVGAElementInternal.h */,
858C39510AA9024C00B187A4 /* CSS */,
85992FC20AA5DD4600AC0785 /* HTML */,
8549492D0AC85A0A008AB035 /* SVG */,
- 851EE8060ABCA25200A6AA33 /* Views */,
854075420AD6C73E00620C57 /* DOMExceptions */,
859B7FB90A8D288800A5F1EA /* CodeGeneratorObjC.pm */,
1CD0B6200AABDB5000D0A3FF /* PublicDOMInterfaces.h */,
BC1A37A3097C715F0019F3D8 /* DOMInternal.h */,
BC1A37A4097C715F0019F3D8 /* DOMInternal.mm */,
BC1A37A5097C715F0019F3D8 /* DOMPrivate.h */,
- BC1A37A6097C715F0019F3D8 /* DOMRange.h */,
+ 8538F0840AD72CB6006A81D1 /* DOMRanges.h */,
BC1A37A7097C715F0019F3D8 /* DOMStylesheets.h */,
85A0F97D0AC7163D00161FDC /* DOMSVG.h */,
BC1A37A8097C715F0019F3D8 /* DOMTraversal.h */,
BC1A37B6097C715F0019F3D8 /* DOMHTML.h in Headers */,
BC1A37B9097C715F0019F3D8 /* DOMInternal.h in Headers */,
BC1A37BB097C715F0019F3D8 /* DOMPrivate.h in Headers */,
- BC1A37BC097C715F0019F3D8 /* DOMRange.h in Headers */,
BC1A37BD097C715F0019F3D8 /* DOMStylesheets.h in Headers */,
BC1A37BE097C715F0019F3D8 /* DOMTraversal.h in Headers */,
BC1A37C0097C715F0019F3D8 /* DOMViews.h in Headers */,
858C38A50AA8F20400B187A4 /* DOMCounter.h in Headers */,
858C38A70AA8F20400B187A4 /* DOMRect.h in Headers */,
858C39280AA8FF9D00B187A4 /* DOMCSSStyleSheet.h in Headers */,
- 858C395F0AA902A900B187A4 /* DOMRGBColor.h in Headers */,
93AE23180AAB51E500CD8A35 /* TextEncodingRegistry.h in Headers */,
850656FE0AAB4763002D15C0 /* DOMMediaList.h in Headers */,
850657000AAB4763002D15C0 /* DOMStyleSheet.h in Headers */,
853BF4EB0ABB6E97008647BB /* DOMNodePrivate.h in Headers */,
85BCBC130ABBA87D00381160 /* DOMHTMLDocument.h in Headers */,
AA21ECCD0ABF0FC6002B834C /* CSSCursorImageValue.h in Headers */,
- 851EE80C0ABCA28F00A6AA33 /* DOMAbstractView.h in Headers */,
851EE8110ABCA39600A6AA33 /* DOMEventException.h in Headers */,
851EE8210ABCA58100A6AA33 /* DOMRangeException.h in Headers */,
858015CE0ABCA75D0080588D /* DOMXPathException.h in Headers */,
8540756A0AD6CBF900620C57 /* DOMHTMLEmbedElement.h in Headers */,
8540756B0AD6CBF900620C57 /* DOMHTMLOptionElement.h in Headers */,
8540756D0AD6CBF900620C57 /* DOMHTMLOptionElementInternal.h in Headers */,
+ 855D358A0AD707310019AAC7 /* DOMRGBColor.h in Headers */,
+ 8538F0190AD718D8006A81D1 /* DOMAbstractView.h in Headers */,
+ 8538F01B0AD718D8006A81D1 /* DOMAbstractViewInternal.h in Headers */,
+ 8538F05B0AD722F1006A81D1 /* DOMRange.h in Headers */,
+ 8538F05D0AD722F1006A81D1 /* DOMRangeInternal.h in Headers */,
+ 8538F0850AD72CB6006A81D1 /* DOMRanges.h in Headers */,
+ 85C320790AD7401500BC15C4 /* DOMRangePrivate.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
853BF4DC0ABB6B55008647BB /* DOMNode.mm in Sources */,
85BCBC140ABBA87D00381160 /* DOMHTMLDocument.mm in Sources */,
AA21ECCA0ABF0FBA002B834C /* CSSCursorImageValue.cpp in Sources */,
- 851EE80D0ABCA28F00A6AA33 /* DOMAbstractView.mm in Sources */,
A8415F9B0AC10C5D00F7D0DF /* KCanvasClipper.cpp in Sources */,
A8415F9D0AC10C5D00F7D0DF /* KCanvasResource.cpp in Sources */,
A8415F9F0AC10C5D00F7D0DF /* KCanvasMasker.cpp in Sources */,
8502AB770AD438E600378540 /* DOMSVGComponentTransferFunctionElement.mm in Sources */,
85C239820AD5907D003533E7 /* DOMSVGNumberList.mm in Sources */,
8540756C0AD6CBF900620C57 /* DOMHTMLOptionElement.mm in Sources */,
+ 8538F01A0AD718D8006A81D1 /* DOMAbstractView.mm in Sources */,
+ 8538F05C0AD722F1006A81D1 /* DOMRange.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/*
- * Copyright (C) 2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2004, 2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
#import <WebCore/DOMExtensions.h>
#import <WebCore/DOMEvents.h>
#import <WebCore/DOMHTML.h>
-#import <WebCore/DOMRange.h>
+#import <WebCore/DOMRanges.h>
#import <WebCore/DOMStylesheets.h>
#import <WebCore/DOMTraversal.h>
#import <WebCore/DOMViews.h>
+#import <WebCore/DOMXPath.h>
//------------------------------------------------------------------------------------------
// DOMRange
-@implementation DOMRange
-
-- (void)dealloc
-{
- if (_internal)
- reinterpret_cast<WebCore::Range*>(_internal)->deref();
- [super dealloc];
-}
-
-- (void)finalize
-{
- if (_internal)
- reinterpret_cast<WebCore::Range*>(_internal)->deref();
- [super finalize];
-}
+@implementation DOMRange (DOMRangeExtensions)
- (NSString *)description
{
[self startContainer], [self startOffset], [self endContainer], [self endOffset]];
}
-- (DOMNode *)startContainer
-{
- WebCore::ExceptionCode ec = 0;
- DOMNode *result = [DOMNode _nodeWith:[self _range]->startContainer(ec)];
- raiseOnDOMError(ec);
- return result;
-}
-
-- (int)startOffset
-{
- WebCore::ExceptionCode ec = 0;
- int result = [self _range]->startOffset(ec);
- raiseOnDOMError(ec);
- return result;
-}
-
-- (DOMNode *)endContainer
-{
- WebCore::ExceptionCode ec = 0;
- DOMNode *result = [DOMNode _nodeWith:[self _range]->endContainer(ec)];
- raiseOnDOMError(ec);
- return result;
-}
-
-- (int)endOffset
-{
- WebCore::ExceptionCode ec = 0;
- int result = [self _range]->endOffset(ec);
- raiseOnDOMError(ec);
- return result;
-}
-
-- (BOOL)collapsed
-{
- WebCore::ExceptionCode ec = 0;
- BOOL result = [self _range]->collapsed(ec);
- raiseOnDOMError(ec);
- return result;
-}
-
-- (DOMNode *)commonAncestorContainer
-{
- WebCore::ExceptionCode ec = 0;
- DOMNode *result = [DOMNode _nodeWith:[self _range]->commonAncestorContainer(ec)];
- raiseOnDOMError(ec);
- return result;
-}
-
-- (void)setStart:(DOMNode *)refNode offset:(int)offset
-{
- WebCore::ExceptionCode ec = 0;
- [self _range]->setStart([refNode _node], offset, ec);
- raiseOnDOMError(ec);
-}
-
-- (void)setEnd:(DOMNode *)refNode offset:(int)offset
-{
- WebCore::ExceptionCode ec = 0;
- [self _range]->setEnd([refNode _node], offset, ec);
- raiseOnDOMError(ec);
-}
-
-- (void)setStartBefore:(DOMNode *)refNode
-{
- WebCore::ExceptionCode ec = 0;
- [self _range]->setStartBefore([refNode _node], ec);
- raiseOnDOMError(ec);
-}
-
-- (void)setStartAfter:(DOMNode *)refNode
-{
- WebCore::ExceptionCode ec = 0;
- [self _range]->setStartAfter([refNode _node], ec);
- raiseOnDOMError(ec);
-}
-
-- (void)setEndBefore:(DOMNode *)refNode
-{
- WebCore::ExceptionCode ec = 0;
- [self _range]->setEndBefore([refNode _node], ec);
- raiseOnDOMError(ec);
-}
-
-- (void)setEndAfter:(DOMNode *)refNode
-{
- WebCore::ExceptionCode ec = 0;
- [self _range]->setEndAfter([refNode _node], ec);
- raiseOnDOMError(ec);
-}
-
-- (void)collapse:(BOOL)toStart
-{
- WebCore::ExceptionCode ec = 0;
- [self _range]->collapse(toStart, ec);
- raiseOnDOMError(ec);
-}
-
-- (void)selectNode:(DOMNode *)refNode
-{
- WebCore::ExceptionCode ec = 0;
- [self _range]->selectNode([refNode _node], ec);
- raiseOnDOMError(ec);
-}
-
-- (void)selectNodeContents:(DOMNode *)refNode
-{
- WebCore::ExceptionCode ec = 0;
- [self _range]->selectNodeContents([refNode _node], ec);
- raiseOnDOMError(ec);
-}
-
-- (short)compareBoundaryPoints:(unsigned short)how sourceRange:(DOMRange *)sourceRange
-{
- WebCore::ExceptionCode ec = 0;
- short result = [self _range]->compareBoundaryPoints(static_cast<WebCore::Range::CompareHow>(how), [sourceRange _range], ec);
- raiseOnDOMError(ec);
- return result;
-}
-
-- (void)deleteContents
-{
- WebCore::ExceptionCode ec = 0;
- [self _range]->deleteContents(ec);
- raiseOnDOMError(ec);
-}
-
-- (DOMDocumentFragment *)extractContents
-{
- WebCore::ExceptionCode ec = 0;
- DOMDocumentFragment *result = [DOMDocumentFragment _documentFragmentWith:[self _range]->extractContents(ec).get()];
- raiseOnDOMError(ec);
- return result;
-}
-
-- (DOMDocumentFragment *)cloneContents
-{
- WebCore::ExceptionCode ec = 0;
- DOMDocumentFragment *result = [DOMDocumentFragment _documentFragmentWith:[self _range]->cloneContents(ec).get()];
- raiseOnDOMError(ec);
- return result;
-}
-
-- (void)insertNode:(DOMNode *)newNode
-{
- WebCore::ExceptionCode ec = 0;
- [self _range]->insertNode([newNode _node], ec);
- raiseOnDOMError(ec);
-}
-
-- (void)surroundContents:(DOMNode *)newParent
-{
- WebCore::ExceptionCode ec = 0;
- [self _range]->surroundContents([newParent _node], ec);
- raiseOnDOMError(ec);
-}
-
-- (DOMRange *)cloneRange
-{
- WebCore::ExceptionCode ec = 0;
- DOMRange *result = [DOMRange _rangeWith:[self _range]->cloneRange(ec).get()];
- raiseOnDOMError(ec);
- return result;
-}
-
-- (NSString *)toString
-{
- WebCore::ExceptionCode ec = 0;
- NSString *result = [self _range]->toString(ec);
- raiseOnDOMError(ec);
- return result;
-}
-
- (NSString *)text
{
return [self _range]->text();
}
-- (void)detach
-{
- WebCore::ExceptionCode ec = 0;
- [self _range]->detach(ec);
- raiseOnDOMError(ec);
-}
-
-@end
-
-@implementation DOMRange (DOMRangeDeprecated)
-
-- (void)setStart:(DOMNode *)refNode :(int)offset
-{
- [self setStart:refNode offset:offset];
-}
-
-- (void)setEnd:(DOMNode *)refNode :(int)offset
-{
- [self setEnd:refNode offset:offset];
-}
-
-- (short)compareBoundaryPoints:(unsigned short)how :(DOMRange *)sourceRange
-{
- return [self compareBoundaryPoints:how sourceRange:sourceRange];
-}
-
-@end
-
-@implementation DOMRange (WebCoreInternal)
-
-- (id)_initWithRange:(WebCore::Range *)impl
-{
- ASSERT(impl);
-
- [super _init];
- _internal = reinterpret_cast<DOMObjectInternal*>(impl);
- impl->ref();
- addDOMWrapper(self, impl);
- return self;
-}
-
-+ (DOMRange *)_rangeWith:(WebCore::Range *)impl
-{
- if (!impl)
- return nil;
-
- id cachedInstance;
- cachedInstance = getDOMWrapper(impl);
- if (cachedInstance)
- return [[cachedInstance retain] autorelease];
-
- return [[[self alloc] _initWithRange:impl] autorelease];
-}
-
-- (WebCore::Range *)_range
-{
- return reinterpret_cast<WebCore::Range*>(_internal);
-}
-
@end
@implementation DOMRange (WebPrivate)
+++ /dev/null
-/*
- * Copyright (C) 2004-2006 Apple Computer, Inc. All rights reserved.
- * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "config.h"
-#import "DOMAbstractView.h"
-
-#import <wtf/GetPtr.h>
-
-#import "DOMDocument.h"
-#import "DOMInternal.h"
-#import "DOMWindow.h"
-#import "Document.h"
-
-namespace WebCore {
- typedef DOMWindow AbstractView;
-}
-
-@implementation DOMAbstractView
-
-#define IMPL reinterpret_cast<WebCore::DOMWindow*>(_internal)
-
-- (DOMDocument *)document
-{
- return [DOMDocument _documentWith:WTF::getPtr(IMPL->document())];
-}
-
-@end
-
-@implementation DOMAbstractView (WebCoreInternal)
-
-- (WebCore::AbstractView *)_abstractView
-{
- return IMPL;
-}
-
-- (id)_initWithAbstractView:(WebCore::AbstractView *)impl
-{
- ASSERT(impl);
-
- [super _init];
- _internal = reinterpret_cast<DOMObjectInternal *>(impl);
- impl->ref();
- addDOMWrapper(self, impl);
- return self;
-}
-
-+ (DOMAbstractView *)_abstractViewWith:(WebCore::AbstractView *)impl
-{
- if (!impl)
- return nil;
-
- id cachedInstance;
- cachedInstance = getDOMWrapper(impl);
- if (cachedInstance)
- return [[cachedInstance retain] autorelease];
-
- return [[[DOMAbstractView alloc] _initWithAbstractView:impl] autorelease];
-}
-
-@end
#import "DOM.h"
#import "Color.h"
-#import "DOMAbstractView.h"
#import "DOMCSSRule.h"
#import "DOMCSSValue.h"
#import "DOMEvents.h"
#endif // XPATH_SUPPORT
// Auto-generated internal interfaces
+#import "DOMAbstractViewInternal.h"
#import "DOMAttrInternal.h"
#import "DOMCDATASectionInternal.h"
#import "DOMCSSCharsetRuleInternal.h"
#import "DOMNotationInternal.h"
#import "DOMOverflowEventInternal.h"
#import "DOMProcessingInstructionInternal.h"
+#import "DOMRangeInternal.h"
#import "DOMRectInternal.h"
#import "DOMStyleSheetListInternal.h"
#import "DOMTextInternal.h"
namespace WebCore {
class CSSRule;
class CSSValue;
- class DOMWindow;
class Event;
class Node;
class NodeFilter;
class NodeIterator;
- class Range;
class StyleSheet;
class TreeWalker;
#endif // XPATH_SUPPORT
typedef int ExceptionCode;
- typedef DOMWindow AbstractView;
}
// Core Internal Interfaces
- (WebCore::Event *)_event;
@end
-// Range Internal Interfaces
-
-@interface DOMRange (WebCoreInternal)
-+ (DOMRange *)_rangeWith:(WebCore::Range *)impl;
-- (WebCore::Range *)_range;
-@end
-
// Traversal Internal Interfaces
@interface DOMNodeIterator (WebCoreInternal)
+ (DOMNodeFilter *)_nodeFilterWith:(WebCore::NodeFilter *)impl;
@end
-// Views Internal Interfaces
-
-@interface DOMAbstractView (WebCoreInternal)
-+ (DOMAbstractView *)_abstractViewWith:(WebCore::AbstractView *)impl;
-- (WebCore::AbstractView *)_abstractView;
-@end
-
#ifdef SVG_SUPPORT
// SVG Internal Interfaces
#import <WebCore/DOMNodeIteratorPrivate.h>
#import <WebCore/DOMNodePrivate.h>
#import <WebCore/DOMProcessingInstructionPrivate.h>
+#import <WebCore/DOMRangePrivate.h>
#import <WebCore/DOMUIEventPrivate.h>
#import <WebCore/DOMWheelEventPrivate.h>
return [DOMCSSPrimitiveValue _CSSPrimitiveValueWith:new WebCore::CSSPrimitiveValue(value, WebCore::CSSPrimitiveValue::CSS_NUMBER)];
}
-@end
-
-@implementation DOMRGBColor (DOMRGBColorExtensions)
-
- (DOMCSSPrimitiveValue *)alpha
{
WebCore::RGBA32 rgb = reinterpret_cast<uintptr_t>(_internal);
+++ /dev/null
-/*
- * Copyright (C) 2004 Apple Computer, Inc. All rights reserved.
- * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <WebCore/DOMCore.h>
-#import <WebCore/DOMDocument.h>
-#import <WebCore/DOMObject.h>
-#import <WebCore/DOMRangeException.h>
-
-// DOM Range comparison codes
-enum {
- DOM_START_TO_START = 0,
- DOM_START_TO_END = 1,
- DOM_END_TO_END = 2,
- DOM_END_TO_START = 3
-};
-
-@interface DOMRange : DOMObject
-#ifndef BUILDING_ON_TIGER
-@property(readonly) DOMNode *startContainer;
-@property(readonly) int startOffset;
-@property(readonly) DOMNode *endContainer;
-@property(readonly) int endOffset;
-@property(readonly) BOOL collapsed;
-@property(readonly) DOMNode *commonAncestorContainer;
-#else
-- (DOMNode *)startContainer;
-- (int)startOffset;
-- (DOMNode *)endContainer;
-- (int)endOffset;
-- (BOOL)collapsed;
-- (DOMNode *)commonAncestorContainer;
-#endif
-- (void)setStart:(DOMNode *)refNode offset:(int)offset;
-- (void)setEnd:(DOMNode *)refNode offset:(int)offset;
-- (void)setStartBefore:(DOMNode *)refNode;
-- (void)setStartAfter:(DOMNode *)refNode;
-- (void)setEndBefore:(DOMNode *)refNode;
-- (void)setEndAfter:(DOMNode *)refNode;
-- (void)collapse:(BOOL)toStart;
-- (void)selectNode:(DOMNode *)refNode;
-- (void)selectNodeContents:(DOMNode *)refNode;
-- (short)compareBoundaryPoints:(unsigned short)how sourceRange:(DOMRange *)sourceRange;
-- (void)deleteContents;
-- (DOMDocumentFragment *)extractContents;
-- (DOMDocumentFragment *)cloneContents;
-- (void)insertNode:(DOMNode *)newNode;
-- (void)surroundContents:(DOMNode *)newParent;
-- (DOMRange *)cloneRange;
-- (NSString *)toString;
-- (void)detach;
-@end
-
-@interface DOMRange (DOMRangeDeprecated)
-#ifndef BUILDING_ON_TIGER
-- (void)setStart:(DOMNode *)refNode :(int)offset DEPRECATED_IN_MAC_OS_X_VERSION_10_5_AND_LATER;
-- (void)setEnd:(DOMNode *)refNode :(int)offset DEPRECATED_IN_MAC_OS_X_VERSION_10_5_AND_LATER;
-- (short)compareBoundaryPoints:(unsigned short)how :(DOMRange *)sourceRange DEPRECATED_IN_MAC_OS_X_VERSION_10_5_AND_LATER;
-#else
-- (void)setStart:(DOMNode *)refNode :(int)offset;
-- (void)setEnd:(DOMNode *)refNode :(int)offset;
-- (short)compareBoundaryPoints:(unsigned short)how :(DOMRange *)sourceRange;
-#endif
-@end
/*
- * Copyright (C) 2004-2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2004, 2006 Apple Computer, Inc. All rights reserved.
* Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebCore/DOMObject.h>
-
-@class NSColor;
-@class DOMCSSPrimitiveValue;
-
-@interface DOMRGBColor : DOMObject
-#ifndef BUILDING_ON_TIGER
-@property(readonly) DOMCSSPrimitiveValue *red;
-@property(readonly) DOMCSSPrimitiveValue *green;
-@property(readonly) DOMCSSPrimitiveValue *blue;
-#else
-- (DOMCSSPrimitiveValue *)red;
-- (DOMCSSPrimitiveValue *)green;
-- (DOMCSSPrimitiveValue *)blue;
-#endif
-@end
-
-@interface DOMRGBColor (DOMRGBColorExtensions)
-#ifndef BUILDING_ON_TIGER
-@property(readonly) DOMCSSPrimitiveValue *alpha;
-@property(readonly) NSColor *color;
-#else
-- (DOMCSSPrimitiveValue *)alpha;
-- (NSColor *)color;
-#endif
-@end
+#import <WebCore/DOMRange.h>
+#import <WebCore/DOMRangeException.h>
- (void)initMouseEvent:(NSString *)type :(BOOL)canBubble :(BOOL)cancelable :(DOMAbstractView *)view :(int)detail :(int)screenX :(int)screenY :(int)clientX :(int)clientY :(BOOL)ctrlKey :(BOOL)altKey :(BOOL)shiftKey :(BOOL)metaKey :(unsigned short)button :(id <DOMEventTarget>)relatedTarget;
@end
+@interface DOMRange : DOMObject
+@property(readonly) DOMNode *startContainer;
+@property(readonly) int startOffset;
+@property(readonly) DOMNode *endContainer;
+@property(readonly) int endOffset;
+@property(readonly) BOOL collapsed;
+@property(readonly) DOMNode *commonAncestorContainer;
+- (void)setStart:(DOMNode *)refNode offset:(int)offset;
+- (void)setStart:(DOMNode *)refNode :(int)offset;
+- (void)setEnd:(DOMNode *)refNode offset:(int)offset;
+- (void)setEnd:(DOMNode *)refNode :(int)offset;
+- (void)setStartBefore:(DOMNode *)refNode;
+- (void)setStartAfter:(DOMNode *)refNode;
+- (void)setEndBefore:(DOMNode *)refNode;
+- (void)setEndAfter:(DOMNode *)refNode;
+- (void)collapse:(BOOL)toStart;
+- (void)selectNode:(DOMNode *)refNode;
+- (void)selectNodeContents:(DOMNode *)refNode;
+- (short)compareBoundaryPoints:(unsigned short)how sourceRange:(DOMRange *)sourceRange;
+- (short)compareBoundaryPoints:(unsigned short)how :(DOMRange *)sourceRange;
+- (void)deleteContents;
+- (DOMDocumentFragment *)extractContents;
+- (DOMDocumentFragment *)cloneContents;
+- (void)insertNode:(DOMNode *)newNode;
+- (void)surroundContents:(DOMNode *)newParent;
+- (DOMRange *)cloneRange;
+- (NSString *)toString;
+- (void)detach;
+@end
+
@interface DOMNodeIterator : DOMObject
@property(readonly) DOMNode *root;
@property(readonly) unsigned whatToShow;
return "unsigned" if $name eq "unsigned long";
return "int" if $name eq "long";
return "NSURL" if $name eq "URL";
+ return "NSColor" if $name eq "Color";
return "DOMAbstractView" if $name eq "DOMWindow";
return $name if $codeGenerator->IsPrimitiveType($name) or $name eq "DOMImplementation" or $name eq "DOMTimeStamp";
# special cases
return "DOMImplementationFront" if $name eq "DOMImplementation";
return "RectImpl" if $name eq "Rect";
+ return "DOMWindow" if $name eq "AbstractView";
return $name;
}
return "id <$name>" if IsProtocolType($type);
return $name if $codeGenerator->IsPrimitiveType($type) or $type eq "DOMTimeStamp";
+ return "unsigned short" if $type eq "CompareHow";
return "$name *";
}
return $argName if $codeGenerator->IsPrimitiveType($type) or IsStringType($type) or $type eq "URL";
return $argName . "EventTarget" if $type eq "EventTarget";
return "[nativeResolver $typeGetterMethodName]" if $type eq "XPathNSResolver";
-
+ return "static_cast<WebCore::Range::CompareHow>($argName)" if $type eq "CompareHow";
return "[$argName $typeGetterMethodName]";
}
my $type = $codeGenerator->StripModule(shift);
my $public = shift;
- return if $codeGenerator->IsPrimitiveType($type) or IsStringType($type) or $type eq "URL" or $type eq "DOMTimeStamp";
+ return if $codeGenerator->IsPrimitiveType($type) or IsStringType($type) or $type eq "URL" or $type eq "DOMTimeStamp" or $type eq "CompareHow";
if (IsProtocolType($type)) {
$type = "DOM" . $type;
$type = "DOMImplementation";
} elsif ($type eq "DOMWindow") {
$type = "DOMAbstractView";
+ } elsif ($type eq "Color") {
+ $type = "NSColor";
} else {
$type = "DOM" . $type;
}
{
my $type = $codeGenerator->StripModule(shift);
- return if $codeGenerator->IsPrimitiveType($type) or $type eq "URL" or $type eq "DOMTimeStamp";
+ return if $codeGenerator->IsPrimitiveType($type) or $type eq "URL" or $type eq "Color" or $type eq "DOMTimeStamp" or $type eq "CompareHow";
if (IsStringType($type)) {
$implIncludes{"PlatformString.h"} = 1;
# Temp DOMCSS.h
if ($type eq "Rect") {
- $implIncludes{"DOMRect.h"} = 1;
$implIncludes{"RectImpl.h"} = 1;
+ $implIncludes{"DOM$type.h"} = 1;
return;
}
if ($type eq "RGBColor") {
- $implIncludes{"DOMRGBColor.h"} = 1;
$implIncludes{"Color.h"} = 1;
+ $implIncludes{"DOM$type.h"} = 1;
return;
}
}
if ($type eq "SVGRect") {
- $implIncludes{"DOMSVGRect.h"} = 1;
$implIncludes{"FloatRect.h"} = 1;
+ $implIncludes{"DOM$type.h"} = 1;
return;
}
if ($type eq "SVGPoint") {
- $implIncludes{"DOMSVGPoint.h"} = 1;
$implIncludes{"FloatPoint.h"} = 1;
+ $implIncludes{"DOM$type.h"} = 1;
return;
}
if ($type eq "SVGNumber") {
- $implIncludes{"DOMSVGNumber.h"} = 1;
+ $implIncludes{"DOM$type.h"} = 1;
return;
}
my @protocolsToImplement = ();
($parentName, @protocolsToImplement) = GetParentAndProtocols($dataNode);
- my $conditional = $dataNode->extendedAttributes->{"Conditional"};
-
my $numConstants = @{$dataNode->constants};
my $numAttributes = @{$dataNode->attributes};
my $numFunctions = @{$dataNode->functions};
$parentProtocol = GetClassHeaderName($parentProtocol);
push(@headerContentHeader, "#import <WebCore/$parentProtocol.h>\n");
}
+
+ # Special case needed for legacy support of DOMRange
+ if ($interfaceName eq "Range") {
+ push(@headerContentHeader, "#import <WebCore/DOMCore.h>\n");
+ push(@headerContentHeader, "#import <WebCore/DOMDocument.h>\n");
+ push(@headerContentHeader, "#import <WebCore/DOMRangeException.h>\n");
+ }
+
push(@headerContentHeader, "\n");
# - Add constants.
module css {
// Introduced in DOM Level 2:
- interface RGBColor {
+ interface [ObjCCustomImplementation] RGBColor {
readonly attribute CSSPrimitiveValue red;
readonly attribute CSSPrimitiveValue green;
readonly attribute CSSPrimitiveValue blue;
+
+ // WebKit extensions
+#if !defined(LANGUAGE_JAVASCRIPT)
+ readonly attribute CSSPrimitiveValue alpha;
+#endif
+#if defined(LANGUAGE_OBJECTIVE_C)
+ readonly attribute Color color;
+#endif
};
}
interface [GenerateConstructor] Range {
readonly attribute Node startContainer
- getter raises (DOMException);
+ getter raises(DOMException);
readonly attribute long startOffset
- getter raises (DOMException);
+ getter raises(DOMException);
readonly attribute Node endContainer
- getter raises (DOMException);
+ getter raises(DOMException);
readonly attribute long endOffset
- getter raises (DOMException);
+ getter raises(DOMException);
readonly attribute boolean collapsed
- getter raises (DOMException);
+ getter raises(DOMException);
readonly attribute Node commonAncestorContainer
- getter raises (DOMException);
+ getter raises(DOMException);
[OldStyleObjC] void setStart(in Node refNode,
in long offset)
- raises(RangeException, dom::DOMException);
+ raises(RangeException, DOMException);
[OldStyleObjC] void setEnd(in Node refNode,
in long offset)
- raises(RangeException, dom::DOMException);
+ raises(RangeException, DOMException);
void setStartBefore(in Node refNode)
- raises(RangeException, dom::DOMException);
+ raises(RangeException, DOMException);
void setStartAfter(in Node refNode)
- raises(RangeException, dom::DOMException);
+ raises(RangeException, DOMException);
void setEndBefore(in Node refNode)
- raises(RangeException, dom::DOMException);
+ raises(RangeException, DOMException);
void setEndAfter(in Node refNode)
- raises(RangeException, dom::DOMException);
+ raises(RangeException, DOMException);
void collapse(in boolean toStart)
raises(DOMException);
void selectNode(in Node refNode)
- raises(RangeException, dom::DOMException);
+ raises(RangeException, DOMException);
void selectNodeContents(in Node refNode)
- raises(RangeException, dom::DOMException);
+ raises(RangeException, DOMException);
// CompareHow
const unsigned short START_TO_START = 0;
[OldStyleObjC] short compareBoundaryPoints(in CompareHow how,
in Range sourceRange)
- raises(dom::DOMException);
+ raises(DOMException);
void deleteContents()
- raises(dom::DOMException);
+ raises(DOMException);
DocumentFragment extractContents()
- raises(dom::DOMException);
+ raises(DOMException);
DocumentFragment cloneContents()
- raises(dom::DOMException);
+ raises(DOMException);
void insertNode(in Node newNode)
- raises(dom::DOMException, RangeException);
+ raises(DOMException, RangeException);
void surroundContents(in Node newParent)
- raises(dom::DOMException, RangeException);
+ raises(DOMException, RangeException);
Range cloneRange()
- raises(dom::DOMException);
+ raises(DOMException);
DOMString toString()
- raises(dom::DOMException);
+ raises(DOMException);
void detach()
- raises(dom::DOMException);
+ raises(DOMException);
// extensions
DocumentFragment createContextualFragment(in DOMString html)
- raises(dom::DOMException);
-
+ raises(DOMException);
+
// WebKit extensions
boolean intersectsNode(in Node refNode)
- raises(RangeException, dom::DOMException);
+ raises(RangeException, DOMException);
short compareNode(in Node refNode)
- raises(RangeException, dom::DOMException);
+ raises(RangeException, DOMException);
// CompareResults
- const unsigned short NODE_BEFORE = 0;
- const unsigned short NODE_AFTER = 1;
+ const unsigned short NODE_BEFORE = 0;
+ const unsigned short NODE_AFTER = 1;
const unsigned short NODE_BEFORE_AND_AFTER = 2;
- const unsigned short NODE_INSIDE = 3;
+ const unsigned short NODE_INSIDE = 3;
short comparePoint(in Node refNode,
in long offset)
- raises(RangeException, dom::DOMException);
+ raises(RangeException, DOMException);
boolean isPointInRange(in Node refNode,
in long offset)
- raises(RangeException, dom::DOMException);
+ raises(RangeException, DOMException);
};
}
/*
- * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
* Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebCore/DOMObject.h>
+module views {
-@class DOMDocument;
+ // Introduced in DOM Level 2:
+ interface AbstractView {
+ readonly attribute Document document;
+ };
-@interface DOMAbstractView : DOMObject
-#ifndef BUILDING_ON_TIGER
-@property(readonly) DOMDocument *document;
-#else
-- (DOMDocument *)document;
-#endif
-@end
+}
+2006-10-07 Sam Weinig <sam.weinig@gmail.com>
+
+ Reviewed by Tim H.
+
+ Patch for http://bugs.webkit.org/show_bug.cgi?id=11198
+ Auto-generate a few more Objective-C DOM interfaces
+
+ * MigrateHeaders.make:
+
2006-10-07 Mark Rowe <bdash@webkit.org>
Reviewed by Mitz.
$(PRIVATE_HEADERS_DIR)/DOMProcessingInstructionPrivate.h \
$(PUBLIC_HEADERS_DIR)/DOMRGBColor.h \
$(PUBLIC_HEADERS_DIR)/DOMRange.h \
+ $(PRIVATE_HEADERS_DIR)/DOMRangePrivate.h \
$(PUBLIC_HEADERS_DIR)/DOMRangeException.h \
+ $(PUBLIC_HEADERS_DIR)/DOMRanges.h \
$(PUBLIC_HEADERS_DIR)/DOMRect.h \
$(PUBLIC_HEADERS_DIR)/DOMStyleSheet.h \
$(PUBLIC_HEADERS_DIR)/DOMStyleSheetList.h \
git://git.webkit.org / WebKit-https.git / commitdiff