Changeset 20130 in webkit

Timestamp:

Mar 12, 2007 5:49:02 PM (17 years ago)

Author:

darin

Message:

LayoutTests:

Reviewed by Tim Hatcher.

• added a test that checks the classes of wrappers created by both the JavaScript binding and the Objective-C binding

• fast/dom/wrapper-classes-expected.txt: Added.
• fast/dom/wrapper-classes.html: Added.
• fast/js/resources/js-test-pre.js: Improve the format of the failure message when both the real results and expected results are strings.

WebCore:

Reviewed by Tim Hatcher.

• fixed JavaScript wrapper classes to be correct for a variety of cases that a new test uncovered: was broken for at least 5 classes

• fixed Objective-C wrapper classes to be correct for a variety of cases that a test case uncovered: was broken for ast least 50 classes

• added missing DOM API for creating OverflowEvent and WheelEvent instances

Test: fast/dom/wrapper-classes.html

• DerivedSources.make: Added missing bindings: HTMLCanvasElement for ObjC, CDATASection, Comment, and EntityReference for JavaScript.
• WebCore.xcodeproj/project.pbxproj: Added those new generated files.

• bindings/js/JSHTMLElementWrapperFactory.cpp: (WebCore::createJSHTMLWrapper): Corrected the wrapper classes for <keygen>, which needs an HTMLSelectElement wrapper, and <xmp>, which needs an HTMLPreElement wrapper.

• bindings/objc/DOMInternal.h: Updated for new naming scheme. Also moved createDOMWrapper from the KJS namespace to the WebCore namespace.
• bindings/objc/DOMUtility.mm: (KJS::createDOMWrapper): Broke the core function into a separate one, and left it in the KJS namespace because Objective-C++ rules make it impossible for it to work in the WebCore namespace. Used a macro-based implementation to cut down on repeated code, and added missing cases for Counter, HTMLOptionsCollection, Range, XPathExpression, XPathResult, Event, RGBColor, Rect, Window, DOMImplementation, NodeIterator, TreeWalker, and HTMLCollection. (WebCore::createDOMWrapper): The other half of the function.

• bindings/objc/DOM.mm: (WebCore::createElementClassMap): Corrected the wrapper classes for <canvas>, which needs a DOMHTMLCanvasElement wrapper, <del>, which needs a DOMHTMLModElement wrapper, <embed>, which needs a DOMHTMLEmbedElement wrapper, <ins>, which needs a DOMHTMLModElement wrapper, <th>, which needs a DOMHTMLTableCellElement wrapper, and <xmp>, which needs an DOMHTMLPreElement wrapper. (+[DOMNode _wrapNode:]): Updated for new naming scheme. (+[DOMNode _wrapEventTarget:]): Ditto. (+[DOMNodeFilter _wrapNodeFilter:]): Ditto. (ObjCNodeFilterCondition::acceptNode): Ditto. (-[DOMDocument createNodeIterator:whatToShow:filter:expandEntityReferences:]): Ditto. (-[DOMDocument createTreeWalker:whatToShow:filter:expandEntityReferences:]): Ditto. (WebCore::ObjCEventListener::handleEvent): Ditto.

• dom/Document.cpp: (WebCore::Document::createEvent): Added cases for OverflowEvent and WheelEvent.

• dom/OverflowEvent.h: Added empty constructor and initOverflowEvent.
• dom/OverflowEvent.cpp: (WebCore::OverflowEvent::OverflowEvent): Added. (WebCore::OverflowEvent::initOverflowEvent): Added.
• dom/OverflowEvent.idl: Added initOverflowEvent.

• bindings/objc/PublicDOMInterfaces.h: Added initOverflowEvent.

• bindings/objc/DOMCSS.mm: (+[DOMStyleSheet _wrapStyleSheet:]): Updated for new naming scheme. (+[DOMCSSRule _wrapCSSRule:]): Corrected wrapper for CSSUnknownRule. (+[DOMCSSValue _wrapCSSValue:]): Updated for new naming scheme.

• bindings/js/kjs_css.h: (KJS::DOMRGBColor::impl): Added. Used when making an ObjC wrapper. (KJS::DOMRect::impl): Ditto.

• bindings/js/kjs_dom.cpp: (KJS::toJS): Corrected the wrapper classes for CDATASection, Comment, and EntityReference.

• bindings/js/kjs_html.cpp: Corrected the class name for HTMLElement (was "DOMHTMLElement") and HTMLCollection (was "Collection").

• bindings/objc/DOMImplementationFront.h:
• bindings/objc/DOMImplementationFront.cpp: (WebCore::implementationFront): Added new overload that returns a front given a JavaScript wrapper. Needed by the code that makes the Objective-C wrapper.

• bindings/objc/WebScriptObject.mm: (+[WebScriptObject _convertValueToObjcValue:originRootObject:rootObject:]): Updated since createDOMWrapper is now in the WebCore namespace.

• bindings/scripts/CodeGeneratorObjC.pm: Update the naming scheme for the wrapper creation functions to use _wrapElement: rather then _elementWith: style. Removed now-unneeded special cases for things that needed to stay upper-case, since we don't have to do the whole lcfirst thing.

• html/HTMLCanvasElement.idl: Added #if so we can successfully generate the Objective-C wrapper for this class, even though we can't yet handle the DOMObject return type.

• html/HTMLOptionsCollection.idl: Added GenerateNativeConverter so we get an appropriate toJS function.

• bindings/objc/DOMEvents.mm: (+[DOMEvent _wrapEvent:]):
• bindings/objc/DOMHTML.mm: (-[DOMHTMLDocument createDocumentFragmentWithMarkupString:baseURL:]): (-[DOMHTMLDocument createDocumentFragmentWithText:]):
• bindings/objc/DOMObject.mm: (-[DOMObject sheet]):
• bindings/objc/DOMRGBColor.mm: (-[DOMRGBColor red]): (-[DOMRGBColor green]): (-[DOMRGBColor blue]): (-[DOMRGBColor alpha]): (+[DOMRGBColor _wrapRGBColor:]):
• bindings/objc/DOMSVGPathSegInternal.mm: (+[DOMSVGPathSeg _wrapSVGPathSeg:]):
• bindings/objc/DOMXPath.mm: (+[DOMNativeXPathNSResolver _wrapXPathNSResolver:]):
• page/mac/WebCoreFrameBridge.mm: (-[WebCoreFrameBridge nodesFromList:]): (-[WebCoreFrameBridge elementWithName:inForm:]): (-[WebCoreFrameBridge formForElement:]): (-[WebCoreFrameBridge currentForm]): (-[WebCoreFrameBridge controlsInForm:]): (-[WebCoreFrameBridge rangeByAlteringCurrentSelection:SelectionController::direction:SelectionController::granularity:]): (-[WebCoreFrameBridge convertNSRangeToDOMRange:]): (-[WebCoreFrameBridge markDOMRange]): (-[WebCoreFrameBridge markedTextDOMRange]): (-[WebCoreFrameBridge smartDeleteRangeForProposedRange:]): (-[WebCoreFrameBridge documentFragmentWithMarkupString:baseURLString:]): (-[WebCoreFrameBridge documentFragmentWithText:inContext:]): (-[WebCoreFrameBridge documentFragmentWithNodesAsParagraphs:]): (-[WebCoreFrameBridge replaceSelectionWithNode:selectReplacement:smartReplace:matchStyle:]): (-[WebCoreFrameBridge replaceSelectionWithText:selectReplacement:smartReplace:]): (-[WebCoreFrameBridge increaseSelectionListLevel]): (-[WebCoreFrameBridge increaseSelectionListLevelOrdered]): (-[WebCoreFrameBridge increaseSelectionListLevelUnordered]): (-[WebCoreFrameBridge dragCaretDOMRange]): (-[WebCoreFrameBridge editableDOMRangeForPoint:]): (-[WebCoreFrameBridge characterRangeAtPoint:]): (-[WebCoreFrameBridge typingStyle]): (-[WebCoreFrameBridge rangeOfCharactersAroundCaret]):
• platform/mac/ClipboardMac.mm: (WebCore::ClipboardMac::declareAndWriteDragImage):
• platform/mac/PasteboardMac.mm: (WebCore::Pasteboard::writeSelection): Updated for new naming scheme.

WebKit:

Reviewed by Tim Hatcher.

• update for the new naming scheme for the Objective-C wrapper-creation functions: _wrapElement: instead of _elementWith:, etc.

• WebCoreSupport/WebEditorClient.mm: (WebEditorClient::textFieldDidBeginEditing): (WebEditorClient::textFieldDidEndEditing): (WebEditorClient::textDidChangeInTextField): (WebEditorClient::doTextFieldCommandFromEvent): (WebEditorClient::textWillBeDeletedInTextField): (WebEditorClient::textDidChangeInTextArea):
• WebCoreSupport/WebFrameLoaderClient.mm: (WebFrameLoaderClient::createPlugin): (WebFrameLoaderClient::createJavaAppletWidget):
• WebView/WebFrame.mm: (kit): Use the _wrapElement-style functions.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/wrapper-classes-expected.txt (added)
• LayoutTests/fast/dom/wrapper-classes.html (added)
• WebCore/CMakeLists.txt (modified) (1 diff)
• WebCore/ChangeLog (modified) (3 diffs)
• WebCore/DerivedSources.make (modified) (5 diffs)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (11 diffs)
• WebCore/WebCoreSources.bkl (modified) (3 diffs)
• WebCore/bindings/js/JSHTMLElementWrapperFactory.cpp (modified) (1 diff)
• WebCore/bindings/js/kjs_css.h (modified) (2 diffs)
• WebCore/bindings/js/kjs_dom.cpp (modified) (8 diffs)
• WebCore/bindings/js/kjs_html.cpp (modified) (3 diffs)
• WebCore/bindings/objc/DOM.mm (modified) (13 diffs)
• WebCore/bindings/objc/DOMCSS.mm (modified) (4 diffs)
• WebCore/bindings/objc/DOMEvents.mm (modified) (1 diff)
• WebCore/bindings/objc/DOMHTML.mm (modified) (2 diffs)
• WebCore/bindings/objc/DOMImplementationFront.cpp (modified) (2 diffs)
• WebCore/bindings/objc/DOMImplementationFront.h (modified) (2 diffs)
• WebCore/bindings/objc/DOMInternal.h (modified) (3 diffs)
• WebCore/bindings/objc/DOMObject.mm (modified) (1 diff)
• WebCore/bindings/objc/DOMRGBColor.mm (modified) (5 diffs)
• WebCore/bindings/objc/DOMSVGPathSegInternal.mm (modified) (1 diff)
• WebCore/bindings/objc/DOMUtility.mm (modified) (2 diffs)
• WebCore/bindings/objc/DOMXPath.mm (modified) (1 diff)
• WebCore/bindings/objc/PublicDOMInterfaces.h (modified) (2 diffs)
• WebCore/bindings/objc/WebScriptObject.mm (modified) (2 diffs)
• WebCore/bindings/scripts/CodeGeneratorObjC.pm (modified) (8 diffs)
• WebCore/dom/Document.cpp (modified) (3 diffs)
• WebCore/dom/OverflowEvent.cpp (modified) (5 diffs)
• WebCore/dom/OverflowEvent.h (modified) (2 diffs)
• WebCore/dom/OverflowEvent.idl (modified) (2 diffs)
• WebCore/html/HTMLCanvasElement.idl (modified) (1 diff)
• WebCore/html/HTMLOptionsCollection.idl (modified) (1 diff)
• WebCore/page/mac/WebCoreFrameBridge.mm (modified) (23 diffs)
• WebCore/platform/mac/ClipboardMac.mm (modified) (1 diff)
• WebCore/platform/mac/PasteboardMac.mm (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebCoreSupport/WebEditorClient.mm (modified) (6 diffs)
• WebKit/WebCoreSupport/WebFrameLoaderClient.mm (modified) (2 diffs)
• WebKit/WebKit.xcodeproj/project.pbxproj (modified) (1 diff)
• WebKit/WebView/WebFrame.mm (modified) (6 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-03-12  Darin Adler  <darin@apple.com>
+
+        Reviewed by Tim Hatcher.
+
+        - added a test that checks the classes of wrappers created by both
+          the JavaScript binding and the Objective-C binding
+
+        * fast/dom/wrapper-classes-expected.txt: Added.
+        * fast/dom/wrapper-classes.html: Added.
+        * fast/js/resources/js-test-pre.js: Improve the format of the failure message when
+        both the real results and expected results are strings.
+
 2007-03-12  Antti Koivisto  <antti@apple.com>
 

trunk/WebCore/CMakeLists.txt

@@ -232 +232 @@
 
     dom/Attr.idl
+    dom/CDATASection.idl
     dom/CharacterData.idl
+    dom/Comment.idl
+    dom/DOMImplementation.idl
+    dom/Document.idl
     dom/DocumentFragment.idl
-    dom/Document.idl
     dom/DocumentType.idl
-    dom/DOMImplementation.idl
     dom/Element.idl
     dom/Entity.idl
+    dom/EntityReference.idl
     dom/Event.idl
     dom/KeyboardEvent.idl
     dom/MouseEvent.idl
     dom/MutationEvent.idl
+    dom/Node.idl
     dom/NodeFilter.idl
-    dom/Node.idl
     dom/NodeIterator.idl
     dom/Notation.idl
     dom/OverflowEvent.idl
     dom/ProcessingInstruction.idl
+    dom/Range.idl
     dom/RangeException.idl
-    dom/Range.idl
     dom/Text.idl
     dom/TextEvent.idl

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-03-12  Darin Adler  <darin@apple.com>
+
+        Reviewed by Tim Hatcher.
+
+        - fixed JavaScript wrapper classes to be correct for a variety of cases
+          that a new test uncovered: was broken for at least 5 classes
+
+        - fixed Objective-C wrapper classes to be correct for a variety of cases
+          that a test case uncovered: was broken for ast least 50 classes
+
+        - added missing DOM API for creating OverflowEvent and WheelEvent instances
+
+        Test: fast/dom/wrapper-classes.html
+
+        * DerivedSources.make: Added missing bindings: HTMLCanvasElement for ObjC,
+        CDATASection, Comment, and EntityReference for JavaScript.
+        * WebCore.xcodeproj/project.pbxproj: Added those new generated files.
+
+        * bindings/js/JSHTMLElementWrapperFactory.cpp:
+        (WebCore::createJSHTMLWrapper): Corrected the wrapper classes for <keygen>,
+        which needs an HTMLSelectElement wrapper, and <xmp>, which needs an
+        HTMLPreElement wrapper.
+
+        * bindings/objc/DOMInternal.h: Updated for new naming scheme.
+        Also moved createDOMWrapper from the KJS namespace to the WebCore namespace.
+        * bindings/objc/DOMUtility.mm:
+        (KJS::createDOMWrapper): Broke the core function into a separate one, and
+        left it in the KJS namespace because Objective-C++ rules make it impossible
+        for it to work in the WebCore namespace. Used a macro-based implementation
+        to cut down on repeated code, and added missing cases for Counter,
+        HTMLOptionsCollection, Range, XPathExpression, XPathResult, Event, RGBColor,
+        Rect, Window, DOMImplementation, NodeIterator, TreeWalker, and HTMLCollection.
+        (WebCore::createDOMWrapper): The other half of the function.
+
+        * bindings/objc/DOM.mm:
+        (WebCore::createElementClassMap): Corrected the wrapper classes for
+        <canvas>, which needs a DOMHTMLCanvasElement wrapper, <del>, which needs
+        a DOMHTMLModElement wrapper, <embed>, which needs a DOMHTMLEmbedElement
+        wrapper, <ins>, which needs a DOMHTMLModElement wrapper, <th>, which needs
+        a DOMHTMLTableCellElement wrapper, and <xmp>, which needs an
+        DOMHTMLPreElement wrapper.
+        (+[DOMNode _wrapNode:]): Updated for new naming scheme.
+        (+[DOMNode _wrapEventTarget:]): Ditto.
+        (+[DOMNodeFilter _wrapNodeFilter:]): Ditto.
+        (ObjCNodeFilterCondition::acceptNode): Ditto.
+        (-[DOMDocument createNodeIterator:whatToShow:filter:expandEntityReferences:]): Ditto.
+        (-[DOMDocument createTreeWalker:whatToShow:filter:expandEntityReferences:]): Ditto.
+        (WebCore::ObjCEventListener::handleEvent): Ditto.
+
+        * dom/Document.cpp: (WebCore::Document::createEvent):
+        Added cases for OverflowEvent and WheelEvent.
+
+        * dom/OverflowEvent.h: Added empty constructor and initOverflowEvent.
+        * dom/OverflowEvent.cpp:
+        (WebCore::OverflowEvent::OverflowEvent): Added.
+        (WebCore::OverflowEvent::initOverflowEvent): Added.
+        * dom/OverflowEvent.idl: Added initOverflowEvent.
+
+        * bindings/objc/PublicDOMInterfaces.h: Added initOverflowEvent.
+
+        * bindings/objc/DOMCSS.mm:
+        (+[DOMStyleSheet _wrapStyleSheet:]): Updated for new naming scheme.
+        (+[DOMCSSRule _wrapCSSRule:]): Corrected wrapper for CSSUnknownRule.
+        (+[DOMCSSValue _wrapCSSValue:]): Updated for new naming scheme.
+
+        * bindings/js/kjs_css.h:
+        (KJS::DOMRGBColor::impl): Added. Used when making an ObjC wrapper.
+        (KJS::DOMRect::impl): Ditto.
+
+        * bindings/js/kjs_dom.cpp: (KJS::toJS): Corrected the wrapper classes for
+        CDATASection, Comment, and EntityReference.
+
+        * bindings/js/kjs_html.cpp: Corrected the class name for HTMLElement
+        (was "DOMHTMLElement") and HTMLCollection (was "Collection").
+
+        * bindings/objc/DOMImplementationFront.h:
+        * bindings/objc/DOMImplementationFront.cpp:
+        (WebCore::implementationFront): Added new overload that returns a front given
+        a JavaScript wrapper. Needed by the code that makes the Objective-C wrapper.
+
+        * bindings/objc/WebScriptObject.mm:
+        (+[WebScriptObject _convertValueToObjcValue:originRootObject:rootObject:]):
+        Updated since createDOMWrapper is now in the WebCore namespace.
+
+        * bindings/scripts/CodeGeneratorObjC.pm: Update the naming scheme for the
+        wrapper creation functions to use _wrapElement: rather then _elementWith:
+        style. Removed now-unneeded special cases for things that needed to stay
+        upper-case, since we don't have to do the whole lcfirst thing.
+
+        * html/HTMLCanvasElement.idl: Added #if so we can successfully generate the
+        Objective-C wrapper for this class, even though we can't yet handle the
+        DOMObject return type.
+
+        * html/HTMLOptionsCollection.idl: Added GenerateNativeConverter so we get
+        an appropriate toJS function.
+
+        * bindings/objc/DOMEvents.mm:
+        (+[DOMEvent _wrapEvent:]):
+        * bindings/objc/DOMHTML.mm:
+        (-[DOMHTMLDocument createDocumentFragmentWithMarkupString:baseURL:]):
+        (-[DOMHTMLDocument createDocumentFragmentWithText:]):
+        * bindings/objc/DOMObject.mm:
+        (-[DOMObject sheet]):
+        * bindings/objc/DOMRGBColor.mm:
+        (-[DOMRGBColor red]):
+        (-[DOMRGBColor green]):
+        (-[DOMRGBColor blue]):
+        (-[DOMRGBColor alpha]):
+        (+[DOMRGBColor _wrapRGBColor:]):
+        * bindings/objc/DOMSVGPathSegInternal.mm:
+        (+[DOMSVGPathSeg _wrapSVGPathSeg:]):
+        * bindings/objc/DOMXPath.mm:
+        (+[DOMNativeXPathNSResolver _wrapXPathNSResolver:]):
+        * page/mac/WebCoreFrameBridge.mm:
+        (-[WebCoreFrameBridge nodesFromList:]):
+        (-[WebCoreFrameBridge elementWithName:inForm:]):
+        (-[WebCoreFrameBridge formForElement:]):
+        (-[WebCoreFrameBridge currentForm]):
+        (-[WebCoreFrameBridge controlsInForm:]):
+        (-[WebCoreFrameBridge rangeByAlteringCurrentSelection:SelectionController::direction:SelectionController::granularity:]):
+        (-[WebCoreFrameBridge convertNSRangeToDOMRange:]):
+        (-[WebCoreFrameBridge markDOMRange]):
+        (-[WebCoreFrameBridge markedTextDOMRange]):
+        (-[WebCoreFrameBridge smartDeleteRangeForProposedRange:]):
+        (-[WebCoreFrameBridge documentFragmentWithMarkupString:baseURLString:]):
+        (-[WebCoreFrameBridge documentFragmentWithText:inContext:]):
+        (-[WebCoreFrameBridge documentFragmentWithNodesAsParagraphs:]):
+        (-[WebCoreFrameBridge replaceSelectionWithNode:selectReplacement:smartReplace:matchStyle:]):
+        (-[WebCoreFrameBridge replaceSelectionWithText:selectReplacement:smartReplace:]):
+        (-[WebCoreFrameBridge increaseSelectionListLevel]):
+        (-[WebCoreFrameBridge increaseSelectionListLevelOrdered]):
+        (-[WebCoreFrameBridge increaseSelectionListLevelUnordered]):
+        (-[WebCoreFrameBridge dragCaretDOMRange]):
+        (-[WebCoreFrameBridge editableDOMRangeForPoint:]):
+        (-[WebCoreFrameBridge characterRangeAtPoint:]):
+        (-[WebCoreFrameBridge typingStyle]):
+        (-[WebCoreFrameBridge rangeOfCharactersAroundCaret]):
+        * platform/mac/ClipboardMac.mm:
+        (WebCore::ClipboardMac::declareAndWriteDragImage):
+        * platform/mac/PasteboardMac.mm:
+        (WebCore::Pasteboard::writeSelection):
+        Updated for new naming scheme.
+
 2007-03-12  Timothy Hatcher  <timothy@apple.com>
 
@@ -2701 +2844 @@
         * bindings/objc/DOM.mm:
         (WebCore::createElementClassMap):
-        (+[DOMNode _nodeWith:WebCore::]):
+        (+[DOMNode _nodeWith:]):
         * bindings/objc/DOMCSS.mm:
-        (+[DOMCSSValue _CSSValueWith:WebCore::]):
+        (+[DOMCSSValue _CSSValueWith:]):
         * bindings/objc/DOMCustomXPathNSResolver.h:
         * bindings/objc/DOMCustomXPathNSResolver.mm:
         * bindings/objc/DOMEvents.mm:
-        (+[DOMEvent _eventWith:WebCore::]):
+        (+[DOMEvent _eventWith:]):
         * bindings/objc/DOMInternal.h:
         * bindings/objc/DOMSVGPathSegInternal.mm:
@@ -18854 +18997 @@
         (-[SharedBufferData dealloc]):
         (-[SharedBufferData finalize]):
-        (-[SharedBufferData initWithSharedBuffer:WebCore::]):
+        (-[SharedBufferData initWithSharedBuffer:]):
         (-[SharedBufferData length]):
         (-[SharedBufferData bytes]):

trunk/WebCore/DerivedSources.make

@@ -1 @@
-# Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
+# Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
 # Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com> 
 #
@@ -81 +81 @@
     DOMHTMLBodyElement.h \
     DOMHTMLButtonElement.h \
+    DOMHTMLCanvasElement.h \
     DOMHTMLCollection.h \
     DOMHTMLDListElement.h \
@@ -298 +299 @@
     HTMLEntityNames.c \
     JSAttr.h \
+    JSCDATASection.h \
     JSCSSPrimitiveValue.h \
     JSCSSRule.h \
@@ -307 +309 @@
     JSCanvasRenderingContext2D.h \
     JSCharacterData.h \
+    JSComment.h \
     JSCounter.h \
     JSCSSStyleDeclaration.h \
@@ -318 +321 @@
     JSEvent.h \
     JSEntity.h \
+    JSEntityReference.h \
     JSHTMLAppletElement.h \
     JSHTMLAnchorElement.h \

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -1648 +1648 @@
                 93F19B1708245E59001E9ABC /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 93F1D31A0558CC5C00821BC0 /* libicucore.dylib */; };
                 93F19B1808245E59001E9ABC /* libxslt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 840633070731A77200DB1FD1 /* libxslt.dylib */; };
+                93F9B6560BA0F35E00854064 /* DOMHTMLCanvasElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 93F9B6530BA0F35E00854064 /* DOMHTMLCanvasElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                93F9B6570BA0F35E00854064 /* DOMHTMLCanvasElement.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93F9B6540BA0F35E00854064 /* DOMHTMLCanvasElement.mm */; };
+                93F9B6580BA0F35E00854064 /* DOMHTMLCanvasElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 93F9B6550BA0F35E00854064 /* DOMHTMLCanvasElementInternal.h */; };
+                93F9B6E00BA0FB7200854064 /* JSComment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93F9B6DE0BA0FB7200854064 /* JSComment.cpp */; };
+                93F9B6E10BA0FB7200854064 /* JSComment.h in Headers */ = {isa = PBXBuildFile; fileRef = 93F9B6DF0BA0FB7200854064 /* JSComment.h */; };
+                93F9B7740BA5FDDC00854064 /* JSEntityReference.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93F9B7720BA5FDDC00854064 /* JSEntityReference.cpp */; };
+                93F9B7750BA5FDDD00854064 /* JSEntityReference.h in Headers */ = {isa = PBXBuildFile; fileRef = 93F9B7730BA5FDDC00854064 /* JSEntityReference.h */; };
+                93F9B7A00BA6032600854064 /* JSCDATASection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93F9B79E0BA6032600854064 /* JSCDATASection.cpp */; };
+                93F9B7A10BA6032600854064 /* JSCDATASection.h in Headers */ = {isa = PBXBuildFile; fileRef = 93F9B79F0BA6032600854064 /* JSCDATASection.h */; };
                 93FDAFCA0B11307400E2746F /* EditorInsertAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 93FDAFC90B11307400E2746F /* EditorInsertAction.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 A70023FD0B02BEAB00170215 /* MimeTypeRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A70023FB0B02BEAB00170215 /* MimeTypeRegistry.cpp */; };
@@ -4677 +4686 @@
                 93F8B3070A300FEA00F61AB8 /* generate-bindings.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; name = "generate-bindings.pl"; path = "scripts/generate-bindings.pl"; sourceTree = "<group>"; };
                 93F8B3080A300FEA00F61AB8 /* IDLStructure.pm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; name = IDLStructure.pm; path = scripts/IDLStructure.pm; sourceTree = "<group>"; };
+                93F9B6530BA0F35E00854064 /* DOMHTMLCanvasElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMHTMLCanvasElement.h; sourceTree = "<group>"; };
+                93F9B6540BA0F35E00854064 /* DOMHTMLCanvasElement.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMHTMLCanvasElement.mm; sourceTree = "<group>"; };
+                93F9B6550BA0F35E00854064 /* DOMHTMLCanvasElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMHTMLCanvasElementInternal.h; sourceTree = "<group>"; };
+                93F9B6DE0BA0FB7200854064 /* JSComment.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSComment.cpp; sourceTree = "<group>"; };
+                93F9B6DF0BA0FB7200854064 /* JSComment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSComment.h; sourceTree = "<group>"; };
+                93F9B7720BA5FDDC00854064 /* JSEntityReference.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSEntityReference.cpp; sourceTree = "<group>"; };
+                93F9B7730BA5FDDC00854064 /* JSEntityReference.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSEntityReference.h; sourceTree = "<group>"; };
+                93F9B79E0BA6032600854064 /* JSCDATASection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCDATASection.cpp; sourceTree = "<group>"; };
+                93F9B79F0BA6032600854064 /* JSCDATASection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCDATASection.h; sourceTree = "<group>"; };
                 93FDAFC90B11307400E2746F /* EditorInsertAction.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = EditorInsertAction.h; sourceTree = "<group>"; };
                 A70023FB0B02BEAB00170215 /* MimeTypeRegistry.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = MimeTypeRegistry.cpp; sourceTree = "<group>"; };
@@ -6255 +6273 @@
                         isa = PBXGroup;
                         children = (
+                                65DF31D809D1C122000BE325 /* JSAttr.cpp */,
+                                65DF31D909D1C123000BE325 /* JSAttr.h */,
+                                65DF323309D1DE65000BE325 /* JSCanvasGradient.cpp */,
+                                65DF323409D1DE65000BE325 /* JSCanvasGradient.h */,
+                                65DF323509D1DE65000BE325 /* JSCanvasPattern.cpp */,
+                                65DF323609D1DE65000BE325 /* JSCanvasPattern.h */,
+                                65DF323709D1DE65000BE325 /* JSCanvasRenderingContext2D.cpp */,
+                                65DF323809D1DE65000BE325 /* JSCanvasRenderingContext2D.h */,
+                                93F9B79E0BA6032600854064 /* JSCDATASection.cpp */,
+                                93F9B79F0BA6032600854064 /* JSCDATASection.h */,
+                                65DF31DF09D1CC60000BE325 /* JSCharacterData.cpp */,
+                                65DF31E009D1CC60000BE325 /* JSCharacterData.h */,
+                                93F9B6DE0BA0FB7200854064 /* JSComment.cpp */,
+                                93F9B6DF0BA0FB7200854064 /* JSComment.h */,
+                                930705D709E0C9B700B17FE4 /* JSCounter.cpp */,
+                                930705D909E0C9BF00B17FE4 /* JSCounter.h */,
+                                930705E809E0C9F000B17FE4 /* JSCSSPrimitiveValue.cpp */,
+                                930705EA09E0C9F600B17FE4 /* JSCSSPrimitiveValue.h */,
+                                14CF7B3109F6ECD700EB3665 /* JSCSSRule.cpp */,
+                                14CF7B3209F6ECD700EB3665 /* JSCSSRule.h */,
+                                A8D05FA50A23B301005E7203 /* JSCSSRuleList.cpp */,
+                                A8D05FA60A23B301005E7203 /* JSCSSRuleList.h */,
+                                142011B40A003133008303F9 /* JSCSSStyleDeclaration.cpp */,
+                                142011B50A003133008303F9 /* JSCSSStyleDeclaration.h */,
+                                14CF78A309F58CBF00EB3665 /* JSCSSValue.cpp */,
+                                14CF78A509F58CD800EB3665 /* JSCSSValue.h */,
+                                A8D05FA90A23B30F005E7203 /* JSCSSValueList.cpp */,
+                                A8D05FAA0A23B30F005E7203 /* JSCSSValueList.h */,
+                                659DDC8009E198BA001BF3C6 /* JSDocument.cpp */,
+                                659DDC8109E198BA001BF3C6 /* JSDocument.h */,
+                                1A494EDC0A123F4C00FDAFC1 /* JSDocumentFragment.cpp */,
+                                1A494EDD0A123F4C00FDAFC1 /* JSDocumentFragment.h */,
+                                65DF31E109D1CC60000BE325 /* JSDocumentType.cpp */,
+                                65DF31E209D1CC60000BE325 /* JSDocumentType.h */,
+                                65DF31E309D1CC60000BE325 /* JSDOMImplementation.cpp */,
+                                65DF31E409D1CC60000BE325 /* JSDOMImplementation.h */,
+                                1ACE53DD0A8D18810022947D /* JSDOMParser.cpp */,
+                                1ACE53DE0A8D18810022947D /* JSDOMParser.h */,
+                                1403BA0B09EB18C700797C7F /* JSDOMWindow.cpp */,
+                                1403BA0E09EB18F800797C7F /* JSDOMWindow.h */,
+                                65DF31E509D1CC60000BE325 /* JSElement.cpp */,
+                                65DF31E609D1CC60000BE325 /* JSElement.h */,
+                                65DF322D09D1DDBC000BE325 /* JSEntity.cpp */,
+                                65DF322E09D1DDBC000BE325 /* JSEntity.h */,
+                                93F9B7720BA5FDDC00854064 /* JSEntityReference.cpp */,
+                                93F9B7730BA5FDDC00854064 /* JSEntityReference.h */,
+                                14E8378309F85D1C00B85AE4 /* JSEvent.cpp */,
+                                14E8378D09F85D4F00B85AE4 /* JSEvent.h */,
+                                1A4A2DEB0A1B852A00C807F8 /* JSHTMLAnchorElement.cpp */,
+                                1A4A2DEC0A1B852A00C807F8 /* JSHTMLAnchorElement.h */,
+                                1A4A2DED0A1B852A00C807F8 /* JSHTMLAppletElement.cpp */,
+                                1A4A2DEE0A1B852A00C807F8 /* JSHTMLAppletElement.h */,
+                                1AE2AA0A0A1CDAB300B42B25 /* JSHTMLAreaElement.cpp */,
+                                1AE2AA0B0A1CDAB300B42B25 /* JSHTMLAreaElement.h */,
+                                A80E7B080A19D606007FB8C5 /* JSHTMLBaseElement.cpp */,
+                                A80E7B070A19D606007FB8C5 /* JSHTMLBaseElement.h */,
+                                1AE2AA0C0A1CDAB300B42B25 /* JSHTMLBaseFontElement.cpp */,
+                                1AE2AA0D0A1CDAB300B42B25 /* JSHTMLBaseFontElement.h */,
+                                1AE2AEE40A1D2A7500B42B25 /* JSHTMLBlockquoteElement.cpp */,
+                                1AE2AEE50A1D2A7500B42B25 /* JSHTMLBlockquoteElement.h */,
+                                1AE2AA0E0A1CDAB300B42B25 /* JSHTMLBodyElement.cpp */,
+                                1AE2AA0F0A1CDAB300B42B25 /* JSHTMLBodyElement.h */,
+                                1AE2AA100A1CDAB300B42B25 /* JSHTMLBRElement.cpp */,
+                                1AE2AA110A1CDAB300B42B25 /* JSHTMLBRElement.h */,
+                                A80E7E960A1A83E3007FB8C5 /* JSHTMLButtonElement.cpp */,
+                                A80E7E950A1A83E3007FB8C5 /* JSHTMLButtonElement.h */,
+                                938E665F09F09B81008A48EC /* JSHTMLCanvasElement.cpp */,
+                                938E666109F09B87008A48EC /* JSHTMLCanvasElement.h */,
+                                1A85B1E00A1B240500D8C87C /* JSHTMLDirectoryElement.cpp */,
+                                1A85B1E10A1B240500D8C87C /* JSHTMLDirectoryElement.h */,
+                                1A85B2B40A1B2AC700D8C87C /* JSHTMLDivElement.cpp */,
+                                1A85B2B50A1B2AC700D8C87C /* JSHTMLDivElement.h */,
+                                1A85B1E20A1B240500D8C87C /* JSHTMLDListElement.cpp */,
+                                1A85B1E30A1B240500D8C87C /* JSHTMLDListElement.h */,
+                                1A494E320A12358A00FDAFC1 /* JSHTMLDocument.cpp */,
+                                1A494E330A12358B00FDAFC1 /* JSHTMLDocument.h */,
+                                1A494BF80A122F4400FDAFC1 /* JSHTMLElement.cpp */,
+                                1A494BF90A122F4400FDAFC1 /* JSHTMLElement.h */,
+                                1AE2AA120A1CDAB300B42B25 /* JSHTMLFieldSetElement.cpp */,
+                                1AE2AA130A1CDAB300B42B25 /* JSHTMLFieldSetElement.h */,
+                                1AE2AA140A1CDAB300B42B25 /* JSHTMLFontElement.cpp */,
+                                1AE2AA150A1CDAB300B42B25 /* JSHTMLFontElement.h */,
+                                A8D064F90A23C0CC005E7203 /* JSHTMLFormElement.cpp */,
+                                A8D064FA0A23C0CC005E7203 /* JSHTMLFormElement.h */,
+                                A80E7B0A0A19D606007FB8C5 /* JSHTMLHeadElement.cpp */,
+                                A80E7B0B0A19D606007FB8C5 /* JSHTMLHeadElement.h */,
+                                1AE2AA1A0A1CDAB400B42B25 /* JSHTMLHeadingElement.cpp */,
+                                1AE2AA1B0A1CDAB400B42B25 /* JSHTMLHeadingElement.h */,
+                                1AE2AA1C0A1CDAB400B42B25 /* JSHTMLHRElement.cpp */,
+                                1AE2AA1D0A1CDAB400B42B25 /* JSHTMLHRElement.h */,
+                                1A85B18D0A1B18A200D8C87C /* JSHTMLHtmlElement.cpp */,
+                                1A85B18E0A1B18A200D8C87C /* JSHTMLHtmlElement.h */,
+                                1AE2AA930A1CDD2D00B42B25 /* JSHTMLImageElement.cpp */,
+                                1AE2AA940A1CDD2D00B42B25 /* JSHTMLImageElement.h */,
+                                A80E7E8E0A1A83E3007FB8C5 /* JSHTMLInputElement.cpp */,
+                                A80E7E8D0A1A83E3007FB8C5 /* JSHTMLInputElement.h */,
+                                1AE2AA950A1CDD2D00B42B25 /* JSHTMLIsIndexElement.cpp */,
+                                1AE2AA960A1CDD2D00B42B25 /* JSHTMLIsIndexElement.h */,
+                                1AE2AB170A1CE63B00B42B25 /* JSHTMLLabelElement.cpp */,
+                                1AE2AB180A1CE63B00B42B25 /* JSHTMLLabelElement.h */,
+                                1AE2AB190A1CE63B00B42B25 /* JSHTMLLegendElement.cpp */,
+                                1AE2AB1A0A1CE63B00B42B25 /* JSHTMLLegendElement.h */,
+                                1AE2AB1B0A1CE63B00B42B25 /* JSHTMLLIElement.cpp */,
+                                1AE2AB1C0A1CE63B00B42B25 /* JSHTMLLIElement.h */,
+                                A80E7B060A19D606007FB8C5 /* JSHTMLLinkElement.cpp */,
+                                A80E7B030A19D606007FB8C5 /* JSHTMLLinkElement.h */,
+                                1AE2AB1D0A1CE63B00B42B25 /* JSHTMLMapElement.cpp */,
+                                1AE2AB1E0A1CE63B00B42B25 /* JSHTMLMapElement.h */,
+                                1AE2AE590A1D26F200B42B25 /* JSHTMLMenuElement.cpp */,
+                                1AE2AE5A0A1D26F200B42B25 /* JSHTMLMenuElement.h */,
+                                A80E7A150A19C3D6007FB8C5 /* JSHTMLMetaElement.cpp */,
+                                A80E7A160A19C3D6007FB8C5 /* JSHTMLMetaElement.h */,
+                                1AE2AB1F0A1CE63B00B42B25 /* JSHTMLModElement.cpp */,
+                                1AE2AB200A1CE63B00B42B25 /* JSHTMLModElement.h */,
+                                1A85B1E40A1B240500D8C87C /* JSHTMLOListElement.cpp */,
+                                1A85B1E50A1B240500D8C87C /* JSHTMLOListElement.h */,
+                                A80E7E920A1A83E3007FB8C5 /* JSHTMLOptGroupElement.cpp */,
+                                A80E7E910A1A83E3007FB8C5 /* JSHTMLOptGroupElement.h */,
+                                A80E7E900A1A83E3007FB8C5 /* JSHTMLOptionElement.cpp */,
+                                A80E7E8F0A1A83E3007FB8C5 /* JSHTMLOptionElement.h */,
+                                448A29BE0A46D9CB0030759F /* JSHTMLOptionsCollection.cpp */,
+                                448A29BD0A46D9CB0030759F /* JSHTMLOptionsCollection.h */,
+                                1AE2AB9E0A1CE90500B42B25 /* JSHTMLParagraphElement.cpp */,
+                                1AE2AB9F0A1CE90500B42B25 /* JSHTMLParagraphElement.h */,
+                                1AE2ABA00A1CE90500B42B25 /* JSHTMLParamElement.cpp */,
+                                1AE2ABA10A1CE90500B42B25 /* JSHTMLParamElement.h */,
+                                1AE2ABA20A1CE90500B42B25 /* JSHTMLPreElement.cpp */,
+                                1AE2ABA30A1CE90500B42B25 /* JSHTMLPreElement.h */,
+                                1AE2AEC30A1D297B00B42B25 /* JSHTMLQuoteElement.cpp */,
+                                1AE2AEC40A1D297B00B42B25 /* JSHTMLQuoteElement.h */,
+                                1AE2ABA40A1CE90500B42B25 /* JSHTMLScriptElement.cpp */,
+                                1AE2ABA50A1CE90500B42B25 /* JSHTMLScriptElement.h */,
+                                E1E6EEA30B628DA8005F2F70 /* JSHTMLSelectElement.cpp */,
+                                E1E6EEA70B628DB3005F2F70 /* JSHTMLSelectElement.h */,
+                                A80E7B050A19D606007FB8C5 /* JSHTMLStyleElement.cpp */,
+                                A80E7B040A19D606007FB8C5 /* JSHTMLStyleElement.h */,
+                                A80E7E940A1A83E3007FB8C5 /* JSHTMLTextAreaElement.cpp */,
+                                A80E7E930A1A83E3007FB8C5 /* JSHTMLTextAreaElement.h */,
+                                A80E7B090A19D606007FB8C5 /* JSHTMLTitleElement.cpp */,
+                                A80E7B020A19D606007FB8C5 /* JSHTMLTitleElement.h */,
+                                1A85B20E0A1B258700D8C87C /* JSHTMLUListElement.cpp */,
+                                1A85B20F0A1B258700D8C87C /* JSHTMLUListElement.h */,
+                                A86629CE09DA2B47009633A5 /* JSKeyboardEvent.cpp */,
+                                A86629CD09DA2B47009633A5 /* JSKeyboardEvent.h */,
+                                A86629CC09DA2B47009633A5 /* JSMouseEvent.cpp */,
+                                A86629CB09DA2B47009633A5 /* JSMouseEvent.h */,
+                                65DF31E709D1CC60000BE325 /* JSMutationEvent.cpp */,
+                                65DF31E809D1CC60000BE325 /* JSMutationEvent.h */,
+                                14DC0D3509FED073007B0235 /* JSNode.cpp */,
+                                14DC0D3609FED073007B0235 /* JSNode.h */,
+                                14115B7009F84CD600CA4FC1 /* JSNodeFilter.cpp */,
+                                14115B7109F84CD600CA4FC1 /* JSNodeFilter.h */,
+                                1A750D8B0A90E521000FF215 /* JSNodeIterator.cpp */,
+                                1A750D8C0A90E521000FF215 /* JSNodeIterator.h */,
+                                65DF31E909D1CC60000BE325 /* JSNotation.cpp */,
+                                65DF31EA09D1CC60000BE325 /* JSNotation.h */,
+                                1A0D573E0A5C7867007EDD4C /* JSOverflowEvent.cpp */,
+                                1A0D573F0A5C7867007EDD4C /* JSOverflowEvent.h */,
+                                65DF31EB09D1CC60000BE325 /* JSProcessingInstruction.cpp */,
+                                65DF31EC09D1CC60000BE325 /* JSProcessingInstruction.h */,
+                                65DF31ED09D1CC60000BE325 /* JSRange.cpp */,
+                                65DF31EE09D1CC60000BE325 /* JSRange.h */,
+                                D23CA55E0AB0EAB6005108A5 /* JSRangeException.cpp */,
+                                D23CA55C0AB0EAAE005108A5 /* JSRangeException.h */,
                                 B20111050AB7740500DB0E68 /* JSSVGAElement.cpp */,
                                 B20111060AB7740500DB0E68 /* JSSVGAElement.h */,
+                                B222F6960AB771950022EFAD /* JSSVGAngle.cpp */,
+                                B222F6970AB771950022EFAD /* JSSVGAngle.h */,
                                 B2FA3C4E0AB75A6E000E5AC4 /* JSSVGAnimateColorElement.cpp */,
-                                B222F6960AB771950022EFAD /* JSSVGAngle.cpp */,
-                                B222F69A0AB771B80022EFAD /* JSSVGElement.cpp */,
-                                B222F69B0AB771B80022EFAD /* JSSVGElement.h */,
-                                B222F6970AB771950022EFAD /* JSSVGAngle.h */,
                                 B2FA3C4F0AB75A6E000E5AC4 /* JSSVGAnimateColorElement.h */,
                                 B2FA3C500AB75A6E000E5AC4 /* JSSVGAnimatedAngle.cpp */,
@@ -6309 +6489 @@
                                 B2FA3C7E0AB75A6E000E5AC4 /* JSSVGDocument.cpp */,
                                 B2FA3C7F0AB75A6E000E5AC4 /* JSSVGDocument.h */,
+                                B222F69A0AB771B80022EFAD /* JSSVGElement.cpp */,
+                                B222F69B0AB771B80022EFAD /* JSSVGElement.h */,
                                 B2CB923B0B5BD941009BAA78 /* JSSVGElementInstance.cpp */,
                                 B2CB923C0B5BD941009BAA78 /* JSSVGElementInstance.h */,
@@ -6495 +6677 @@
                                 B2FA3D300AB75A6F000E5AC4 /* JSSVGZoomEvent.cpp */,
                                 B2FA3D310AB75A6F000E5AC4 /* JSSVGZoomEvent.h */,
-                                65DF31D809D1C122000BE325 /* JSAttr.cpp */,
-                                65DF31D909D1C123000BE325 /* JSAttr.h */,
-                                65DF323309D1DE65000BE325 /* JSCanvasGradient.cpp */,
-                                65DF323409D1DE65000BE325 /* JSCanvasGradient.h */,
-                                65DF323509D1DE65000BE325 /* JSCanvasPattern.cpp */,
-                                65DF323609D1DE65000BE325 /* JSCanvasPattern.h */,
-                                65DF323709D1DE65000BE325 /* JSCanvasRenderingContext2D.cpp */,
-                                65DF323809D1DE65000BE325 /* JSCanvasRenderingContext2D.h */,
-                                65DF31DF09D1CC60000BE325 /* JSCharacterData.cpp */,
-                                65DF31E009D1CC60000BE325 /* JSCharacterData.h */,
-                                930705D709E0C9B700B17FE4 /* JSCounter.cpp */,
-                                930705D909E0C9BF00B17FE4 /* JSCounter.h */,
-                                930705E809E0C9F000B17FE4 /* JSCSSPrimitiveValue.cpp */,
-                                930705EA09E0C9F600B17FE4 /* JSCSSPrimitiveValue.h */,
-                                14CF7B3109F6ECD700EB3665 /* JSCSSRule.cpp */,
-                                14CF7B3209F6ECD700EB3665 /* JSCSSRule.h */,
-                                A8D05FA50A23B301005E7203 /* JSCSSRuleList.cpp */,
-                                A8D05FA60A23B301005E7203 /* JSCSSRuleList.h */,
-                                142011B40A003133008303F9 /* JSCSSStyleDeclaration.cpp */,
-                                142011B50A003133008303F9 /* JSCSSStyleDeclaration.h */,
-                                14CF78A309F58CBF00EB3665 /* JSCSSValue.cpp */,
-                                14CF78A509F58CD800EB3665 /* JSCSSValue.h */,
-                                A8D05FA90A23B30F005E7203 /* JSCSSValueList.cpp */,
-                                A8D05FAA0A23B30F005E7203 /* JSCSSValueList.h */,
-                                659DDC8009E198BA001BF3C6 /* JSDocument.cpp */,
-                                659DDC8109E198BA001BF3C6 /* JSDocument.h */,
-                                1A494EDC0A123F4C00FDAFC1 /* JSDocumentFragment.cpp */,
-                                1A494EDD0A123F4C00FDAFC1 /* JSDocumentFragment.h */,
-                                65DF31E109D1CC60000BE325 /* JSDocumentType.cpp */,
-                                65DF31E209D1CC60000BE325 /* JSDocumentType.h */,
-                                65DF31E309D1CC60000BE325 /* JSDOMImplementation.cpp */,
-                                65DF31E409D1CC60000BE325 /* JSDOMImplementation.h */,
-                                1ACE53DD0A8D18810022947D /* JSDOMParser.cpp */,
-                                1ACE53DE0A8D18810022947D /* JSDOMParser.h */,
-                                1403BA0B09EB18C700797C7F /* JSDOMWindow.cpp */,
-                                1403BA0E09EB18F800797C7F /* JSDOMWindow.h */,
-                                65DF31E509D1CC60000BE325 /* JSElement.cpp */,
-                                65DF31E609D1CC60000BE325 /* JSElement.h */,
-                                65DF322D09D1DDBC000BE325 /* JSEntity.cpp */,
-                                65DF322E09D1DDBC000BE325 /* JSEntity.h */,
-                                14E8378309F85D1C00B85AE4 /* JSEvent.cpp */,
-                                14E8378D09F85D4F00B85AE4 /* JSEvent.h */,
-                                1A4A2DEB0A1B852A00C807F8 /* JSHTMLAnchorElement.cpp */,
-                                1A4A2DEC0A1B852A00C807F8 /* JSHTMLAnchorElement.h */,
-                                1A4A2DED0A1B852A00C807F8 /* JSHTMLAppletElement.cpp */,
-                                1A4A2DEE0A1B852A00C807F8 /* JSHTMLAppletElement.h */,
-                                1AE2AA0A0A1CDAB300B42B25 /* JSHTMLAreaElement.cpp */,
-                                1AE2AA0B0A1CDAB300B42B25 /* JSHTMLAreaElement.h */,
-                                A80E7B080A19D606007FB8C5 /* JSHTMLBaseElement.cpp */,
-                                A80E7B070A19D606007FB8C5 /* JSHTMLBaseElement.h */,
-                                1AE2AA0C0A1CDAB300B42B25 /* JSHTMLBaseFontElement.cpp */,
-                                1AE2AA0D0A1CDAB300B42B25 /* JSHTMLBaseFontElement.h */,
-                                1AE2AEE40A1D2A7500B42B25 /* JSHTMLBlockquoteElement.cpp */,
-                                1AE2AEE50A1D2A7500B42B25 /* JSHTMLBlockquoteElement.h */,
-                                1AE2AA0E0A1CDAB300B42B25 /* JSHTMLBodyElement.cpp */,
-                                1AE2AA0F0A1CDAB300B42B25 /* JSHTMLBodyElement.h */,
-                                1AE2AA100A1CDAB300B42B25 /* JSHTMLBRElement.cpp */,
-                                1AE2AA110A1CDAB300B42B25 /* JSHTMLBRElement.h */,
-                                A80E7E960A1A83E3007FB8C5 /* JSHTMLButtonElement.cpp */,
-                                A80E7E950A1A83E3007FB8C5 /* JSHTMLButtonElement.h */,
-                                938E665F09F09B81008A48EC /* JSHTMLCanvasElement.cpp */,
-                                938E666109F09B87008A48EC /* JSHTMLCanvasElement.h */,
-                                1A85B1E00A1B240500D8C87C /* JSHTMLDirectoryElement.cpp */,
-                                1A85B1E10A1B240500D8C87C /* JSHTMLDirectoryElement.h */,
-                                1A85B2B40A1B2AC700D8C87C /* JSHTMLDivElement.cpp */,
-                                1A85B2B50A1B2AC700D8C87C /* JSHTMLDivElement.h */,
-                                1A85B1E20A1B240500D8C87C /* JSHTMLDListElement.cpp */,
-                                1A85B1E30A1B240500D8C87C /* JSHTMLDListElement.h */,
-                                1A494E320A12358A00FDAFC1 /* JSHTMLDocument.cpp */,
-                                1A494E330A12358B00FDAFC1 /* JSHTMLDocument.h */,
-                                1A494BF80A122F4400FDAFC1 /* JSHTMLElement.cpp */,
-                                1A494BF90A122F4400FDAFC1 /* JSHTMLElement.h */,
-                                1AE2AA120A1CDAB300B42B25 /* JSHTMLFieldSetElement.cpp */,
-                                1AE2AA130A1CDAB300B42B25 /* JSHTMLFieldSetElement.h */,
-                                1AE2AA140A1CDAB300B42B25 /* JSHTMLFontElement.cpp */,
-                                1AE2AA150A1CDAB300B42B25 /* JSHTMLFontElement.h */,
-                                A8D064F90A23C0CC005E7203 /* JSHTMLFormElement.cpp */,
-                                A8D064FA0A23C0CC005E7203 /* JSHTMLFormElement.h */,
-                                A80E7B0A0A19D606007FB8C5 /* JSHTMLHeadElement.cpp */,
-                                A80E7B0B0A19D606007FB8C5 /* JSHTMLHeadElement.h */,
-                                1AE2AA1A0A1CDAB400B42B25 /* JSHTMLHeadingElement.cpp */,
-                                1AE2AA1B0A1CDAB400B42B25 /* JSHTMLHeadingElement.h */,
-                                1AE2AA1C0A1CDAB400B42B25 /* JSHTMLHRElement.cpp */,
-                                1AE2AA1D0A1CDAB400B42B25 /* JSHTMLHRElement.h */,
-                                1A85B18D0A1B18A200D8C87C /* JSHTMLHtmlElement.cpp */,
-                                1A85B18E0A1B18A200D8C87C /* JSHTMLHtmlElement.h */,
-                                1AE2AA930A1CDD2D00B42B25 /* JSHTMLImageElement.cpp */,
-                                1AE2AA940A1CDD2D00B42B25 /* JSHTMLImageElement.h */,
-                                A80E7E8E0A1A83E3007FB8C5 /* JSHTMLInputElement.cpp */,
-                                A80E7E8D0A1A83E3007FB8C5 /* JSHTMLInputElement.h */,
-                                1AE2AA950A1CDD2D00B42B25 /* JSHTMLIsIndexElement.cpp */,
-                                1AE2AA960A1CDD2D00B42B25 /* JSHTMLIsIndexElement.h */,
-                                1AE2AB170A1CE63B00B42B25 /* JSHTMLLabelElement.cpp */,
-                                1AE2AB180A1CE63B00B42B25 /* JSHTMLLabelElement.h */,
-                                1AE2AB190A1CE63B00B42B25 /* JSHTMLLegendElement.cpp */,
-                                1AE2AB1A0A1CE63B00B42B25 /* JSHTMLLegendElement.h */,
-                                1AE2AB1B0A1CE63B00B42B25 /* JSHTMLLIElement.cpp */,
-                                1AE2AB1C0A1CE63B00B42B25 /* JSHTMLLIElement.h */,
-                                A80E7B060A19D606007FB8C5 /* JSHTMLLinkElement.cpp */,
-                                A80E7B030A19D606007FB8C5 /* JSHTMLLinkElement.h */,
-                                1AE2AB1D0A1CE63B00B42B25 /* JSHTMLMapElement.cpp */,
-                                1AE2AB1E0A1CE63B00B42B25 /* JSHTMLMapElement.h */,
-                                1AE2AE590A1D26F200B42B25 /* JSHTMLMenuElement.cpp */,
-                                1AE2AE5A0A1D26F200B42B25 /* JSHTMLMenuElement.h */,
-                                A80E7A150A19C3D6007FB8C5 /* JSHTMLMetaElement.cpp */,
-                                A80E7A160A19C3D6007FB8C5 /* JSHTMLMetaElement.h */,
-                                1AE2AB1F0A1CE63B00B42B25 /* JSHTMLModElement.cpp */,
-                                1AE2AB200A1CE63B00B42B25 /* JSHTMLModElement.h */,
-                                1A85B1E40A1B240500D8C87C /* JSHTMLOListElement.cpp */,
-                                1A85B1E50A1B240500D8C87C /* JSHTMLOListElement.h */,
-                                A80E7E920A1A83E3007FB8C5 /* JSHTMLOptGroupElement.cpp */,
-                                A80E7E910A1A83E3007FB8C5 /* JSHTMLOptGroupElement.h */,
-                                A80E7E900A1A83E3007FB8C5 /* JSHTMLOptionElement.cpp */,
-                                A80E7E8F0A1A83E3007FB8C5 /* JSHTMLOptionElement.h */,
-                                448A29BE0A46D9CB0030759F /* JSHTMLOptionsCollection.cpp */,
-                                448A29BD0A46D9CB0030759F /* JSHTMLOptionsCollection.h */,
-                                1AE2AB9E0A1CE90500B42B25 /* JSHTMLParagraphElement.cpp */,
-                                1AE2AB9F0A1CE90500B42B25 /* JSHTMLParagraphElement.h */,
-                                1AE2ABA00A1CE90500B42B25 /* JSHTMLParamElement.cpp */,
-                                1AE2ABA10A1CE90500B42B25 /* JSHTMLParamElement.h */,
-                                1AE2ABA20A1CE90500B42B25 /* JSHTMLPreElement.cpp */,
-                                1AE2ABA30A1CE90500B42B25 /* JSHTMLPreElement.h */,
-                                1AE2AEC30A1D297B00B42B25 /* JSHTMLQuoteElement.cpp */,
-                                1AE2AEC40A1D297B00B42B25 /* JSHTMLQuoteElement.h */,
-                                1AE2ABA40A1CE90500B42B25 /* JSHTMLScriptElement.cpp */,
-                                1AE2ABA50A1CE90500B42B25 /* JSHTMLScriptElement.h */,
-                                E1E6EEA30B628DA8005F2F70 /* JSHTMLSelectElement.cpp */,
-                                E1E6EEA70B628DB3005F2F70 /* JSHTMLSelectElement.h */,
-                                A80E7B050A19D606007FB8C5 /* JSHTMLStyleElement.cpp */,
-                                A80E7B040A19D606007FB8C5 /* JSHTMLStyleElement.h */,
-                                A80E7E940A1A83E3007FB8C5 /* JSHTMLTextAreaElement.cpp */,
-                                A80E7E930A1A83E3007FB8C5 /* JSHTMLTextAreaElement.h */,
-                                A80E7B090A19D606007FB8C5 /* JSHTMLTitleElement.cpp */,
-                                A80E7B020A19D606007FB8C5 /* JSHTMLTitleElement.h */,
-                                1A85B20E0A1B258700D8C87C /* JSHTMLUListElement.cpp */,
-                                1A85B20F0A1B258700D8C87C /* JSHTMLUListElement.h */,
-                                A86629CE09DA2B47009633A5 /* JSKeyboardEvent.cpp */,
-                                A86629CD09DA2B47009633A5 /* JSKeyboardEvent.h */,
-                                A86629CC09DA2B47009633A5 /* JSMouseEvent.cpp */,
-                                A86629CB09DA2B47009633A5 /* JSMouseEvent.h */,
-                                65DF31E709D1CC60000BE325 /* JSMutationEvent.cpp */,
-                                65DF31E809D1CC60000BE325 /* JSMutationEvent.h */,
-                                14DC0D3509FED073007B0235 /* JSNode.cpp */,
-                                14DC0D3609FED073007B0235 /* JSNode.h */,
-                                14115B7009F84CD600CA4FC1 /* JSNodeFilter.cpp */,
-                                14115B7109F84CD600CA4FC1 /* JSNodeFilter.h */,
-                                1A750D8B0A90E521000FF215 /* JSNodeIterator.cpp */,
-                                1A750D8C0A90E521000FF215 /* JSNodeIterator.h */,
-                                65DF31E909D1CC60000BE325 /* JSNotation.cpp */,
-                                65DF31EA09D1CC60000BE325 /* JSNotation.h */,
-                                1A0D573E0A5C7867007EDD4C /* JSOverflowEvent.cpp */,
-                                1A0D573F0A5C7867007EDD4C /* JSOverflowEvent.h */,
-                                65DF31EB09D1CC60000BE325 /* JSProcessingInstruction.cpp */,
-                                65DF31EC09D1CC60000BE325 /* JSProcessingInstruction.h */,
-                                65DF31ED09D1CC60000BE325 /* JSRange.cpp */,
-                                65DF31EE09D1CC60000BE325 /* JSRange.h */,
-                                D23CA55E0AB0EAB6005108A5 /* JSRangeException.cpp */,
-                                D23CA55C0AB0EAAE005108A5 /* JSRangeException.h */,
                                 65DF31EF09D1CC60000BE325 /* JSText.cpp */,
                                 65DF31F009D1CC60000BE325 /* JSText.h */,
@@ -7475 +7499 @@
                                 85BA4CD50AA6861B0088052D /* DOMHTMLButtonElement.h */,
                                 85BA4CD60AA6861B0088052D /* DOMHTMLButtonElement.mm */,
+                                93F9B6530BA0F35E00854064 /* DOMHTMLCanvasElement.h */,
+                                93F9B6540BA0F35E00854064 /* DOMHTMLCanvasElement.mm */,
+                                93F9B6550BA0F35E00854064 /* DOMHTMLCanvasElementInternal.h */,
                                 85DF2F8C0AA3C88100AD64C5 /* DOMHTMLCollection.h */,
                                 85DF2F8D0AA3C88100AD64C5 /* DOMHTMLCollection.mm */,
@@ -8889 +8916 @@
                         isa = PBXGroup;
                         children = (
-                                AB4CB4EA0B8BDA3D009F40B0 /* JSHTMLSelectElementCustom.h */,
                                 14DFB33F0A7DF7630018F769 /* Derived Sources */,
                                 93F8B3060A300FEA00F61AB8 /* CodeGeneratorJS.pm */,
@@ -8905 +8931 @@
                                 448AD27A0A4813790023D179 /* JSHTMLOptionsCollectionCustom.cpp */,
                                 BC17F9650B64EBB8004A65CB /* JSHTMLSelectElementCustom.cpp */,
+                                AB4CB4EA0B8BDA3D009F40B0 /* JSHTMLSelectElementCustom.h */,
                                 1A750DD30A90E729000FF215 /* JSNodeIteratorCustom.cpp */,
                                 8574D1F10ADE6122004CBA11 /* JSSVGElementWrapperFactory.cpp */,
@@ -11161 +11188 @@
                                 51DF6D7E0B92A16D00C2DC85 /* ThreadCheck.h in Headers */,
                                 BC7F44A80B9E324E00A9D081 /* ImageObserver.h in Headers */,
+                                93F9B6560BA0F35E00854064 /* DOMHTMLCanvasElement.h in Headers */,
+                                93F9B6580BA0F35E00854064 /* DOMHTMLCanvasElementInternal.h in Headers */,
+                                93F9B6E10BA0FB7200854064 /* JSComment.h in Headers */,
+                                93F9B7750BA5FDDD00854064 /* JSEntityReference.h in Headers */,
+                                93F9B7A10BA6032600854064 /* JSCDATASection.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -11320 +11352 @@
                         runOnlyForDeploymentPostprocessing = 0;
                         shellPath = /bin/sh;
-                        shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\n\nif [ \"${BUILD_STYLE}\" = \"Release\" -o \"${BUILD_STYLE}\" = \"Debug\" ] ; then\n    export CREATE_HASH_TABLE=\"${BUILT_PRODUCTS_DIR}/JavaScriptCore.framework/PrivateHeaders/create_hash_table\"\nelse\n    export CREATE_HASH_TABLE=\"${NEXT_ROOT}${SYSTEM_LIBRARY_DIR}/Frameworks/JavaScriptCore.framework/PrivateHeaders/create_hash_table\"\nfi\n\nln -sfh \"${SRCROOT}\" WebCore\nexport WebCore=\"WebCore\"\n\nexport ENCODINGS_FILE=\"WebCore/platform/mac/mac-encodings.txt\"\nexport ENCODINGS_PREFIX=\"kTextEncoding\"\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" ]; then\n    make -f \"WebCore/DerivedSources.make\" -j `/usr/sbin/sysctl -n hw.ncpu`\nfi\n";
+                        shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\n\nif [ \"${BUILD_STYLE}\" = \"Release\" -o \"${BUILD_STYLE}\" = \"Debug\" ] ; then\n    export CREATE_HASH_TABLE=\"${BUILT_PRODUCTS_DIR}/JavaScriptCore.framework/PrivateHeaders/create_hash_table\"\nelse\n    export CREATE_HASH_TABLE=\"${NEXT_ROOT}${SYSTEM_LIBRARY_DIR}/Frameworks/JavaScriptCore.framework/PrivateHeaders/create_hash_table\"\nfi\n\nln -sfh \"${SRCROOT}\" WebCore\nexport WebCore=\"WebCore\"\n\nexport ENCODINGS_FILE=\"WebCore/platform/mac/mac-encodings.txt\"\nexport ENCODINGS_PREFIX=\"kTextEncoding\"\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" ]; then\n    make -f \"WebCore/DerivedSources.make\" -j `/usr/sbin/sysctl -n hw.availcpu`\nfi\n";
                 };
 /* End PBXShellScriptBuildPhase section */
@@ -12526 +12558 @@
                                 934D9BA50B8C116B007B42A9 /* WebCoreNSStringExtras.mm in Sources */,
                                 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */,
+                                93F9B6570BA0F35E00854064 /* DOMHTMLCanvasElement.mm in Sources */,
+                                93F9B6E00BA0FB7200854064 /* JSComment.cpp in Sources */,
+                                93F9B7740BA5FDDC00854064 /* JSEntityReference.cpp in Sources */,
+                                93F9B7A00BA6032600854064 /* JSCDATASection.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/WebCore/WebCoreSources.bkl

@@ -7 +7 @@
         DerivedSources/WebCore/HTMLNames.cpp
         DerivedSources/WebCore/JSAttr.cpp
+        DerivedSources/WebCore/JSCDATASection.cpp
         DerivedSources/WebCore/JSCSSPrimitiveValue.cpp
         DerivedSources/WebCore/JSCSSRule.cpp
@@ -17 +18 @@
         DerivedSources/WebCore/JSCanvasRenderingContext2D.cpp
         DerivedSources/WebCore/JSCharacterData.cpp
+        DerivedSources/WebCore/JSComment.cpp
         DerivedSources/WebCore/JSCounter.cpp
         DerivedSources/WebCore/JSDOMImplementation.cpp
@@ -26 +28 @@
         DerivedSources/WebCore/JSElement.cpp
         DerivedSources/WebCore/JSEntity.cpp
+        DerivedSources/WebCore/JSEntityReference.cpp
         DerivedSources/WebCore/JSEvent.cpp
         DerivedSources/WebCore/JSHTMLAnchorElement.cpp

trunk/WebCore/bindings/js/JSHTMLElementWrapperFactory.cpp

@@ -193 +193 @@
         map.set(imageTag.localName().impl(), createImageWrapper);
         map.set(insTag.localName().impl(), createModWrapper);
+        map.set(keygenTag.localName().impl(), createSelectWrapper);
         map.set(listingTag.localName().impl(), createPreWrapper);
+        map.set(xmpTag.localName().impl(), createPreWrapper);
     }
     CreateHTMLElementWrapperFunction createWrapperFunction = map.get(element->localName().impl());

trunk/WebCore/bindings/js/kjs_css.h

@@ -205 +205 @@
     static const ClassInfo info;
     enum { Red, Green, Blue };
+    unsigned impl() const { return m_color; }
   private:
     unsigned m_color;
@@ -221 +222 @@
     static const ClassInfo info;
     enum { Top, Right, Bottom, Left };
+    WebCore::RectImpl* impl() const { return m_rect.get(); }
   private:
     RefPtr<WebCore::RectImpl> m_rect;

trunk/WebCore/bindings/js/kjs_dom.cpp

@@ -29 +29 @@
 #include "Element.h"
 #include "Entity.h"
+#include "EntityReference.h"
 #include "Event.h"
+#include "EventNames.h"
 #include "EventTarget.h"
-#include "EventNames.h"
 #include "ExceptionCode.h"
 #include "Frame.h"
@@ -38 +39 @@
 #include "HTMLPlugInElement.h"
 #include "JSAttr.h"
-#include "JSCharacterData.h"
+#include "JSCDATASection.h"
+#include "JSComment.h"
 #include "JSDOMImplementation.h"
 #include "JSDocumentFragment.h"
@@ -44 +46 @@
 #include "JSElement.h"
 #include "JSEntity.h"
+#include "JSEntityReference.h"
 #include "JSHTMLDocument.h"
 #include "JSHTMLElementWrapperFactory.h"
@@ -51 +54 @@
 #include "JSRange.h"
 #include "JSText.h"
-#include "Settings.h"
 #include "NamedNodeMap.h"
 #include "Notation.h"
@@ -57 +59 @@
 #include "Range.h"
 #include "RenderView.h"
-#include "xmlhttprequest.h"
+#include "Settings.h"
 #include "kjs_css.h"
 #include "kjs_events.h"
 #include "kjs_traversal.h"
 #include "kjs_window.h"
+#include "xmlhttprequest.h"
 
 #if ENABLE(SVG)
@@ -979 +982 @@
       break;
     case Node::TEXT_NODE:
+      ret = new JSText(exec, static_cast<Text*>(n));
+      break;
     case Node::CDATA_SECTION_NODE:
-      ret = new JSText(exec, static_cast<Text*>(n));
+      ret = new JSCDATASection(exec, static_cast<CDATASection*>(n));
       break;
     case Node::ENTITY_NODE:
@@ -989 +994 @@
       break;
     case Node::COMMENT_NODE:
-      ret = new JSCharacterData(exec, static_cast<CharacterData*>(n));
+      ret = new JSComment(exec, static_cast<WebCore::Comment*>(n));
       break;
     case Node::DOCUMENT_NODE:
@@ -1004 +1009 @@
       break;
     case Node::ENTITY_REFERENCE_NODE:
+      ret = new JSEntityReference(exec, static_cast<EntityReference*>(n));
+      break;
     default:
       ret = new JSNode(exec, n);

trunk/WebCore/bindings/js/kjs_html.cpp

@@ -423 +423 @@
 const ClassInfo JSHTMLElement::frame_info = { "HTMLFrameElement", &JSHTMLElement::info, &HTMLFrameElementTable, 0 };
 const ClassInfo JSHTMLElement::iFrame_info = { "HTMLIFrameElement", &JSHTMLElement::info, &HTMLIFrameElementTable, 0 };
-const ClassInfo JSHTMLElement::info = { "DOMHTMLElement", &JSElement::info, &HTMLElementTable, 0 };
+const ClassInfo JSHTMLElement::info = { "HTMLElement", &JSElement::info, &HTMLElementTable, 0 };
 const ClassInfo JSHTMLElement::marquee_info = { "HTMLMarqueeElement", &JSHTMLElement::info, &HTMLMarqueeElementTable, 0 };
 const ClassInfo JSHTMLElement::object_info = { "HTMLObjectElement", &JSHTMLElement::info, &HTMLObjectElementTable, 0 };
@@ -666 +666 @@
 
 KJS_IMPLEMENT_PROTOTYPE_FUNCTION(JSHTMLElementPrototypeFunction)
-KJS_IMPLEMENT_PROTOTYPE("DOMHTMLElement", JSHTMLElementPrototype, JSHTMLElementPrototypeFunction)
+KJS_IMPLEMENT_PROTOTYPE("HTMLElement", JSHTMLElementPrototype, JSHTMLElementPrototypeFunction)
 
 JSValue* JSHTMLElementPrototypeFunction::callAsFunction(ExecState*, JSObject*, const List&)
@@ -1441 +1441 @@
 KJS_IMPLEMENT_PROTOTYPE("HTMLCollection",JSHTMLCollectionPrototype,JSHTMLCollectionPrototypeFunction)
 
-const ClassInfo JSHTMLCollection::info = { "Collection", 0, 0, 0 };
+const ClassInfo JSHTMLCollection::info = { "HTMLCollection", 0, 0, 0 };
 
 JSHTMLCollection::JSHTMLCollection(ExecState* exec, HTMLCollection* c)

trunk/WebCore/bindings/objc/DOM.mm

@@ -1 +1 @@
 /*
- * Copyright (C) 2004-2006 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2006 James G. Speth (speth@end.com)
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
@@ -32 +32 @@
 #import "CSSStyleSheet.h"
 #import "Comment.h"
-#import "DOMImplementationFront.h"
+#import "DOMHTMLCanvasElement.h"
 #import "DOMInternal.h"
 #import "DOMPrivate.h"
@@ -123 +123 @@
     addElementClass(HTMLNames::brTag, [DOMHTMLBRElement class]);
     addElementClass(HTMLNames::buttonTag, [DOMHTMLButtonElement class]);
-    addElementClass(HTMLNames::canvasTag, [DOMHTMLImageElement class]);
+    addElementClass(HTMLNames::canvasTag, [DOMHTMLCanvasElement class]);
     addElementClass(HTMLNames::captionTag, [DOMHTMLTableCaptionElement class]);
     addElementClass(HTMLNames::colTag, [DOMHTMLTableColElement class]);
     addElementClass(HTMLNames::colgroupTag, [DOMHTMLTableColElement class]);
+    addElementClass(HTMLNames::delTag, [DOMHTMLModElement class]);
     addElementClass(HTMLNames::dirTag, [DOMHTMLDirectoryElement class]);
     addElementClass(HTMLNames::divTag, [DOMHTMLDivElement class]);
     addElementClass(HTMLNames::dlTag, [DOMHTMLDListElement class]);
+    addElementClass(HTMLNames::embedTag, [DOMHTMLEmbedElement class]);
     addElementClass(HTMLNames::fieldsetTag, [DOMHTMLFieldSetElement class]);
     addElementClass(HTMLNames::fontTag, [DOMHTMLFontElement class]);
@@ -147 +149 @@
     addElementClass(HTMLNames::imgTag, [DOMHTMLImageElement class]);
     addElementClass(HTMLNames::inputTag, [DOMHTMLInputElement class]);
+    addElementClass(HTMLNames::insTag, [DOMHTMLModElement class]);
     addElementClass(HTMLNames::isindexTag, [DOMHTMLIsIndexElement class]);
     addElementClass(HTMLNames::labelTag, [DOMHTMLLabelElement class]);
@@ -173 +176 @@
     addElementClass(HTMLNames::textareaTag, [DOMHTMLTextAreaElement class]);
     addElementClass(HTMLNames::tfootTag, [DOMHTMLTableSectionElement class]);
+    addElementClass(HTMLNames::thTag, [DOMHTMLTableCellElement class]);
     addElementClass(HTMLNames::theadTag, [DOMHTMLTableSectionElement class]);
     addElementClass(HTMLNames::titleTag, [DOMHTMLTitleElement class]);
     addElementClass(HTMLNames::trTag, [DOMHTMLTableRowElement class]);
     addElementClass(HTMLNames::ulTag, [DOMHTMLUListElement class]);
+    addElementClass(HTMLNames::xmpTag, [DOMHTMLPreElement class]);
 
 #if ENABLE(SVG)
@@ -294 +299 @@
 }
 
-+ (DOMNode *)_nodeWith:(WebCore::Node *)impl
++ (DOMNode *)_wrapNode:(WebCore::Node *)impl
 {
     if (!impl)
@@ -364 +369 @@
 }
 
-+ (id <DOMEventTarget>)_eventTargetWith:(WebCore::EventTarget *)eventTarget
++ (id <DOMEventTarget>)_wrapEventTarget:(WebCore::EventTarget *)eventTarget
 {
     if (!eventTarget)
@@ -370 +375 @@
     
     // We don't have an ObjC binding for XMLHttpRequest
-    return [DOMNode _nodeWith:eventTarget->toNode()];
+    return [DOMNode _wrapNode:eventTarget->toNode()];
 }
 
@@ -593 +598 @@
 }
 
-+ (DOMNodeFilter *)_nodeFilterWith:(WebCore::NodeFilter *)impl
++ (DOMNodeFilter *)_wrapNodeFilter:(WebCore::NodeFilter *)impl
 {
     if (!impl)
@@ -665 +670 @@
     if (!node)
         return WebCore::NodeFilter::FILTER_REJECT;
-    return [m_filter acceptNode:[DOMNode _nodeWith:node]];
+    return [m_filter acceptNode:[DOMNode _wrapNode:node]];
 }
 
@@ -683 +688 @@
     RefPtr<WebCore::NodeIterator> impl = [self _document]->createNodeIterator([root _node], whatToShow, cppFilter, expandEntityReferences, ec);
     WebCore::raiseOnDOMError(ec);
-    return [DOMNodeIterator _nodeIteratorWith:impl.get() filter:filter];
+    return [DOMNodeIterator _wrapNodeIterator:impl.get() filter:filter];
 }
 
@@ -694 +699 @@
     RefPtr<WebCore::TreeWalker> impl = [self _document]->createTreeWalker([root _node], whatToShow, cppFilter, expandEntityReferences, ec);
     WebCore::raiseOnDOMError(ec);
-    return [DOMTreeWalker _treeWalkerWith:impl.get() filter:filter];
+    return [DOMTreeWalker _wrapTreeWalker:impl.get() filter:filter];
 }
 
@@ -754 +759 @@
 void ObjCEventListener::handleEvent(Event* event, bool)
 {
-    [m_listener handleEvent:[DOMEvent _eventWith:event]];
+    [m_listener handleEvent:[DOMEvent _wrapEvent:event]];
 }
 

trunk/WebCore/bindings/objc/DOMCSS.mm

@@ -70 +70 @@
 }
 
-+ (DOMStyleSheet *)_styleSheetWith:(WebCore::StyleSheet *)impl
++ (DOMStyleSheet *)_wrapStyleSheet:(WebCore::StyleSheet *)impl
 {
     if (!impl)
@@ -109 +109 @@
 }
 
-+ (DOMCSSRule *)_CSSRuleWith:(WebCore::CSSRule *)impl
++ (DOMCSSRule *)_wrapCSSRule:(WebCore::CSSRule *)impl
 {
     if (!impl)
@@ -122 +122 @@
     switch (impl->type()) {
         case DOM_UNKNOWN_RULE:
-            wrapperClass = [DOMCSSRule class];
+            wrapperClass = [DOMCSSUnknownRule class];
             break;
         case DOM_STYLE_RULE:
@@ -168 +168 @@
 }
 
-+ (DOMCSSValue *)_CSSValueWith:(WebCore::CSSValue *)impl
++ (DOMCSSValue *)_wrapCSSValue:(WebCore::CSSValue *)impl
 {
     if (!impl)

trunk/WebCore/bindings/objc/DOMEvents.mm

@@ -64 +64 @@
 }
 
-+ (DOMEvent *)_eventWith:(WebCore::Event *)impl
++ (DOMEvent *)_wrapEvent:(WebCore::Event *)impl
 {
     if (!impl)

trunk/WebCore/bindings/objc/DOMHTML.mm

@@ -49 +49 @@
 - (DOMDocumentFragment *)createDocumentFragmentWithMarkupString:(NSString *)markupString baseURL:(NSURL *)baseURL
 {
-    return [DOMDocumentFragment _documentFragmentWith:createFragmentFromMarkup([self _document], markupString, [baseURL absoluteString]).get()];
+    return [DOMDocumentFragment _wrapDocumentFragment:createFragmentFromMarkup([self _document], markupString, [baseURL absoluteString]).get()];
 }
 
@@ -55 +55 @@
 {
     // FIXME: Since this is not a contextual fragment, it won't handle whitespace properly.
-    return [DOMDocumentFragment _documentFragmentWith:createFragmentFromText([self _document]->createRange().get(), text).get()];
+    return [DOMDocumentFragment _wrapDocumentFragment:createFragmentFromText([self _document]->createRange().get(), text).get()];
 }
 

trunk/WebCore/bindings/objc/DOMImplementationFront.cpp

@@ -26 +26 @@
 #include "DOMImplementation.h"
 #include "HTMLDocument.h"
+#include "JSDOMImplementation.h"
 
 namespace WebCore {
@@ -32 +33 @@
 {
     return reinterpret_cast<DOMImplementationFront*>(document->implementation());
+}
+
+DOMImplementationFront* implementationFront(JSDOMImplementation* wrapper)
+{
+    return reinterpret_cast<DOMImplementationFront*>(wrapper->impl());
 }
 

trunk/WebCore/bindings/objc/DOMImplementationFront.h

@@ -37 +37 @@
 class DocumentType;
 class HTMLDocument;
+class JSDOMImplementation;
 class String;
 
@@ -54 +55 @@
 
 DOMImplementationFront* implementationFront(Document*);
+DOMImplementationFront* implementationFront(JSDOMImplementation*);
 
 } // namespace WebCore

trunk/WebCore/bindings/objc/DOMInternal.h

@@ -303 +303 @@
 
 @interface DOMRGBColor (WebCoreInternal)
-+ (DOMRGBColor *)_RGBColorWithRGB:(WebCore::RGBA32)value;
++ (DOMRGBColor *)_wrapRGBColor:(WebCore::RGBA32)value;
 - (WebCore::RGBA32)_RGBColor;
 @end
@@ -310 +310 @@
 
 @interface DOMNodeFilter : DOMObject <DOMNodeFilter>
-+ (DOMNodeFilter *)_nodeFilterWith:(WebCore::NodeFilter *)impl;
++ (DOMNodeFilter *)_wrapNodeFilter:(WebCore::NodeFilter *)impl;
 @end
 
-
 #if ENABLE(XPATH)
+
 // XPath Internal Interfaces
 
 @interface DOMNativeXPathNSResolver : DOMObject <DOMXPathNSResolver>
-+ (DOMNativeXPathNSResolver *)_xpathNSResolverWith:(WebCore::XPathNSResolver *)impl;
++ (DOMNativeXPathNSResolver *)_wrapXPathNSResolver:(WebCore::XPathNSResolver *)impl;
 - (WebCore::XPathNSResolver *)_xpathNSResolver;
 @end
@@ -326 +326 @@
 // Helper functions for DOM wrappers and gluing to Objective-C
 
-namespace KJS {
-    id createDOMWrapper(KJS::JSObject*, PassRefPtr<Bindings::RootObject> origin, PassRefPtr<Bindings::RootObject> current);
-} // namespace KJS
-
 namespace WebCore {
+
+    id createDOMWrapper(KJS::JSObject*, PassRefPtr<KJS::Bindings::RootObject> origin, PassRefPtr<KJS::Bindings::RootObject> current);
 
     NSObject* getDOMWrapper(DOMObjectInternal*);

trunk/WebCore/bindings/objc/DOMObject.mm

@@ -86 +86 @@
         return nil;
 
-    return [DOMStyleSheet _styleSheetWith:styleSheet];
+    return [DOMStyleSheet _wrapStyleSheet:styleSheet];
 }
 

trunk/WebCore/bindings/objc/DOMRGBColor.mm

@@ -82 +82 @@
     WebCore::RGBA32 rgb = reinterpret_cast<uintptr_t>(_internal);
     int value = (rgb >> 16) & 0xFF;
-    return [DOMCSSPrimitiveValue _CSSPrimitiveValueWith:new WebCore::CSSPrimitiveValue(value, WebCore::CSSPrimitiveValue::CSS_NUMBER)];
+    return [DOMCSSPrimitiveValue _wrapCSSPrimitiveValue:new WebCore::CSSPrimitiveValue(value, WebCore::CSSPrimitiveValue::CSS_NUMBER)];
 }
 
@@ -89 +89 @@
     WebCore::RGBA32 rgb = reinterpret_cast<uintptr_t>(_internal);
     int value = (rgb >> 8) & 0xFF;
-    return [DOMCSSPrimitiveValue _CSSPrimitiveValueWith:new WebCore::CSSPrimitiveValue(value, WebCore::CSSPrimitiveValue::CSS_NUMBER)];
+    return [DOMCSSPrimitiveValue _wrapCSSPrimitiveValue:new WebCore::CSSPrimitiveValue(value, WebCore::CSSPrimitiveValue::CSS_NUMBER)];
 }
 
@@ -96 +96 @@
     WebCore::RGBA32 rgb = reinterpret_cast<uintptr_t>(_internal);
     int value = rgb & 0xFF;
-    return [DOMCSSPrimitiveValue _CSSPrimitiveValueWith:new WebCore::CSSPrimitiveValue(value, WebCore::CSSPrimitiveValue::CSS_NUMBER)];
+    return [DOMCSSPrimitiveValue _wrapCSSPrimitiveValue:new WebCore::CSSPrimitiveValue(value, WebCore::CSSPrimitiveValue::CSS_NUMBER)];
 }
 
@@ -103 +103 @@
     WebCore::RGBA32 rgb = reinterpret_cast<uintptr_t>(_internal);
     float value = static_cast<float>(WebCore::Color(rgb).alpha()) / 0xFF;
-    return [DOMCSSPrimitiveValue _CSSPrimitiveValueWith:new WebCore::CSSPrimitiveValue(value, WebCore::CSSPrimitiveValue::CSS_NUMBER)];
+    return [DOMCSSPrimitiveValue _wrapCSSPrimitiveValue:new WebCore::CSSPrimitiveValue(value, WebCore::CSSPrimitiveValue::CSS_NUMBER)];
     
 }
@@ -141 +141 @@
 }
 
-+ (DOMRGBColor *)_RGBColorWithRGB:(WebCore::RGBA32)value
++ (DOMRGBColor *)_wrapRGBColor:(WebCore::RGBA32)value
 {
     id cachedInstance;

trunk/WebCore/bindings/objc/DOMSVGPathSegInternal.mm

@@ -74 +74 @@
 }
 
-+ (DOMSVGPathSeg *)_SVGPathSegWith:(WebCore::SVGPathSeg *)impl
++ (DOMSVGPathSeg *)_wrapSVGPathSeg:(WebCore::SVGPathSeg *)impl
 {
     if (!impl)

trunk/WebCore/bindings/objc/DOMUtility.mm

@@ -1 +1 @@
 /*
- * Copyright (C) 2004-2006 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2006 James G. Speth (speth@end.com)
  *
@@ -25 +25 @@
  */
 
-#include "config.h"
+#import "config.h"
 
+#import "DOMImplementationFront.h"
 #import "DOMInternal.h"
 #import "JSCSSRuleList.h"
+#import "JSCounter.h"
+#import "JSDOMImplementation.h"
+#import "JSEvent.h"
+#import "JSHTMLOptionsCollection.h"
+#import "JSNodeIterator.h"
+#import "JSRange.h"
+#import "JSTreeWalker.h"
+#import "JSXPathExpression.h"
+#import "JSXPathResult.h"
 #import "Node.h"
 #import "WebScriptObjectPrivate.h"
 #import "kjs_css.h"
 #import "kjs_dom.h"
+#import "kjs_html.h"
+#import "kjs_window.h"
 #import <objc/objc-runtime.h>
 
-// This file makes use of the ObjC DOM API, and the C++ DOM API, so we need to be careful about what
-// headers are included to avoid naming conflicts.
+// This file makes use of both the ObjC DOM API and the C++ DOM API, so we need to be careful about what
+// headers are included and what namespaces we use to avoid naming conflicts.
+
+// FIXME: This has to be in the KJS namespace to avoid an Objective-C++ ambiguity with C++ and
+// Objective-C classes of the same name (even when not in the same namespace). That's also the
+// reason for the use of objc_getClass in the WRAP_OLD macro below.
+
+// Some day if the compiler is fixed, or if all the JS wrappers are named with a "JS" prefix,
+// we could move the function into the WebCore namespace where it belongs.
 
 namespace KJS {
 
-id createDOMWrapper(JSObject* object, PassRefPtr<Bindings::RootObject> origin, PassRefPtr<Bindings::RootObject> current)
+static inline id createDOMWrapper(KJS::JSObject* object)
 {
-    id newObj = nil;
-    
-    if (object->inherits(&DOMNode::info))
-        newObj = [objc_getClass("DOMNode") _nodeWith:static_cast<DOMNode*>(object)->impl()];
-    else if (object->inherits(&DOMNodeList::info))
-        newObj = [objc_getClass("DOMNodeList") _nodeListWith:static_cast<DOMNodeList*>(object)->impl()];
-    else if (object->inherits(&DOMNamedNodeMap::info))
-        newObj = [objc_getClass("DOMNamedNodeMap") _namedNodeMapWith:static_cast<DOMNamedNodeMap*>(object)->impl()];
-    else if (object->inherits(&DOMStyleSheetList::info))
-        newObj = [objc_getClass("DOMStyleSheetList") _styleSheetListWith:static_cast<DOMStyleSheetList*>(object)->impl()];
-    else if (object->inherits(&DOMStyleSheet::info))
-        newObj = [objc_getClass("DOMStyleSheet") _styleSheetWith:static_cast<DOMStyleSheet*>(object)->impl()];
-    else if (object->inherits(&DOMMediaList::info))
-        newObj = [objc_getClass("DOMMediaList") _mediaListWith:static_cast<DOMMediaList*>(object)->impl()];
-    else if (object->inherits(&WebCore::JSCSSRuleList::info))
-        newObj = [objc_getClass("DOMCSSRuleList") _CSSRuleListWith:static_cast<WebCore::JSCSSRuleList*>(object)->impl()];
-    else if (object->inherits(&DOMCSSRule::info))
-        newObj = [objc_getClass("DOMCSSRule") _CSSRuleWith:static_cast<DOMCSSRule*>(object)->impl()];
-    else if (object->inherits(&DOMCSSStyleDeclaration::info))
-        newObj = [objc_getClass("DOMCSSStyleDeclaration") _CSSStyleDeclarationWith:static_cast<DOMCSSStyleDeclaration*>(object)->impl()];
-    else if (object->inherits(&DOMCSSValue::info))
-        newObj = [objc_getClass("DOMCSSValue") _CSSValueWith:static_cast<DOMCSSValue*>(object)->impl()];
-    
-    [newObj _initializeWithObjectImp:object originRootObject:origin rootObject:current];
-    return newObj;
+    #define WRAP(className) \
+        if (object->inherits(&WebCore::JS##className::info)) \
+            return [DOM##className _wrap##className:static_cast<WebCore::JS##className*>(object)->impl()];
+
+    WRAP(CSSRuleList)
+    WRAP(Counter)
+    WRAP(HTMLOptionsCollection)
+    WRAP(Range)
+    WRAP(XPathExpression)
+    WRAP(XPathResult)
+
+    #undef WRAP
+
+    #define WRAP(className) \
+        if (object->inherits(&DOM##className::info)) \
+            return [objc_getClass("DOM" #className) _wrap##className:static_cast<DOM##className*>(object)->impl()];
+
+    WRAP(CSSRule)
+    WRAP(CSSStyleDeclaration)
+    WRAP(CSSValue)
+    WRAP(Event)
+    WRAP(MediaList)
+    WRAP(NamedNodeMap)
+    WRAP(Node)
+    WRAP(NodeList)
+    WRAP(RGBColor)
+    WRAP(Rect)
+    WRAP(StyleSheet)
+    WRAP(StyleSheetList)
+
+    #undef WRAP
+
+    if (object->inherits(&Window::info))
+        return [DOMAbstractView _wrapAbstractView:static_cast<Window*>(object)->impl()];
+    if (object->inherits(&WebCore::JSDOMImplementation::info))
+        return [DOMImplementation _wrapDOMImplementation:implementationFront(static_cast<WebCore::JSDOMImplementation*>(object))];
+    if (object->inherits(&WebCore::JSNodeIterator::info))
+        return [DOMNodeIterator _wrapNodeIterator:static_cast<WebCore::JSNodeIterator*>(object)->impl() filter:nil];
+    if (object->inherits(&WebCore::JSTreeWalker::info))
+        return [DOMTreeWalker _wrapTreeWalker:static_cast<WebCore::JSTreeWalker*>(object)->impl() filter:nil];
+
+    // This must be after the HTMLOptionsCollection check, because it's a subclass in the JavaScript
+    // binding, but not a subclass in the ObjC binding.
+    if (object->inherits(&JSHTMLCollection::info))
+        return [DOMHTMLCollection _wrapHTMLCollection:static_cast<JSHTMLCollection*>(object)->impl()];
+
+    return nil;
 }
 
-} // namespace KJS
+}
+
+namespace WebCore {
+
+id createDOMWrapper(KJS::JSObject* object, PassRefPtr<KJS::Bindings::RootObject> origin, PassRefPtr<KJS::Bindings::RootObject> current)
+{
+    id wrapper = KJS::createDOMWrapper(object);
+    [wrapper _initializeWithObjectImp:object originRootObject:origin rootObject:current];
+    return wrapper;
+}
+
+}

trunk/WebCore/bindings/objc/DOMXPath.mm

@@ -72 +72 @@
 }
 
-+ (DOMNativeXPathNSResolver *)_xpathNSResolverWith:(WebCore::XPathNSResolver *)impl
++ (DOMNativeXPathNSResolver *)_wrapXPathNSResolver:(WebCore::XPathNSResolver *)impl
 {
     if (!impl)

trunk/WebCore/bindings/objc/PublicDOMInterfaces.h

@@ -324 +324 @@
 @end
 
+@interface DOMHTMLCanvasElement : DOMHTMLElement
+@property int height;
+@property int width;
+@end
+
 @interface DOMHTMLCollection : DOMObject
 @property(readonly) unsigned length;
@@ -934 +939 @@
 @property(readonly) BOOL horizontalOverflow;
 @property(readonly) BOOL verticalOverflow;
+- (void)initOverflowEvent:(unsigned short)orient horizontalOverflow:(BOOL)horizontalOverflow verticalOverflow:(BOOL)verticalOverflow;
 @end
 

trunk/WebCore/bindings/objc/WebScriptObject.mm

@@ -1 +1 @@
 /*
- * Copyright (C) 2004, 2006 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -455 +455 @@
         }
 
-        if (id domWrapper = createDOMWrapper(object, originRootObject, rootObject))
+        if (id domWrapper = WebCore::createDOMWrapper(object, originRootObject, rootObject))
             return domWrapper;
 

trunk/WebCore/bindings/scripts/CodeGeneratorObjC.pm

@@ -332 +332 @@
     my $name = $codeGenerator->StripModule(shift);
 
-    # special cases
     return "DOMImplementationFront" if $name eq "DOMImplementation";
     return "RectImpl" if $name eq "Rect";
     return "DOMWindow" if $name eq "AbstractView";
-
     return $name;
 }
@@ -479 +477 @@
 
     return "" if $codeGenerator->IsNonPointerType($type) or $codeGenerator->IsStringType($type) or IsNativeObjCType($type);
-    return "_RGBColorWithRGB" if $type eq "RGBColor";
-
-    my $typeMaker = "";
-    if ($type =~ /^(HTML|CSS|SVG)/ or $type eq "DOMImplementation" or $type eq "CDATASection") {
-        $typeMaker = $type;
-    } elsif ($type =~ /^XPath(.+)/) {
-        $typeMaker = "xpath" . $1;
-    } elsif ($type eq "DOMWindow") {
-        $typeMaker = "abstractView";
-    } else {
-        $typeMaker = lcfirst($type);
-    }
-
-    # put into the form "_fooBarWith" for type FooBar.
-    $typeMaker = "_" . $typeMaker . "With";
-    return $typeMaker;
+    return "_wrapAbstractView" if $type eq "DOMWindow";
+    return "_wrap$type";
 }
 
@@ -1338 +1322 @@
                 push(@functionContent, "        ec = WebCore::SVG_INVALID_VALUE_ERR;\n");
                 push(@functionContent, "    $exceptionRaiseOnError\n");
-                push(@functionContent, "    return [DOMSVGMatrix _SVGMatrixWith:$content];\n");
+                push(@functionContent, "    return [DOMSVGMatrix _wrapSVGMatrix:$content];\n");
             } elsif ($svgMatrixInverse) {
                 # Special case with inverse & SVGMatrix
@@ -1345 +1329 @@
                 push(@functionContent, "        ec = WebCore::SVG_MATRIX_NOT_INVERTABLE;\n");
                 push(@functionContent, "    $exceptionRaiseOnError\n");
-                push(@functionContent, "    return [DOMSVGMatrix _SVGMatrixWith:$content];\n");
+                push(@functionContent, "    return [DOMSVGMatrix _wrapSVGMatrix:$content];\n");
             } elsif ($returnType eq "void") {
                 # Special case 'void' return type.
@@ -1497 +1481 @@
     push(@internalHeaderContent, $typeMakerSig . ";\n");
     if ($interfaceName eq "Node") {
-        push(@internalHeaderContent, "+ (id <DOMEventTarget>)_eventTargetWith:(WebCore::EventTarget *)eventTarget;\n");
+        push(@internalHeaderContent, "+ (id <DOMEventTarget>)_wrapEventTarget:(WebCore::EventTarget *)eventTarget;\n");
     }
     push(@internalHeaderContent, "\@end\n");
@@ -1531 +1515 @@
             push(@implContent, "}\n\n");
 
-            # - (DOMFooBar)_FooBarWith:(WebCore::FooBar)impl for implementation class FooBar
+            # - (DOMFooBar)_wrapFooBar:(WebCore::FooBar)impl for implementation class FooBar
             push(@implContent, "$typeMakerSig\n");
             push(@implContent, "{\n");
@@ -1553 +1537 @@
             push(@implContent, "}\n\n");
 
-            # - (DOMFooBar)_FooBarWith:(WebCore::FooBar *)impl for implementation class FooBar
+            # - (DOMFooBar)_wrapFooBar:(WebCore::FooBar *)impl for implementation class FooBar
             push(@implContent, "$typeMakerSig\n");
             push(@implContent, "{\n");
@@ -1569 +1553 @@
             my $internalBaseTypeMaker = GetObjCTypeMaker($baseClass);
 
-            # - (DOMFooBar)_FooBarWith:(WebCore::FooBar *)impl for implementation class FooBar
+            # - (DOMFooBar)_wrapFooBar:(WebCore::FooBar *)impl for implementation class FooBar
             push(@implContent, "$typeMakerSig\n");
             push(@implContent, "{\n");

trunk/WebCore/dom/Document.cpp

@@ -76 +76 @@
 #include "NodeFilter.h"
 #include "NodeIterator.h"
+#include "OverflowEvent.h"
 #include "PlatformKeyboardEvent.h"
 #include "ProcessingInstruction.h"
@@ -93 +94 @@
 #include "TreeWalker.h"
 #include "UIEvent.h"
+#include "WheelEvent.h"
 #include "XMLTokenizer.h"
 #include "csshelper.h"
@@ -2304 +2306 @@
     if (eventType == "TextEvent")
         return new TextEvent;
+    if (eventType == "OverflowEvent")
+        return new OverflowEvent;
+    if (eventType == "WheelEvent")
+        return new WheelEvent;
 #if ENABLE(SVG)
     if (eventType == "SVGEvents")

trunk/WebCore/dom/OverflowEvent.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -23 +23 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
+
 #include "config.h"
+#include "OverflowEvent.h"
 
-#include "OverflowEvent.h"
 #include "EventNames.h"
 
@@ -32 +33 @@
 using namespace EventNames;
     
+OverflowEvent::OverflowEvent()
+    : Event(overflowchangedEvent, false, false)
+    , m_orient(VERTICAL)
+    , m_horizontalOverflow(false)
+    , m_verticalOverflow(false)
+{
+}
+
 OverflowEvent::OverflowEvent(bool horizontalOverflowChanged, bool horizontalOverflow, bool verticalOverflowChanged, bool verticalOverflow)
     : Event(overflowchangedEvent, false, false)
@@ -38 +47 @@
 {
     ASSERT(horizontalOverflowChanged || verticalOverflowChanged);
-        
+
     if (horizontalOverflowChanged && verticalOverflowChanged)
         m_orient = BOTH;
@@ -52 +61 @@
 }
 
+void OverflowEvent::initOverflowEvent(unsigned short orient, bool horizontalOverflow, bool verticalOverflow)
+{
+    if (dispatched())
+        return;
+    
+    m_orient = orient;
+    m_horizontalOverflow = horizontalOverflow;
+    m_verticalOverflow = verticalOverflow;
 }
 
+}

trunk/WebCore/dom/OverflowEvent.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38 +38 @@
             BOTH       = 2
         };
-        
+
+        OverflowEvent();
         OverflowEvent(bool horizontalOverflowChanged, bool horizontalOverflow, bool verticalOverflowChanged, bool verticalOverflow);
-        
-        virtual bool isOverflowEvent() const;
-        
+
+        void initOverflowEvent(unsigned short orient, bool horizontalOverflow, bool verticalOverflow);
+
         unsigned short orient() const { return m_orient; }
         bool horizontalOverflow() const { return m_horizontalOverflow; }
         bool verticalOverflow() const { return m_verticalOverflow; }
+
+        virtual bool isOverflowEvent() const;
         
     private:

trunk/WebCore/dom/OverflowEvent.idl

@@ -1 +1 @@
 /*
- * Copyright (C) 2006 Apple Computer, Inc.
+ * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * 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 library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 module events {
@@ -27 +33 @@
         readonly attribute boolean horizontalOverflow;
         readonly attribute boolean verticalOverflow;        
+
+        void initOverflowEvent(in unsigned short orient,
+                               in boolean horizontalOverflow,
+                               in boolean verticalOverflow);
     };
 

trunk/WebCore/html/HTMLCanvasElement.idl

@@ -31 +31 @@
         attribute long height;
 
+#if !defined(LANGUAGE_OBJECTIVE_C)
         DOMObject getContext(in DOMString contextId);
+#endif
 
     };

trunk/WebCore/html/HTMLOptionsCollection.idl

@@ -23 +23 @@
     // FIXME: The W3C spec says that HTMLOptionsCollection should not have a parent class.
 
-    interface [LegacyParent=KJS::JSHTMLCollection, HasCustomIndexSetter] HTMLOptionsCollection : HTMLCollection {
+    interface [LegacyParent=KJS::JSHTMLCollection, GenerateNativeConverter, HasCustomIndexSetter] HTMLOptionsCollection : HTMLCollection {
                  attribute long selectedIndex;
                  attribute [Custom] unsigned long length

trunk/WebCore/page/mac/WebCoreFrameBridge.mm

@@ -333 +333 @@
     NSMutableArray *nodes = [NSMutableArray arrayWithCapacity:size];
     for (size_t i = 0; i < size; ++i)
-        [nodes addObject:[DOMNode _nodeWith:(*nodesVector)[i]]];
+        [nodes addObject:[DOMNode _wrapNode:(*nodesVector)[i]]];
     return nodes;
 }
@@ -550 +550 @@
             // Skip option elements, other duds
             if (elt->name() == targetName)
-                return [DOMElement _elementWith:elt];
+                return [DOMElement _wrapElement:elt];
         }
     }
@@ -577 +577 @@
         HTMLFormElement *formElement = inputElement->form();
         if (formElement) {
-            return [DOMElement _elementWith:formElement];
+            return [DOMElement _wrapElement:formElement];
         }
     }
@@ -585 +585 @@
 - (DOMElement *)currentForm
 {
-    return [DOMElement _elementWith:m_frame->currentForm()];
+    return [DOMElement _wrapElement:m_frame->currentForm()];
 }
 
@@ -596 +596 @@
         for (unsigned int i = 0; i < elements.size(); i++) {
             if (elements.at(i)->isEnumeratable()) { // Skip option elements, other duds
-                DOMElement *de = [DOMElement _elementWith:elements.at(i)];
+                DOMElement *de = [DOMElement _wrapElement:elements.at(i)];
                 if (!results) {
                     results = [NSMutableArray arrayWithObject:de];
@@ -839 +839 @@
     selectionController.setSelection(m_frame->selectionController()->selection());
     selectionController.modify(alteration, direction, granularity);
-    return [DOMRange _rangeWith:selectionController.toRange().get()];
+    return [DOMRange _wrapRange:selectionController.toRange().get()];
 }
 
@@ -902 +902 @@
 - (DOMRange *)convertNSRangeToDOMRange:(NSRange)nsrange
 {
-    return [DOMRange _rangeWith:[self convertToDOMRange:nsrange].get()];
+    return [DOMRange _wrapRange:[self convertToDOMRange:nsrange].get()];
 }
 
@@ -928 +928 @@
 - (DOMRange *)markDOMRange
 {
-    return [DOMRange _rangeWith:m_frame->mark().toRange().get()];
+    return [DOMRange _wrapRange:m_frame->mark().toRange().get()];
 }
 
@@ -938 +938 @@
 - (DOMRange *)markedTextDOMRange
 {
-    return [DOMRange _rangeWith:m_frame->markedTextRange()];
+    return [DOMRange _wrapRange:m_frame->markedTextRange()];
 }
 
@@ -990 +990 @@
     range->setStart(newStart.node(), newStart.offset(), exception);
     range->setEnd(newStart.node(), newStart.offset(), exception);
-    return [DOMRange _rangeWith:range.get()];
+    return [DOMRange _wrapRange:range.get()];
 }
 
@@ -1056 +1056 @@
         return 0;
 
-    return [DOMDocumentFragment _documentFragmentWith:createFragmentFromMarkup(m_frame->document(), markupString, baseURLString).get()];
+    return [DOMDocumentFragment _wrapDocumentFragment:createFragmentFromMarkup(m_frame->document(), markupString, baseURLString).get()];
 }
 
 - (DOMDocumentFragment *)documentFragmentWithText:(NSString *)text inContext:(DOMRange *)context
 {
-    return [DOMDocumentFragment _documentFragmentWith:createFragmentFromText([context _range], text).get()];
+    return [DOMDocumentFragment _wrapDocumentFragment:createFragmentFromText([context _range], text).get()];
 }
 
@@ -1075 +1075 @@
         nodesVector.append([node _node]);
     
-    return [DOMDocumentFragment _documentFragmentWith:createFragmentFromNodes(m_frame->document(), nodesVector).get()];
+    return [DOMDocumentFragment _wrapDocumentFragment:createFragmentFromNodes(m_frame->document(), nodesVector).get()];
 }
 
@@ -1089 +1089 @@
 - (void)replaceSelectionWithNode:(DOMNode *)node selectReplacement:(BOOL)selectReplacement smartReplace:(BOOL)smartReplace matchStyle:(BOOL)matchStyle
 {
-    DOMDocumentFragment *fragment = [DOMDocumentFragment _documentFragmentWith:m_frame->document()->createDocumentFragment().get()];
+    DOMDocumentFragment *fragment = [DOMDocumentFragment _wrapDocumentFragment:m_frame->document()->createDocumentFragment().get()];
     [fragment appendChild:node];
     [self replaceSelectionWithFragment:fragment selectReplacement:selectReplacement smartReplace:smartReplace matchStyle:matchStyle];
@@ -1103 +1103 @@
 {
     [self replaceSelectionWithFragment:[self documentFragmentWithText:text
-        inContext:[DOMRange _rangeWith:m_frame->selectionController()->toRange().get()]]
+        inContext:[DOMRange _wrapRange:m_frame->selectionController()->toRange().get()]]
         selectReplacement:selectReplacement smartReplace:smartReplace matchStyle:YES];
 }
@@ -1124 +1124 @@
     Node* newList = IncreaseSelectionListLevelCommand::increaseSelectionListLevel(m_frame->document());
     m_frame->revealSelection(RenderLayer::gAlignToEdgeIfNeeded);
-    return [DOMNode _nodeWith:newList];
+    return [DOMNode _wrapNode:newList];
 }
 
@@ -1134 +1134 @@
     Node* newList = IncreaseSelectionListLevelCommand::increaseSelectionListLevelOrdered(m_frame->document());
     m_frame->revealSelection(RenderLayer::gAlignToEdgeIfNeeded);
-    return [DOMNode _nodeWith:newList];
+    return [DOMNode _wrapNode:newList];
 }
 
@@ -1144 +1144 @@
     Node* newList = IncreaseSelectionListLevelCommand::increaseSelectionListLevelUnordered(m_frame->document());
     m_frame->revealSelection(RenderLayer::gAlignToEdgeIfNeeded);
-    return [DOMNode _nodeWith:newList];
+    return [DOMNode _wrapNode:newList];
 }
 
@@ -1199 +1199 @@
 - (DOMRange *)dragCaretDOMRange
 {
-    return [DOMRange _rangeWith:m_frame->dragCaretController()->toRange().get()];
+    return [DOMRange _wrapRange:m_frame->dragCaretController()->toRange().get()];
 }
 
@@ -1210 +1210 @@
 {
     VisiblePosition position = [self _visiblePositionForPoint:point];
-    return position.isNull() ? nil : [DOMRange _rangeWith:Selection(position).toRange().get()];
+    return position.isNull() ? nil : [DOMRange _wrapRange:Selection(position).toRange().get()];
 }
 
@@ -1221 +1221 @@
     VisiblePosition previous = position.previous();
     if (previous.isNotNull()) {
-        DOMRange *previousCharacterRange = [DOMRange _rangeWith:makeRange(previous, position).get()];
+        DOMRange *previousCharacterRange = [DOMRange _wrapRange:makeRange(previous, position).get()];
         NSRect rect = [self firstRectForDOMRange:previousCharacterRange];
         if (NSPointInRect(point, rect))
@@ -1229 +1229 @@
     VisiblePosition next = position.next();
     if (next.isNotNull()) {
-        DOMRange *nextCharacterRange = [DOMRange _rangeWith:makeRange(position, next).get()];
+        DOMRange *nextCharacterRange = [DOMRange _wrapRange:makeRange(position, next).get()];
         NSRect rect = [self firstRectForDOMRange:nextCharacterRange];
         if (NSPointInRect(point, rect))
@@ -1260 +1260 @@
     if (!m_frame || !m_frame->typingStyle())
         return nil;
-    return [DOMCSSStyleDeclaration _CSSStyleDeclarationWith:m_frame->typingStyle()->copy().get()];
+    return [DOMCSSStyleDeclaration _wrapCSSStyleDeclaration:m_frame->typingStyle()->copy().get()];
 }
 
@@ -1340 +1340 @@
         return nil;
 
-    return [DOMRange _rangeWith:makeRange(previous, next).get()];
+    return [DOMRange _wrapRange:makeRange(previous, next).get()];
 }
 

trunk/WebCore/platform/mac/ClipboardMac.mm

@@ -333 +333 @@
     ASSERT(frame);
     if (Page* page = frame->page())
-        page->dragController()->client()->declareAndWriteDragImage(m_pasteboard.get(), [DOMElement _elementWith:element], url.getNSURL(), title, frame, Clipboard::canSaveAsWebArchive(frame));
+        page->dragController()->client()->declareAndWriteDragImage(m_pasteboard.get(), [DOMElement _wrapElement:element], url.getNSURL(), title, frame, Clipboard::canSaveAsWebArchive(frame));
 }
     

trunk/WebCore/platform/mac/PasteboardMac.mm

@@ -139 +139 @@
         Pasteboard::generalPasteboard(); //Initialises pasteboard types
     
-    NSAttributedString *attributedString = [[[NSAttributedString alloc] _initWithDOMRange:[DOMRange _rangeWith:selectedRange]] autorelease];
+    NSAttributedString *attributedString = [[[NSAttributedString alloc] _initWithDOMRange:[DOMRange _wrapRange:selectedRange]] autorelease];
 #ifdef BUILDING_ON_TIGER
     // 4930197: Mail overrides [WebHTMLView pasteboardTypesForSelection] in order to add another type to the pasteboard

trunk/WebKit/ChangeLog

@@ +1 @@
+2007-03-12  Darin Adler  <darin@apple.com>
+
+        Reviewed by Tim Hatcher.
+
+        - update for the new naming scheme for the Objective-C wrapper-creation
+          functions: _wrapElement: instead of _elementWith:, etc.
+
+        * WebCoreSupport/WebEditorClient.mm:
+        (WebEditorClient::textFieldDidBeginEditing):
+        (WebEditorClient::textFieldDidEndEditing):
+        (WebEditorClient::textDidChangeInTextField):
+        (WebEditorClient::doTextFieldCommandFromEvent):
+        (WebEditorClient::textWillBeDeletedInTextField):
+        (WebEditorClient::textDidChangeInTextArea):
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        (WebFrameLoaderClient::createPlugin):
+        (WebFrameLoaderClient::createJavaAppletWidget):
+        * WebView/WebFrame.mm: (kit):
+        Use the _wrapElement-style functions.
+
 2007-03-12  Anders Carlsson  <acarlsson@apple.com>
 

trunk/WebKit/WebCoreSupport/WebEditorClient.mm

@@ -443 +443 @@
 void WebEditorClient::textFieldDidBeginEditing(WebCore::Element* element)
 {
-    DOMHTMLInputElement* inputElement = [DOMHTMLInputElement _HTMLInputElementWith:(WebCore::HTMLInputElement*)element];
+    DOMHTMLInputElement* inputElement = [DOMHTMLInputElement _wrapHTMLInputElement:(WebCore::HTMLInputElement*)element];
     FormDelegateLog(inputElement);
     [[m_webView _formDelegate] textFieldDidBeginEditing:inputElement inFrame:kit(element->document()->frame())];
@@ -450 +450 @@
 void WebEditorClient::textFieldDidEndEditing(WebCore::Element* element)
 {
-    DOMHTMLInputElement* inputElement = [DOMHTMLInputElement _HTMLInputElementWith:(WebCore::HTMLInputElement*)element];
+    DOMHTMLInputElement* inputElement = [DOMHTMLInputElement _wrapHTMLInputElement:(WebCore::HTMLInputElement*)element];
     FormDelegateLog(inputElement);
     [[m_webView _formDelegate] textFieldDidEndEditing:inputElement inFrame:kit(element->document()->frame())];
@@ -457 +457 @@
 void WebEditorClient::textDidChangeInTextField(WebCore::Element* element)
 {
-    DOMHTMLInputElement* inputElement = [DOMHTMLInputElement _HTMLInputElementWith:(WebCore::HTMLInputElement*)element];
+    DOMHTMLInputElement* inputElement = [DOMHTMLInputElement _wrapHTMLInputElement:(WebCore::HTMLInputElement*)element];
     FormDelegateLog(inputElement);
     [[m_webView _formDelegate] textDidChangeInTextField:(DOMHTMLInputElement *)inputElement inFrame:kit(element->document()->frame())];
@@ -486 +486 @@
 bool WebEditorClient::doTextFieldCommandFromEvent(WebCore::Element* element, WebCore::KeyboardEvent* event)
 {
-    DOMHTMLInputElement* inputElement = [DOMHTMLInputElement _HTMLInputElementWith:(WebCore::HTMLInputElement*)element];
+    DOMHTMLInputElement* inputElement = [DOMHTMLInputElement _wrapHTMLInputElement:(WebCore::HTMLInputElement*)element];
 
     bool result = false;
@@ -500 +500 @@
 void WebEditorClient::textWillBeDeletedInTextField(WebCore::Element* element)
 {
-    DOMHTMLInputElement* inputElement = [DOMHTMLInputElement _HTMLInputElementWith:(WebCore::HTMLInputElement*)element];
+    DOMHTMLInputElement* inputElement = [DOMHTMLInputElement _wrapHTMLInputElement:(WebCore::HTMLInputElement*)element];
 
     // We're using the deleteBackward selector for all deletion operations since the autofill code treats all deletions the same way.
@@ -509 +509 @@
 void WebEditorClient::textDidChangeInTextArea(WebCore::Element* element)
 {
-    DOMHTMLTextAreaElement* textAreaElement = [DOMHTMLTextAreaElement _HTMLTextAreaElementWith:(WebCore::HTMLTextAreaElement*)element];
+    DOMHTMLTextAreaElement* textAreaElement = [DOMHTMLTextAreaElement _wrapHTMLTextAreaElement:(WebCore::HTMLTextAreaElement*)element];
 
     FormDelegateLog(textAreaElement);

trunk/WebKit/WebCoreSupport/WebFrameLoaderClient.mm

@@ -1088 +1088 @@
                               attributeValues:nsArray(paramValues)
                               MIMEType:mimeType
-                              DOMElement:[DOMElement _elementWith:element]
+                              DOMElement:[DOMElement _wrapElement:element]
                               loadManually:loadManually]);
     END_BLOCK_OBJC_EXCEPTIONS;
@@ -1113 +1113 @@
                             attributeValues:nsArray(paramValues)
                             baseURL:baseURL.getNSURL()
-                            DOMElement:[DOMElement _elementWith:element]]);    
+                            DOMElement:[DOMElement _wrapElement:element]]);    
     END_BLOCK_OBJC_EXCEPTIONS;
     

trunk/WebKit/WebKit.xcodeproj/project.pbxproj

@@ -1334 +1334 @@
                         runOnlyForDeploymentPostprocessing = 0;
                         shellPath = /bin/sh;
-                        shellScript = "mkdir -p \"${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}\"\nmkdir -p \"${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}\"\nmkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit\"\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n    make -f \"MigrateHeaders.make\" -j `/usr/sbin/sysctl -n hw.ncpu`\nfi\n";
+                        shellScript = "mkdir -p \"${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}\"\nmkdir -p \"${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}\"\nmkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit\"\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n    make -f \"MigrateHeaders.make\" -j `/usr/sbin/sysctl -n hw.availcpu`\nfi\n";
                 };
                 939811300824BF01008DF038 /* Make Frameworks Symbolic Link */ = {

trunk/WebKit/WebView/WebFrame.mm

@@ -158 +158 @@
 DOMCSSStyleDeclaration *kit(WebCore::CSSStyleDeclaration* declaration)
 {
-    return [DOMCSSStyleDeclaration _CSSStyleDeclarationWith:declaration];
+    return [DOMCSSStyleDeclaration _wrapCSSStyleDeclaration:declaration];
 }
 
@@ -168 +168 @@
 DOMElement *kit(Element* element)
 {
-    return [DOMElement _elementWith:element];
+    return [DOMElement _wrapElement:element];
 }
 
@@ -178 +178 @@
 DOMNode *kit(Node* node)
 {
-    return [DOMNode _nodeWith:node];
+    return [DOMNode _wrapNode:node];
 }
 
@@ -188 +188 @@
 DOMDocument *kit(Document* document)
 {
-    return [DOMDocument _documentWith:document];
+    return [DOMDocument _wrapDocument:document];
 }
 
@@ -198 +198 @@
 DOMHTMLElement *kit(HTMLElement *element)
 {
-    return [DOMHTMLElement _HTMLElementWith:element];
+    return [DOMHTMLElement _wrapHTMLElement:element];
 }
 
@@ -208 +208 @@
 DOMRange *kit(Range* range)
 {
-    return [DOMRange _rangeWith:range];
+    return [DOMRange _wrapRange:range];
 }