Changeset 17399 in webkit

Timestamp:

Oct 28, 2006 11:28:00 AM (18 years ago)

Author:

bdakin

Message:

WebCore:

Reviewed by Darin.

This is the WebCore half of pushing elementAtPoint and the backend
of WebElementDictionary into WebCore. Most of the changes below are
to accommodate one of the following:

-NodeInfo is now a stand-alone class called HitTestResult.

Previously it was defined in RenderObject.h, but not for
any particular reason. The WebElementDictionary
functionality that was pushed into WebCore has been pushed
specifically into the this class. In fact,
WebElementDictionary now keeps a HitTestResult as a member
varibale.

-The enumeration AccessPolicy is now called

ClipboardAccessPolicy and is defined in its own header. It
was previously defined in ClipboardMac.h, but is now
defined independently to avoid including ClipboardMac.h
from within FrameMac.h since FrameMac.h is now included in
WebElementDictionary.m in WebKit.

-Element now has a virtual target() for the sake of

NodeInfo::targetFrame()

• WebCore.exp: Several WebCore functions are newly called from WebKit, so they have been added here.
• WebCore.xcodeproj/project.pbxproj:
• bindings/objc/DOM.mm: Must include Image.h because of adjustments to ClipboardMac.
• bridge/mac/FrameMac.h: Adjust to HitTestResult changes.
• bridge/mac/FrameMac.mm: (WebCore::FrameMac::freeClipboard): Adjust to ClipboardAccessPolicy and HitTestResult changes. (WebCore::FrameMac::eventMayStartDrag): Same. (WebCore::FrameMac::handleMouseMoveEvent): Same. (WebCore::FrameMac::dispatchCPPEvent): Same. (WebCore::FrameMac::mayDHTMLCut): Same. (WebCore::FrameMac::mayDHTMLCopy): Same. (WebCore::FrameMac::mayDHTMLPaste): Same. (WebCore::FrameMac::tryDHTMLCut): Same (WebCore::FrameMac::tryDHTMLCopy): Same. (WebCore::FrameMac::tryDHTMLPaste): Same.
• bridge/mac/WebCoreAXObject.mm: (-[WebCoreAXObject doAXTextMarkerForPosition:]): Adjust to HitTestResult changes. (-[WebCoreAXObject accessibilityHitTest:]): Same.
• bridge/mac/WebCoreFrameBridge.h: Same.
• bridge/mac/WebCoreFrameBridge.mm: (-[WebCoreFrameBridge dragOperationForDraggingInfo:]): Adjust for ClipboardAccessPolicy changes. (-[WebCoreFrameBridge dragExitedWithDraggingInfo:]): Same. (-[WebCoreFrameBridge concludeDragForDraggingInfo:]): Same.
• dom/Document.cpp: (WebCore::Document::elementFromPoint): Adjust for HitTestResult changes. (WebCore::Document::prepareMouseEvent): Same.
• dom/Element.h: (WebCore::Element::target): Now has a virtual target()
• html/HTMLAnchorElement.h: Same.
• html/HTMLAreaElement.cpp: (WebCore::HTMLAreaElement::mapMouseEvent): Adjust for HitTestResult changes.
• html/HTMLAreaElement.h: Virtual target()
• html/HTMLBaseElement.h: (WebCore::HTMLBaseElement::target): Same.
• html/HTMLFormElement.h: Same.
• html/HTMLLinkElement.h: Same.
• html/HTMLMapElement.cpp: (WebCore::HTMLMapElement::mapMouseEvent): Adjust for HitTestResult changes.
• html/HTMLMapElement.h: Same.
• page/Frame.cpp: (WebCore::Frame::isPointInsideSelection): Same. (WebCore::Frame::hitTestResultAtPoint): Same.
• page/Frame.h: Same.
• page/FrameView.cpp: (WebCore::FrameView::handleWheelEvent): Same.
• platform/mac/ClipboardAccessPolicy.h: Added. (WebCore::):
• platform/mac/ClipboardMac.h: Remove definition of AccessPolicy, include ClipboardAccessPolicy.h, and rename AccessPolicy to ClipboardAccessPolicy.
• platform/mac/ClipboardMac.mm: Rename ClipboardAccessPolicy. (WebCore::ClipboardMac::ClipboardMac): (WebCore::ClipboardMac::setAccessPolicy): (WebCore::ClipboardMac::clearData): (WebCore::ClipboardMac::clearAllData): (WebCore::ClipboardMac::getData): (WebCore::ClipboardMac::setData): (WebCore::ClipboardMac::types): (WebCore::ClipboardMac::setDragImage): (WebCore::ClipboardMac::setDropEffect): (WebCore::ClipboardMac::setEffectAllowed):
• rendering/EllipsisBox.cpp: (WebCore::EllipsisBox::nodeAtPoint): Adjust for HitTestResult changes.
• rendering/EllipsisBox.h:
• rendering/HitTestResult.cpp: Added. (WebCore::HitTestResult::HitTestResult): (WebCore::HitTestResult::~HitTestResult): (WebCore::HitTestResult::operator=): (WebCore::HitTestResult::setInnerNode): (WebCore::HitTestResult::setInnerNonSharedNode): (WebCore::HitTestResult::setURLElement): (WebCore::HitTestResult::setScrollbar): (WebCore::HitTestResult::targetFrame): (WebCore::HitTestResult::boundingBox): (WebCore::HitTestResult::isSelected): (WebCore::HitTestResult::title):
• rendering/HitTestResult.h: Added. (WebCore::HitTestResult::readonly): (WebCore::HitTestResult::active): (WebCore::HitTestResult::mouseMove): (WebCore::HitTestResult::innerNode): (WebCore::HitTestResult::innerNonSharedNode): (WebCore::HitTestResult::point): (WebCore::HitTestResult::URLElement): (WebCore::HitTestResult::scrollbar): (WebCore::HitTestResult::setPoint): (WebCore::HitTestResult::setReadonly): (WebCore::HitTestResult::setActive): (WebCore::HitTestResult::setMouseMove):
• rendering/InlineBox.cpp: (WebCore::InlineBox::nodeAtPoint): Adjust to HitTestResult changes.
• rendering/InlineBox.h: Same.
• rendering/InlineFlowBox.cpp: (WebCore::InlineFlowBox::nodeAtPoint): Same.
• rendering/InlineFlowBox.h: Same.
• rendering/InlineTextBox.cpp: (WebCore::InlineTextBox::nodeAtPoint): Same.
• rendering/InlineTextBox.h: Same.
• rendering/RenderBlock.cpp: (WebCore::RenderBlock::isPointInScrollbar): Same. (WebCore::RenderBlock::nodeAtPoint): Same.
• rendering/RenderBlock.h: Same.
• rendering/RenderBox.cpp: (WebCore::RenderBox::nodeAtPoint): Same.
• rendering/RenderBox.h: Same.
• rendering/RenderFlow.cpp: (WebCore::RenderFlow::hitTestLines): Same.
• rendering/RenderFlow.h: Same.
• rendering/RenderForeignObject.cpp: (WebCore::RenderForeignObject::nodeAtPoint): Same.
• rendering/RenderForeignObject.h: Same.
• rendering/RenderFrameSet.cpp: (WebCore::RenderFrameSet::nodeAtPoint): Same.
• rendering/RenderFrameSet.h: Same.
• rendering/RenderImage.cpp: (WebCore::RenderImage::nodeAtPoint): Same.
• rendering/RenderImage.h: Same.
• rendering/RenderInline.cpp: (WebCore::RenderInline::nodeAtPoint): Same.
• rendering/RenderInline.h: Same.
• rendering/RenderLayer.cpp: (WebCore::RenderLayer::autoscroll): Same. (WebCore::RenderLayer::hitTest): Same. (WebCore::RenderLayer::hitTestLayer): Same. (WebCore::RenderLayer::updateHoverActiveState): Same.
• rendering/RenderLayer.h: Same.
• rendering/RenderListBox.cpp: (WebCore::RenderListBox::isPointInScrollbar): Same.
• rendering/RenderListBox.h: Same.
• rendering/RenderObject.cpp: (WebCore::RenderObject::hitTest): Same. (WebCore::RenderObject::setInnerNode): Same. (WebCore::RenderObject::nodeAtPoint): Same.
• rendering/RenderObject.h: Remove NodeInfo class and forward declare HitTestResult.
• rendering/RenderPath.cpp: (WebCore::RenderPath::nodeAtPoint): Adjust to HitTestResult changes.
• rendering/RenderPath.h: Same.
• rendering/RenderSVGImage.cpp: (WebCore::RenderSVGImage::nodeAtPoint): Same.
• rendering/RenderSVGImage.h: Same
• rendering/RenderSVGText.cpp: (WebCore::RenderSVGText::nodeAtPoint): Same.
• rendering/RenderSVGText.h: Same.
• rendering/RenderTableRow.cpp: (WebCore::RenderTableRow::nodeAtPoint): Same.
• rendering/RenderTableRow.h: Same.
• rendering/RenderTableSection.cpp: (WebCore::RenderTableSection::nodeAtPoint): Same.
• rendering/RenderTableSection.h: Same.
• rendering/RenderText.h: Same. (WebCore::RenderText::nodeAtPoint): Same.
• rendering/RenderTextControl.cpp: (WebCore::RenderTextControl::nodeAtPoint): Same.
• rendering/RenderTextControl.h: Same.
• rendering/RootInlineBox.cpp: (WebCore::RootInlineBox::nodeAtPoint): Same.
• rendering/RootInlineBox.h: Same.

WebKit:

Reviewed by Darin.

This is the WebKit half of pushing the guts of elementAtPoint and
WebElementDictionary into WebCore. Among other things, this patch
makes WebElementDictionary.m and WebHTMLView.m Objective-C++

• MigrateHeaders.make: Add DOMElementInternal.h to the list of headers to migrate.
• Misc/WebElementDictionary.h: Replaced DOMNode, DOMElement, and NSPoint member variables with a HitTestResult member variable.
• Misc/WebElementDictionary.m: (addLookupKey): Formatting. (-[WebElementDictionary initWithHitTestResult:]): Constructor just takes a HitTestResult now and sets the member variable. (-[WebElementDictionary dealloc]): delete HitTestResult. (-[WebElementDictionary finalize]): Address HitTestResult. (-[WebElementDictionary _domNode]): Use HitTestResult and call into WebCore. (-[WebElementDictionary objectForKey:]): Same. (-[WebElementDictionary _webFrame]): Same. (-[WebElementDictionary _targetWebFrame]): Same. (-[WebElementDictionary _title]): Same. (-[WebElementDictionary _imageRect]): Same. (-[WebElementDictionary _isSelected]): Same.
• WebKit.xcodeproj/project.pbxproj:
• WebView/WebFrame.mm: (core): Convert from DOMNode* to Node* (kit): Convert from Node* to DOMNode*
• WebView/WebFrameInternal.h: Support for the above.
• WebView/WebHTMLView.m: (-[WebHTMLView elementAtPoint:allowShadowContent:]): Call directly into Frame.cpp to get HitTestResult.

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp (modified) (8 diffs)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (15 diffs)
• WebCore/bindings/objc/DOM.mm (modified) (1 diff)
• WebCore/bridge/mac/FrameMac.h (modified) (4 diffs)
• WebCore/bridge/mac/FrameMac.mm (modified) (13 diffs)
• WebCore/bridge/mac/WebCoreAXObject.mm (modified) (3 diffs)
• WebCore/bridge/mac/WebCoreFrameBridge.h (modified) (1 diff)
• WebCore/bridge/mac/WebCoreFrameBridge.mm (modified) (8 diffs)
• WebCore/dom/Document.cpp (modified) (3 diffs)
• WebCore/dom/Element.h (modified) (1 diff)
• WebCore/html/HTMLAnchorElement.h (modified) (1 diff)
• WebCore/html/HTMLAreaElement.cpp (modified) (2 diffs)
• WebCore/html/HTMLAreaElement.h (modified) (3 diffs)
• WebCore/html/HTMLBaseElement.h (modified) (1 diff)
• WebCore/html/HTMLFormElement.h (modified) (1 diff)
• WebCore/html/HTMLLinkElement.h (modified) (1 diff)
• WebCore/html/HTMLMapElement.cpp (modified) (2 diffs)
• WebCore/html/HTMLMapElement.h (modified) (2 diffs)
• WebCore/page/Frame.cpp (modified) (6 diffs)
• WebCore/page/Frame.h (modified) (3 diffs)
• WebCore/page/FrameView.cpp (modified) (2 diffs)
• WebCore/platform/mac/ClipboardAccessPolicy.h (added)
• WebCore/platform/mac/ClipboardMac.h (modified) (4 diffs)
• WebCore/platform/mac/ClipboardMac.mm (modified) (10 diffs)
• WebCore/rendering/EllipsisBox.cpp (modified) (2 diffs)
• WebCore/rendering/EllipsisBox.h (modified) (2 diffs)
• WebCore/rendering/HitTestResult.cpp (added)
• WebCore/rendering/HitTestResult.h (added)
• WebCore/rendering/InlineBox.cpp (modified) (2 diffs)
• WebCore/rendering/InlineBox.h (modified) (2 diffs)
• WebCore/rendering/InlineFlowBox.cpp (modified) (2 diffs)
• WebCore/rendering/InlineFlowBox.h (modified) (2 diffs)
• WebCore/rendering/InlineTextBox.cpp (modified) (2 diffs)
• WebCore/rendering/InlineTextBox.h (modified) (2 diffs)
• WebCore/rendering/RenderBlock.cpp (modified) (3 diffs)
• WebCore/rendering/RenderBlock.h (modified) (1 diff)
• WebCore/rendering/RenderBox.cpp (modified) (1 diff)
• WebCore/rendering/RenderBox.h (modified) (1 diff)
• WebCore/rendering/RenderFlow.cpp (modified) (1 diff)
• WebCore/rendering/RenderFlow.h (modified) (1 diff)
• WebCore/rendering/RenderForeignObject.cpp (modified) (1 diff)
• WebCore/rendering/RenderForeignObject.h (modified) (1 diff)
• WebCore/rendering/RenderFrameSet.cpp (modified) (2 diffs)
• WebCore/rendering/RenderFrameSet.h (modified) (1 diff)
• WebCore/rendering/RenderImage.cpp (modified) (2 diffs)
• WebCore/rendering/RenderImage.h (modified) (1 diff)
• WebCore/rendering/RenderInline.cpp (modified) (1 diff)
• WebCore/rendering/RenderInline.h (modified) (1 diff)
• WebCore/rendering/RenderLayer.cpp (modified) (5 diffs)
• WebCore/rendering/RenderLayer.h (modified) (4 diffs)
• WebCore/rendering/RenderListBox.cpp (modified) (2 diffs)
• WebCore/rendering/RenderListBox.h (modified) (1 diff)
• WebCore/rendering/RenderObject.cpp (modified) (4 diffs)
• WebCore/rendering/RenderObject.h (modified) (3 diffs)
• WebCore/rendering/RenderPath.cpp (modified) (1 diff)
• WebCore/rendering/RenderPath.h (modified) (1 diff)
• WebCore/rendering/RenderSVGImage.cpp (modified) (1 diff)
• WebCore/rendering/RenderSVGImage.h (modified) (1 diff)
• WebCore/rendering/RenderSVGText.cpp (modified) (1 diff)
• WebCore/rendering/RenderSVGText.h (modified) (1 diff)
• WebCore/rendering/RenderTableRow.cpp (modified) (1 diff)
• WebCore/rendering/RenderTableRow.h (modified) (1 diff)
• WebCore/rendering/RenderTableSection.cpp (modified) (1 diff)
• WebCore/rendering/RenderTableSection.h (modified) (1 diff)
• WebCore/rendering/RenderText.h (modified) (1 diff)
• WebCore/rendering/RenderTextControl.cpp (modified) (2 diffs)
• WebCore/rendering/RenderTextControl.h (modified) (1 diff)
• WebCore/rendering/RootInlineBox.cpp (modified) (2 diffs)
• WebCore/rendering/RootInlineBox.h (modified) (3 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/MigrateHeaders.make (modified) (1 diff)
• WebKit/Misc/WebElementDictionary.h (modified) (1 diff)
• WebKit/Misc/WebElementDictionary.m (modified) (8 diffs)
• WebKit/WebKit.xcodeproj/project.pbxproj (modified) (2 diffs)
• WebKit/WebView/WebFrame.mm (modified) (3 diffs)
• WebKit/WebView/WebFrameInternal.h (modified) (3 diffs)
• WebKit/WebView/WebHTMLView.m (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-10-28  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Darin.
+
+        This is the WebCore half of pushing elementAtPoint and the backend 
+        of WebElementDictionary into WebCore. Most of the changes below are 
+        to accommodate one of the following:
+                
+        -NodeInfo is now a stand-alone class called HitTestResult. 
+                Previously it was defined in RenderObject.h, but not for 
+                any particular reason. The WebElementDictionary 
+                functionality that was pushed into WebCore has been pushed 
+                specifically into the this class. In fact, 
+                WebElementDictionary now keeps a HitTestResult as a member 
+                varibale.
+                
+        -The enumeration AccessPolicy is now called 
+                ClipboardAccessPolicy and is defined in its own header. It 
+                was previously defined in ClipboardMac.h, but is now 
+                defined independently to avoid including ClipboardMac.h 
+                from within FrameMac.h since FrameMac.h is now included in 
+                WebElementDictionary.m in WebKit.
+                
+        -Element now has a virtual target() for the sake of 
+                NodeInfo::targetFrame() 
+
+        * WebCore.exp: Several WebCore functions are newly called from 
+        WebKit, so they have been added here. 
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/objc/DOM.mm: Must include Image.h because of adjustments 
+        to ClipboardMac.
+        * bridge/mac/FrameMac.h: Adjust to HitTestResult changes.
+        * bridge/mac/FrameMac.mm:
+        (WebCore::FrameMac::freeClipboard): Adjust to ClipboardAccessPolicy 
+        and HitTestResult changes.
+        (WebCore::FrameMac::eventMayStartDrag): Same.
+        (WebCore::FrameMac::handleMouseMoveEvent): Same.
+        (WebCore::FrameMac::dispatchCPPEvent): Same.
+        (WebCore::FrameMac::mayDHTMLCut): Same.
+        (WebCore::FrameMac::mayDHTMLCopy): Same.
+        (WebCore::FrameMac::mayDHTMLPaste): Same.
+        (WebCore::FrameMac::tryDHTMLCut): Same
+        (WebCore::FrameMac::tryDHTMLCopy): Same.
+        (WebCore::FrameMac::tryDHTMLPaste): Same.
+        * bridge/mac/WebCoreAXObject.mm:
+        (-[WebCoreAXObject doAXTextMarkerForPosition:]): Adjust to 
+        HitTestResult changes.
+        (-[WebCoreAXObject accessibilityHitTest:]): Same.
+        * bridge/mac/WebCoreFrameBridge.h: Same.
+        * bridge/mac/WebCoreFrameBridge.mm:
+        (-[WebCoreFrameBridge dragOperationForDraggingInfo:]): Adjust for 
+        ClipboardAccessPolicy changes.
+        (-[WebCoreFrameBridge dragExitedWithDraggingInfo:]): Same.
+        (-[WebCoreFrameBridge concludeDragForDraggingInfo:]): Same.
+        * dom/Document.cpp:
+        (WebCore::Document::elementFromPoint): Adjust for HitTestResult 
+        changes.
+        (WebCore::Document::prepareMouseEvent): Same.
+        * dom/Element.h:
+        (WebCore::Element::target): Now has a virtual target()
+        * html/HTMLAnchorElement.h: Same.
+        * html/HTMLAreaElement.cpp:
+        (WebCore::HTMLAreaElement::mapMouseEvent): Adjust for HitTestResult 
+        changes.
+        * html/HTMLAreaElement.h: Virtual target()
+        * html/HTMLBaseElement.h:
+        (WebCore::HTMLBaseElement::target): Same.
+        * html/HTMLFormElement.h: Same.
+        * html/HTMLLinkElement.h: Same.
+        * html/HTMLMapElement.cpp:
+        (WebCore::HTMLMapElement::mapMouseEvent): Adjust for HitTestResult 
+        changes.
+        * html/HTMLMapElement.h: Same.
+        * page/Frame.cpp:
+        (WebCore::Frame::isPointInsideSelection): Same.
+        (WebCore::Frame::hitTestResultAtPoint): Same. 
+        * page/Frame.h: Same.
+        * page/FrameView.cpp:
+        (WebCore::FrameView::handleWheelEvent): Same.
+        * platform/mac/ClipboardAccessPolicy.h: Added.
+        (WebCore::):
+        * platform/mac/ClipboardMac.h: Remove definition of AccessPolicy, 
+        include ClipboardAccessPolicy.h, and rename AccessPolicy to 
+        ClipboardAccessPolicy.
+        * platform/mac/ClipboardMac.mm: Rename ClipboardAccessPolicy.
+        (WebCore::ClipboardMac::ClipboardMac):
+        (WebCore::ClipboardMac::setAccessPolicy):
+        (WebCore::ClipboardMac::clearData):
+        (WebCore::ClipboardMac::clearAllData):
+        (WebCore::ClipboardMac::getData):
+        (WebCore::ClipboardMac::setData):
+        (WebCore::ClipboardMac::types):
+        (WebCore::ClipboardMac::setDragImage):
+        (WebCore::ClipboardMac::setDropEffect):
+        (WebCore::ClipboardMac::setEffectAllowed):
+        * rendering/EllipsisBox.cpp:
+        (WebCore::EllipsisBox::nodeAtPoint): Adjust for HitTestResult 
+        changes.
+        * rendering/EllipsisBox.h:
+        * rendering/HitTestResult.cpp: Added.
+        (WebCore::HitTestResult::HitTestResult):
+        (WebCore::HitTestResult::~HitTestResult):
+        (WebCore::HitTestResult::operator=):
+        (WebCore::HitTestResult::setInnerNode):
+        (WebCore::HitTestResult::setInnerNonSharedNode):
+        (WebCore::HitTestResult::setURLElement):
+        (WebCore::HitTestResult::setScrollbar):
+        (WebCore::HitTestResult::targetFrame):
+        (WebCore::HitTestResult::boundingBox):
+        (WebCore::HitTestResult::isSelected):
+        (WebCore::HitTestResult::title):
+        * rendering/HitTestResult.h: Added.
+        (WebCore::HitTestResult::readonly):
+        (WebCore::HitTestResult::active):
+        (WebCore::HitTestResult::mouseMove):
+        (WebCore::HitTestResult::innerNode):
+        (WebCore::HitTestResult::innerNonSharedNode):
+        (WebCore::HitTestResult::point):
+        (WebCore::HitTestResult::URLElement):
+        (WebCore::HitTestResult::scrollbar):
+        (WebCore::HitTestResult::setPoint):
+        (WebCore::HitTestResult::setReadonly):
+        (WebCore::HitTestResult::setActive):
+        (WebCore::HitTestResult::setMouseMove):
+        * rendering/InlineBox.cpp:
+        (WebCore::InlineBox::nodeAtPoint): Adjust to HitTestResult changes.
+        * rendering/InlineBox.h: Same.
+        * rendering/InlineFlowBox.cpp:
+        (WebCore::InlineFlowBox::nodeAtPoint): Same.
+        * rendering/InlineFlowBox.h: Same.
+        * rendering/InlineTextBox.cpp: 
+        (WebCore::InlineTextBox::nodeAtPoint): Same.
+        * rendering/InlineTextBox.h: Same.
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::isPointInScrollbar): Same.
+        (WebCore::RenderBlock::nodeAtPoint): Same.
+        * rendering/RenderBlock.h: Same.
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::nodeAtPoint): Same.
+        * rendering/RenderBox.h: Same.
+        * rendering/RenderFlow.cpp:
+        (WebCore::RenderFlow::hitTestLines): Same.
+        * rendering/RenderFlow.h: Same.
+        * rendering/RenderForeignObject.cpp:
+        (WebCore::RenderForeignObject::nodeAtPoint): Same.
+        * rendering/RenderForeignObject.h: Same.
+        * rendering/RenderFrameSet.cpp:
+        (WebCore::RenderFrameSet::nodeAtPoint): Same.
+        * rendering/RenderFrameSet.h: Same.
+        * rendering/RenderImage.cpp:
+        (WebCore::RenderImage::nodeAtPoint): Same.
+        * rendering/RenderImage.h: Same.
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::nodeAtPoint): Same.
+        * rendering/RenderInline.h: Same.
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::autoscroll): Same.
+        (WebCore::RenderLayer::hitTest): Same.
+        (WebCore::RenderLayer::hitTestLayer): Same.
+        (WebCore::RenderLayer::updateHoverActiveState): Same.
+        * rendering/RenderLayer.h: Same.
+        * rendering/RenderListBox.cpp:
+        (WebCore::RenderListBox::isPointInScrollbar): Same.
+        * rendering/RenderListBox.h: Same.
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::hitTest): Same.
+        (WebCore::RenderObject::setInnerNode): Same.
+        (WebCore::RenderObject::nodeAtPoint): Same.
+        * rendering/RenderObject.h: Remove NodeInfo class and forward 
+        declare HitTestResult.
+        * rendering/RenderPath.cpp:
+        (WebCore::RenderPath::nodeAtPoint): Adjust to HitTestResult 
+        changes.
+        * rendering/RenderPath.h: Same.
+        * rendering/RenderSVGImage.cpp:
+        (WebCore::RenderSVGImage::nodeAtPoint): Same.
+        * rendering/RenderSVGImage.h: Same
+        * rendering/RenderSVGText.cpp:
+        (WebCore::RenderSVGText::nodeAtPoint): Same.
+        * rendering/RenderSVGText.h: Same.
+        * rendering/RenderTableRow.cpp:
+        (WebCore::RenderTableRow::nodeAtPoint): Same.
+        * rendering/RenderTableRow.h: Same.
+        * rendering/RenderTableSection.cpp:
+        (WebCore::RenderTableSection::nodeAtPoint): Same.
+        * rendering/RenderTableSection.h: Same.
+        * rendering/RenderText.h: Same.
+        (WebCore::RenderText::nodeAtPoint): Same.
+        * rendering/RenderTextControl.cpp:
+        (WebCore::RenderTextControl::nodeAtPoint): Same.
+        * rendering/RenderTextControl.h: Same.
+        * rendering/RootInlineBox.cpp:
+        (WebCore::RootInlineBox::nodeAtPoint): Same.
+        * rendering/RootInlineBox.h: Same.
+
 2006-10-27  Maciej Stachowiak  <mjs@apple.com>
 

trunk/WebCore/WebCore.exp

@@ -160 +160 @@
 __ZN7WebCore11RenderLayer18gAlignCenterAlwaysE
 __ZN7WebCore12AtomicString3addEPNS_10StringImplE
+__ZN7WebCore13HitTestResultC1ERKS0_
+__ZN7WebCore13HitTestResultC1Ebbb
+__ZN7WebCore13HitTestResultD1Ev
+__ZN7WebCore13HitTestResultaSERKS0_
 __ZN7WebCore14DocumentLoader12setCommittedEb
 __ZN7WebCore14DocumentLoader13attachToFrameEv
@@ -182 +186 @@
 __ZN7WebCore5Frame14scrollToAnchorERKNS_4KURLE
 __ZN7WebCore5Frame17setWindowHasFocusEb
+__ZN7WebCore5Frame20hitTestResultAtPointERKNS_8IntPointEb
 __ZN7WebCore5Frame20setSelectionFromNoneEv
 __ZN7WebCore5Frame21setProhibitsScrollingEb
@@ -210 +215 @@
 __ZN7WebCore8FrameMac8keyEventEP7NSEvent
 __ZN7WebCore8FrameMac9mouseDownEP7NSEvent
+__ZN7WebCore8IntPointC1ERK8_NSPoint
 __ZN7WebCore9FrameTree11appendChildEN3WTF10PassRefPtrINS_5FrameEEE
 __ZN7WebCore9FrameTree7setNameERKNS_12AtomicStringE
@@ -218 +224 @@
 __ZNK7WebCore10StringImplcvP8NSStringEv
 __ZNK7WebCore10StringImplcvP8NSStringEv
+__ZNK7WebCore10StringImplcvP8NSStringEv
 __ZNK7WebCore11FrameLoader14documentLoaderEv
 __ZNK7WebCore11FrameLoader15defersCallbacksEv
@@ -223 +230 @@
 __ZNK7WebCore11FrameLoader20activeDocumentLoaderEv
 __ZNK7WebCore11FrameLoader21isQuickRedirectComingEv
+__ZNK7WebCore11FrameLoader27numPendingOrLoadingRequestsEb
 __ZNK7WebCore11FrameLoader6clientEv
 __ZNK7WebCore11FrameLoader8loadTypeEv
+__ZNK7WebCore13HitTestResult10isSelectedEv
+__ZNK7WebCore13HitTestResult11boundingBoxEv
+__ZNK7WebCore13HitTestResult11targetFrameEv
+__ZNK7WebCore13HitTestResult5titleEv
 __ZNK7WebCore14DocumentLoader10isStoppingEv
 __ZNK7WebCore14DocumentLoader11frameLoaderEv
@@ -258 +270 @@
 __ZNK7WebCore5Frame8documentEv
 __ZNK7WebCore5Frame8referrerEv
+__ZNK7WebCore5Frame8rendererEv
 __ZNK7WebCore7IntRectcv6CGRectEv
+__ZNK7WebCore7IntRectcv7_NSRectEv
 __ZNK7WebCore7IntRectcv7_NSRectEv
 __ZNK7WebCore8FrameMac14selectionImageEb
@@ -266 +280 @@
 __ZNK7WebCore9FloatRectcv6CGRectEv
 __ZNK7WebCore9FloatRectcv7_NSRectEv
+__ZNK7WebCore9FrameTree12traverseNextEPKNS_5FrameE
+__ZNK7WebCore9FrameTree14isDescendantOfEPKNS_5FrameE
 __ZNK7WebCore9FrameTree20traverseNextWithWrapEb
 __ZNK7WebCore9FrameTree24traversePreviousWithWrapEb
@@ -325 +341 @@
 _wkSignalCFReadStreamHasBytes
 _wkSupportsMultipartXMixedReplace
-__ZNK7WebCore11FrameLoader27numPendingOrLoadingRequestsEb
-__ZNK7WebCore9FrameTree12traverseNextEPKNS_5FrameE
-__ZNK7WebCore9FrameTree14isDescendantOfEPKNS_5FrameE
 

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -954 +954 @@
                 85B498F30ADB336A00925CBB /* DOMCSSValueInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85B498F20ADB336A00925CBB /* DOMCSSValueInternal.h */; };
                 85B498F50ADB337A00925CBB /* DOMEventInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85B498F40ADB337A00925CBB /* DOMEventInternal.h */; };
-                85B498FB0ADB340200925CBB /* DOMNodeInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85B498FA0ADB340200925CBB /* DOMNodeInternal.h */; };
+                85B498FB0ADB340200925CBB /* DOMNodeInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85B498FA0ADB340200925CBB /* DOMNodeInternal.h */; settings = {ATTRIBUTES = (); }; };
                 85B498FF0ADB348100925CBB /* DOMStyleSheetInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85B498FE0ADB348100925CBB /* DOMStyleSheetInternal.h */; };
                 85B499010ADB34B300925CBB /* DOMSVGPathSegInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85B499000ADB34B300925CBB /* DOMSVGPathSegInternal.h */; };
@@ -1186 +1186 @@
                 85E711960AC5D5350053270F /* DOMDocumentTypeInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711470AC5D5340053270F /* DOMDocumentTypeInternal.h */; };
                 85E711970AC5D5350053270F /* DOMDOMImplementationInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711480AC5D5340053270F /* DOMDOMImplementationInternal.h */; };
-                85E711980AC5D5350053270F /* DOMElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711490AC5D5340053270F /* DOMElementInternal.h */; };
+                85E711980AC5D5350053270F /* DOMElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711490AC5D5340053270F /* DOMElementInternal.h */; settings = {ATTRIBUTES = (); }; };
                 85E711990AC5D5350053270F /* DOMEntityInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7114A0AC5D5340053270F /* DOMEntityInternal.h */; };
                 85E7119A0AC5D5350053270F /* DOMEntityReferenceInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E7114B0AC5D5340053270F /* DOMEntityReferenceInternal.h */; };
@@ -1246 +1246 @@
                 85E711D20AC5D5350053270F /* DOMNamedNodeMapInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711830AC5D5350053270F /* DOMNamedNodeMapInternal.h */; };
                 85E711D30AC5D5350053270F /* DOMNodeListInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711840AC5D5350053270F /* DOMNodeListInternal.h */; };
-                85E711D40AC5D5350053270F /* DOMNotationInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711850AC5D5350053270F /* DOMNotationInternal.h */; };
+                85E711D40AC5D5350053270F /* DOMNotationInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711850AC5D5350053270F /* DOMNotationInternal.h */; settings = {ATTRIBUTES = (); }; };
                 85E711D50AC5D5350053270F /* DOMProcessingInstructionInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711860AC5D5350053270F /* DOMProcessingInstructionInternal.h */; };
                 85E711D60AC5D5350053270F /* DOMRectInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85E711870AC5D5350053270F /* DOMRectInternal.h */; };
@@ -1314 +1314 @@
                 93032CC809AEC34300F82A18 /* PathCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93032CC709AEC34300F82A18 /* PathCG.cpp */; };
                 93032CCA09AEC34B00F82A18 /* Path.h in Headers */ = {isa = PBXBuildFile; fileRef = 93032CC909AEC34B00F82A18 /* Path.h */; };
+                930500200AF025D300FFF491 /* ClipboardAccessPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 9305001F0AF025D300FFF491 /* ClipboardAccessPolicy.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 9305B24D098F1B6B00C28855 /* Timer.h in Headers */ = {isa = PBXBuildFile; fileRef = 9305B24C098F1B6B00C28855 /* Timer.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 9307056C09E0AF8F00B17FE4 /* csshelper.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA4786097CAAC80094C9E4 /* csshelper.h */; };
@@ -1320 +1321 @@
                 930705E909E0C9F000B17FE4 /* JSCSSPrimitiveValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 930705E809E0C9F000B17FE4 /* JSCSSPrimitiveValue.cpp */; };
                 930705EB09E0C9F600B17FE4 /* JSCSSPrimitiveValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 930705EA09E0C9F600B17FE4 /* JSCSSPrimitiveValue.h */; };
+                9307F1130AF2C8BE00DBA31A /* DOMNodeInternal.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 85B498FA0ADB340200925CBB /* DOMNodeInternal.h */; };
+                9307F1D70AF2D59000DBA31A /* HitTestResult.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9307F1D50AF2D59000DBA31A /* HitTestResult.cpp */; };
+                9307F1D80AF2D59000DBA31A /* HitTestResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 9307F1D60AF2D59000DBA31A /* HitTestResult.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 93126F6109D7A736008D9626 /* StringHash.h in Headers */ = {isa = PBXBuildFile; fileRef = 93126F6009D7A736008D9626 /* StringHash.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 9326DC0B09DAD5BE00AFC847 /* CharsetData.h in Headers */ = {isa = PBXBuildFile; fileRef = 9326DC0A09DAD5BE00AFC847 /* CharsetData.h */; };
@@ -2533 +2537 @@
                 BC1A37BF097C715F0019F3D8 /* DOMUtility.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC1A37A9097C715F0019F3D8 /* DOMUtility.mm */; };
                 BC1A37C0097C715F0019F3D8 /* DOMViews.h in Headers */ = {isa = PBXBuildFile; fileRef = BC1A37AA097C715F0019F3D8 /* DOMViews.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                BC3FCAA90AC3DB5800BA54AD /* PlatformScrollBar.h in Headers */ = {isa = PBXBuildFile; fileRef = BC3FCAA80AC3DB5800BA54AD /* PlatformScrollBar.h */; };
+                BC3FCAA90AC3DB5800BA54AD /* PlatformScrollBar.h in Headers */ = {isa = PBXBuildFile; fileRef = BC3FCAA80AC3DB5800BA54AD /* PlatformScrollBar.h */; settings = {ATTRIBUTES = (); }; };
                 BC6B7BAF0993603C0052867B /* Image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC6B7BAE0993603C0052867B /* Image.cpp */; };
                 BC6B7ECF0998AC7F0052867B /* ImageSource.h in Headers */ = {isa = PBXBuildFile; fileRef = BC6B7ECE0998AC7F0052867B /* ImageSource.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -2733 +2737 @@
                                 1CB4214B0AF2B2CA0085AD91 /* DOMElementInternal.h in Copy Generated Headers */,
                                 1CB4214C0AF2B2CA0085AD91 /* DOMHTMLElementInternal.h in Copy Generated Headers */,
+                                9307F1130AF2C8BE00DBA31A /* DOMNodeInternal.h in Copy Generated Headers */,
                                 1CB4214D0AF2B2CA0085AD91 /* DOMRangeInternal.h in Copy Generated Headers */,
                                 85B916870AEBDBC4008DD727 /* DOMHTMLFormElementPrivate.h in Copy Generated Headers */,
@@ -4176 +4181 @@
                 93032CC709AEC34300F82A18 /* PathCG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PathCG.cpp; sourceTree = "<group>"; };
                 93032CC909AEC34B00F82A18 /* Path.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Path.h; sourceTree = "<group>"; };
+                9305001F0AF025D300FFF491 /* ClipboardAccessPolicy.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ClipboardAccessPolicy.h; sourceTree = "<group>"; };
                 9305B24C098F1B6B00C28855 /* Timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Timer.h; sourceTree = "<group>"; };
                 9307059009E0C75800B17FE4 /* CSSPrimitiveValue.idl */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 4; path = CSSPrimitiveValue.idl; sourceTree = "<group>"; };
@@ -4184 +4190 @@
                 930705EA09E0C9F600B17FE4 /* JSCSSPrimitiveValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCSSPrimitiveValue.h; sourceTree = "<group>"; };
                 9307061309E0CA8200B17FE4 /* DerivedSources.make */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; path = DerivedSources.make; sourceTree = "<group>"; usesTabs = 1; };
+                9307F1D50AF2D59000DBA31A /* HitTestResult.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = HitTestResult.cpp; sourceTree = "<group>"; };
+                9307F1D60AF2D59000DBA31A /* HitTestResult.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HitTestResult.h; sourceTree = "<group>"; };
                 930CAAD609C495B600229C04 /* CanvasRenderingContext2D.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CanvasRenderingContext2D.idl; sourceTree = "<group>"; };
                 930CAB8809C49EFA00229C04 /* CanvasGradient.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CanvasGradient.idl; sourceTree = "<group>"; };
@@ -6376 +6384 @@
                                 65A640F00533BB1F0085E777 /* BlockExceptions.h */,
                                 65F80697054D9F86008BF776 /* BlockExceptions.mm */,
+                                9305001F0AF025D300FFF491 /* ClipboardAccessPolicy.h */,
                                 2D90660B0665D937006B6F1A /* ClipboardMac.h */,
                                 2D90660C0665D937006B6F1A /* ClipboardMac.mm */,
@@ -8786 +8795 @@
                                 A8CFF04A0A154F09000A4234 /* FixedTableLayout.h */,
                                 935C477409AC4D8D00A6AAB4 /* GapRects.h */,
+                                9307F1D50AF2D59000DBA31A /* HitTestResult.cpp */,
+                                9307F1D60AF2D59000DBA31A /* HitTestResult.h */,
                                 A8CFF5DF0A155A05000A4234 /* InlineBox.cpp */,
                                 A8CFF5DE0A155A05000A4234 /* InlineBox.h */,
@@ -10468 +10479 @@
                                 655A81BB0AEF67D4000975F0 /* WebCoreResourceLoaderImp.h in Headers */,
                                 655A81BE0AEF67E6000975F0 /* HTTPHeaderMap.h in Headers */,
+                                930500200AF025D300FFF491 /* ClipboardAccessPolicy.h in Headers */,
+                                9307F1D80AF2D59000DBA31A /* HitTestResult.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -10502 +10515 @@
                         isa = PBXProject;
                         buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
-                        compatibilityVersion = "Xcode 2.4";
                         hasScannedForEncodings = 1;
                         knownRegions = (
@@ -10516 +10528 @@
                         productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
                         projectDirPath = "";
-                        projectRoot = "";
-                        shouldCheckCompatibility = 1;
                         targets = (
                                 93F198A508245E59001E9ABC /* WebCore */,
@@ -11705 +11715 @@
                                 654F68880AF1B7C50065BDD6 /* CachedResourceMac.mm in Sources */,
                                 655A81BC0AEF67D4000975F0 /* WebCoreResourceLoaderImp.mm in Sources */,
+                                9307F1D70AF2D59000DBA31A /* HitTestResult.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/WebCore/bindings/objc/DOM.mm

@@ -48 +48 @@
 #import "HTMLNames.h"
 #import "HTMLPlugInElement.h"
+#import "Image.h"
 #import "IntRect.h"
 #import "NodeFilter.h"

trunk/WebCore/bridge/mac/FrameMac.h

@@ -27 +27 @@
 #define FrameMac_h
 
-#import "ClipboardMac.h"
+#import "ClipboardAccessPolicy.h"
 #import "Frame.h"
 #import "IntRect.h"
@@ -85 +85 @@
 class WebScriptObject;
 
+typedef unsigned int NSDragOperation;
 typedef int NSWritingDirection;
 
@@ -91 +92 @@
 namespace WebCore {
 
+class ClipboardMac;
 class DocumentFragment;
 class EditorClient;
@@ -338 +340 @@
     static NSView* documentViewForNode(Node*);
     
-    bool dispatchCPPEvent(const AtomicString &eventType, ClipboardMac::AccessPolicy policy);
+    bool dispatchCPPEvent(const AtomicString &eventType, ClipboardAccessPolicy policy);
 
     NSImage* imageFromRect(NSRect) const;

trunk/WebCore/bridge/mac/FrameMac.mm

@@ -34 +34 @@
 #import "Cache.h"
 #import "ClipboardEvent.h"
+#import "ClipboardMac.h"
 #import "Cursor.h"
 #import "WebDocumentLoader.h"
@@ -59 +60 @@
 #import "Logging.h"
 #import "MouseEventWithHitTestResults.h"
+#import "HitTestResult.h"
 #import "PlatformKeyboardEvent.h"
 #import "PlatformScrollBar.h"
@@ -383 +385 @@
 {
     if (_dragClipboard)
-        _dragClipboard->setAccessPolicy(ClipboardMac::Numb);
+        _dragClipboard->setAccessPolicy(ClipboardNumb);
 }
 
@@ -1557 +1559 @@
     NSPoint loc = [event locationInWindow];
     IntPoint mouseDownPos = d->m_view->windowToContents(IntPoint(loc));
-    RenderObject::NodeInfo nodeInfo(true, false);
-    renderer()->layer()->hitTest(nodeInfo, mouseDownPos);
+    HitTestResult result(true, false);
+    renderer()->layer()->hitTest(result, mouseDownPos);
     bool srcIsDHTML;
-    return nodeInfo.innerNode()->renderer()->draggableNode(DHTMLFlag, UAFlag, mouseDownPos.x(), mouseDownPos.y(), srcIsDHTML);
+    return result.innerNode()->renderer()->draggableNode(DHTMLFlag, UAFlag, mouseDownPos.x(), mouseDownPos.y(), srcIsDHTML);
 }
 
@@ -1617 +1619 @@
         if (mouseDownMayStartDrag() && !_dragSrc) {
             // try to find an element that wants to be dragged
-            RenderObject::NodeInfo nodeInfo(true, false);
-            renderer()->layer()->hitTest(nodeInfo, m_mouseDownPos);
-            Node *node = nodeInfo.innerNode();
+            HitTestResult result(true, false);
+            renderer()->layer()->hitTest(result, m_mouseDownPos);
+            Node *node = result.innerNode();
             _dragSrc = (node && node->renderer()) ? node->renderer()->draggableNode(_dragSrcMayBeDHTML, _dragSrcMayBeUA, m_mouseDownPos.x(), m_mouseDownPos.y(), _dragSrcIsDHTML) : 0;
             if (!_dragSrc) {
                 setMouseDownMayStartDrag(false);     // no element is draggable
             } else {
-                // remember some facts about this source, while we have a NodeInfo handy
-                node = nodeInfo.URLElement();
+                // remember some facts about this source, while we have a HitTestResult handy
+                node = result.URLElement();
                 _dragSrcIsLink = node && node->isLink();
 
-                node = nodeInfo.innerNonSharedNode();
+                node = result.innerNonSharedNode();
                 _dragSrcIsImage = node && node->renderer() && node->renderer()->isImage();
                 
@@ -1667 +1669 @@
                     freeClipboard();    // would only happen if we missed a dragEnd.  Do it anyway, just
                                         // to make sure it gets numbified
-                    _dragClipboard = new ClipboardMac(true, pasteboard, ClipboardMac::Writable, this);
+                    _dragClipboard = new ClipboardMac(true, pasteboard, ClipboardWritable, this);
                     
                     // If this is drag of an element, get set up to generate a default image.  Otherwise
@@ -1681 +1683 @@
                     // Invalidate clipboard here against anymore pasteboard writing for security.  The drag
                     // image can still be changed as we drag, but not the pasteboard data.
-                    _dragClipboard->setAccessPolicy(ClipboardMac::ImageWritable);
+                    _dragClipboard->setAccessPolicy(ClipboardImageWritable);
                     
                     if (mouseDownMayStartDrag()) {
@@ -1739 +1741 @@
 // Returns whether caller should continue with "the default processing", which is the same as 
 // the event handler NOT setting the return value to false
-bool FrameMac::dispatchCPPEvent(const AtomicString &eventType, ClipboardMac::AccessPolicy policy)
+bool FrameMac::dispatchCPPEvent(const AtomicString &eventType, ClipboardAccessPolicy policy)
 {
     Node* target = selectionController()->start().element();
@@ -1749 +1751 @@
         target = target->shadowParentNode();
     
-    RefPtr<ClipboardMac> clipboard = new ClipboardMac(false, [NSPasteboard generalPasteboard], (ClipboardMac::AccessPolicy)policy);
+    RefPtr<ClipboardMac> clipboard = new ClipboardMac(false, [NSPasteboard generalPasteboard], (ClipboardAccessPolicy)policy);
 
     ExceptionCode ec = 0;
@@ -1757 +1759 @@
 
     // invalidate clipboard here for security
-    clipboard->setAccessPolicy(ClipboardMac::Numb);
+    clipboard->setAccessPolicy(ClipboardNumb);
 
     return !noDefaultProcessing;
@@ -1769 +1771 @@
 bool FrameMac::mayDHTMLCut()
 {
-    return mayCopy() && !dispatchCPPEvent(beforecutEvent, ClipboardMac::Numb);
+    return mayCopy() && !dispatchCPPEvent(beforecutEvent, ClipboardNumb);
 }
 
 bool FrameMac::mayDHTMLCopy()
 {
-    return mayCopy() && !dispatchCPPEvent(beforecopyEvent, ClipboardMac::Numb);
+    return mayCopy() && !dispatchCPPEvent(beforecopyEvent, ClipboardNumb);
 }
 
 bool FrameMac::mayDHTMLPaste()
 {
-    return !dispatchCPPEvent(beforepasteEvent, ClipboardMac::Numb);
+    return !dispatchCPPEvent(beforepasteEvent, ClipboardNumb);
 }
 
@@ -1791 +1793 @@
     [[NSPasteboard generalPasteboard] declareTypes:[NSArray array] owner:nil];
 
-    return !dispatchCPPEvent(cutEvent, ClipboardMac::Writable);
+    return !dispatchCPPEvent(cutEvent, ClipboardWritable);
 }
 
@@ -1803 +1805 @@
     [[NSPasteboard generalPasteboard] declareTypes:[NSArray array] owner:nil];
 
-    return !dispatchCPPEvent(copyEvent, ClipboardMac::Writable);
+    return !dispatchCPPEvent(copyEvent, ClipboardWritable);
 }
 
 bool FrameMac::tryDHTMLPaste()
 {
-    return !dispatchCPPEvent(pasteEvent, ClipboardMac::Readable);
+    return !dispatchCPPEvent(pasteEvent, ClipboardReadable);
 }
 

trunk/WebCore/bridge/mac/WebCoreAXObject.mm

@@ -43 +43 @@
 #import "HTMLNames.h"
 #import "HTMLSelectElement.h"
+#import "HitTestResult.h"
 #import "RenderImage.h"
 #import "RenderListMarker.h"
@@ -1263 +1264 @@
         ourpoint = [view convertPoint:windowCoord fromView:nil];
         
-        RenderObject::NodeInfo nodeInfo(true, true);
-        renderer->layer()->hitTest(nodeInfo, IntPoint(ourpoint));
-        innerNode = nodeInfo.innerNode();
+        HitTestResult result(true, true);
+        renderer->layer()->hitTest(result, IntPoint(ourpoint));
+        innerNode = result.innerNode();
         if (!innerNode || !innerNode->renderer())
             return nil;
@@ -2303 +2304 @@
         return NSAccessibilityUnignoredAncestor(self);
     
-    RenderObject::NodeInfo nodeInfo(true, true);
-    m_renderer->layer()->hitTest(nodeInfo, IntPoint(point));
-    if (!nodeInfo.innerNode())
+    HitTestResult result(true, true);
+    m_renderer->layer()->hitTest(result, IntPoint(point));
+    if (!result.innerNode())
         return NSAccessibilityUnignoredAncestor(self);
-    Node* node = nodeInfo.innerNode()->shadowAncestorNode();
+    Node* node = result.innerNode()->shadowAncestorNode();
     RenderObject* obj = node->renderer();
     if (!obj)

trunk/WebCore/bridge/mac/WebCoreFrameBridge.h

@@ -253 +253 @@
 - (NSString *)renderTreeAsExternalRepresentation;
 
-- (void)getInnerNonSharedNode:(DOMNode **)innerNonSharedNode innerNode:(DOMNode **)innerNode URLElement:(DOMElement **)URLElement atPoint:(NSPoint)point allowShadowContent:(BOOL)allow;
 - (BOOL)isPointInsideSelection:(NSPoint)point;
 

trunk/WebCore/bridge/mac/WebCoreFrameBridge.mm

@@ -31 +31 @@
 #import "AXObjectCache.h"
 #import "Cache.h"
+#import "ClipboardMac.h"
 #import "DOMImplementation.h"
 #import "DOMInternal.h"
@@ -55 +56 @@
 #import "ModifySelectionListLevel.h"
 #import "MoveSelectionCommand.h"
+#import "HitTestResult.h"
 #import "Page.h"
 #import "PlugInInfoStore.h"
@@ -996 +998 @@
 }
 
-- (void)getInnerNonSharedNode:(DOMNode **)innerNonSharedNode innerNode:(DOMNode **)innerNode URLElement:(DOMElement **)URLElement atPoint:(NSPoint)point allowShadowContent:(BOOL) allow
-{
-    RenderObject *renderer = m_frame->renderer();
-    if (!renderer) {
-        *innerNonSharedNode = nil;
-        *innerNode = nil;
-        *URLElement = nil;
-        return;
-    }
-
-    RenderObject::NodeInfo nodeInfo = m_frame->nodeInfoAtPoint(IntPoint(point), allow);
-    *innerNonSharedNode = [DOMNode _nodeWith:nodeInfo.innerNonSharedNode()];
-    *innerNode = [DOMNode _nodeWith:nodeInfo.innerNode()];
-    *URLElement = [DOMElement _elementWith:nodeInfo.URLElement()];
-}
-
 - (BOOL)isPointInsideSelection:(NSPoint)point
 {
@@ -1744 +1730 @@
 {
     IntPoint outerPoint(point);
-    Node* node = m_frame->nodeInfoAtPoint(outerPoint, true).innerNode();
+    Node* node = m_frame->hitTestResultAtPoint(outerPoint, true).innerNode();
     if (!node)
         return VisiblePosition();
@@ -1914 +1900 @@
         RefPtr<FrameView> v = m_frame->view();
         if (v) {
-            ClipboardMac::AccessPolicy policy = m_frame->baseURL().isLocalFile() ? ClipboardMac::Readable : ClipboardMac::TypesReadable;
+            ClipboardAccessPolicy policy = m_frame->baseURL().isLocalFile() ? ClipboardReadable : ClipboardTypesReadable;
             RefPtr<ClipboardMac> clipboard = new ClipboardMac(true, [info draggingPasteboard], policy);
             NSDragOperation srcOp = [info draggingSourceOperationMask];
@@ -1939 +1925 @@
                 }
             }
-            clipboard->setAccessPolicy(ClipboardMac::Numb);    // invalidate clipboard here for security
+            clipboard->setAccessPolicy(ClipboardNumb);    // invalidate clipboard here for security
             return op;
         }
@@ -1952 +1938 @@
         if (v) {
             // Sending an event can result in the destruction of the view and part.
-            ClipboardMac::AccessPolicy policy = m_frame->baseURL().isLocalFile() ? ClipboardMac::Readable : ClipboardMac::TypesReadable;
+            ClipboardAccessPolicy policy = m_frame->baseURL().isLocalFile() ? ClipboardReadable : ClipboardTypesReadable;
             RefPtr<ClipboardMac> clipboard = new ClipboardMac(true, [info draggingPasteboard], policy);
             clipboard->setSourceOperation([info draggingSourceOperationMask]);            
             v->cancelDragAndDrop(createMouseEventFromDraggingInfo([self window], info), clipboard.get());
-            clipboard->setAccessPolicy(ClipboardMac::Numb);    // invalidate clipboard here for security
+            clipboard->setAccessPolicy(ClipboardNumb);    // invalidate clipboard here for security
         }
     }
@@ -1967 +1953 @@
         if (v) {
             // Sending an event can result in the destruction of the view and part.
-            RefPtr<ClipboardMac> clipboard = new ClipboardMac(true, [info draggingPasteboard], ClipboardMac::Readable);
+            RefPtr<ClipboardMac> clipboard = new ClipboardMac(true, [info draggingPasteboard], ClipboardReadable);
             clipboard->setSourceOperation([info draggingSourceOperationMask]);
             BOOL result = v->performDragAndDrop(createMouseEventFromDraggingInfo([self window], info), clipboard.get());
-            clipboard->setAccessPolicy(ClipboardMac::Numb);    // invalidate clipboard here for security
+            clipboard->setAccessPolicy(ClipboardNumb);    // invalidate clipboard here for security
             return result;
         }

trunk/WebCore/dom/Document.cpp

@@ -65 +65 @@
 #include "NameNodeList.h"
 #include "NodeFilter.h"
+#include "HitTestResult.h"
 #include "NodeIterator.h"
 #include "PlatformKeyboardEvent.h"
@@ -677 +678 @@
         return 0;
 
-    RenderObject::NodeInfo nodeInfo(true, true);
-    renderer()->layer()->hitTest(nodeInfo, IntPoint(x, y)); 
-
-    Node* n = nodeInfo.innerNode();
+    HitTestResult result(true, true);
+    renderer()->layer()->hitTest(result, IntPoint(x, y)); 
+
+    Node* n = result.innerNode();
     while (n && !n->isElementNode())
         n = n->parentNode();
@@ -1674 +1675 @@
 
     assert(renderer()->isRenderView());
-    RenderObject::NodeInfo renderInfo(readonly, active, mouseMove);
+    HitTestResult renderInfo(readonly, active, mouseMove);
     renderer()->layer()->hitTest(renderInfo, point);
 

trunk/WebCore/dom/Element.h

@@ -155 +155 @@
 
     virtual bool isURLAttribute(Attribute *attr) const;
+    virtual String target() const { return String(); }
         
     virtual void focus();

trunk/WebCore/html/HTMLAnchorElement.h

@@ -81 +81 @@
     void setTabIndex(int);
 
-    String target() const;
+    virtual String target() const;
     void setTarget(const String&);
 

trunk/WebCore/html/HTMLAreaElement.cpp

@@ -27 +27 @@
 #include "HTMLNames.h"
 #include "FloatRect.h"
-#include "IntSize.h"
+#include "HitTestResult.h"
+#include "RenderObject.h"
 
 using namespace std;
@@ -69 +70 @@
 }
 
-bool HTMLAreaElement::mapMouseEvent(int x, int y, const IntSize& size, RenderObject::NodeInfo& info)
+bool HTMLAreaElement::mapMouseEvent(int x, int y, const IntSize& size, HitTestResult& info)
 {
     if (m_lastSize != size) {

trunk/WebCore/html/HTMLAreaElement.h

@@ -27 +27 @@
 
 #include "HTMLAnchorElement.h"
+#include "IntSize.h"
 #include "Path.h"
-#include "RenderObject.h" // for RenderObject::NodeInfo
 
 namespace WebCore {
+
+class HitTestResult;
 
 class HTMLAreaElement : public HTMLAnchorElement {
@@ -46 +48 @@
     bool isDefault() const { return m_shape == Default; }
 
-    bool mapMouseEvent(int x, int y, const IntSize&, RenderObject::NodeInfo&);
+    bool mapMouseEvent(int x, int y, const IntSize&, HitTestResult&);
 
     virtual IntRect getRect(RenderObject*) const;
@@ -71 +73 @@
     void setTabIndex(int);
 
-    String target() const;
+    virtual String target() const;
     void setTarget(const String&);
 

trunk/WebCore/html/HTMLBaseElement.h

@@ -39 +39 @@
 
     String href() const { return m_href; }
-    String target() const { return m_target; }
+    virtual String target() const { return m_target; }
 
     virtual void parseMappedAttribute(MappedAttribute*);

trunk/WebCore/html/HTMLFormElement.h

@@ -98 +98 @@
     void setMethod(const String&);
 
-    String target() const;
+    virtual String target() const;
     void setTarget(const String&);
 

trunk/WebCore/html/HTMLLinkElement.h

@@ -63 +63 @@
     void setRev(const String&);
 
-    String target() const;
+    virtual String target() const;
     void setTarget(const String&);
 

trunk/WebCore/html/HTMLMapElement.cpp

@@ -28 +28 @@
 #include "HTMLCollection.h"
 #include "HTMLNames.h"
+#include "IntSize.h"
+#include "HitTestResult.h"
 
 using namespace std;
@@ -51 +53 @@
 }
 
-bool HTMLMapElement::mapMouseEvent(int x, int y, const IntSize& size, RenderObject::NodeInfo& info)
+bool HTMLMapElement::mapMouseEvent(int x, int y, const IntSize& size, HitTestResult& info)
 {
     HTMLAreaElement* defaultArea = 0;

trunk/WebCore/html/HTMLMapElement.h

@@ -27 +27 @@
 
 #include "HTMLElement.h"
-#include "RenderObject.h" // for RenderObject::NodeInfo
 
 namespace WebCore {
+
+class IntSize;
+class HitTestResult;
 
 class HTMLMapElement : public HTMLElement {
@@ -44 +46 @@
     virtual void parseMappedAttribute(MappedAttribute*);
 
-    bool mapMouseEvent(int x, int y, const IntSize&, RenderObject::NodeInfo&);
+    bool mapMouseEvent(int x, int y, const IntSize&, HitTestResult&);
 
     PassRefPtr<HTMLCollection> areas();

trunk/WebCore/page/Frame.cpp

@@ -61 +61 @@
 #include "MediaFeatureNames.h"
 #include "MouseEventWithHitTestResults.h"
+#include "HitTestResult.h"
 #include "NodeList.h"
 #include "Page.h"
@@ -68 +69 @@
 #include "PluginDocument.h"
 #include "RenderListBox.h"
+#include "RenderObject.h"
 #include "RenderPart.h"
 #include "RenderTextControl.h"
@@ -1790 +1792 @@
         return false;
     
-    RenderObject::NodeInfo nodeInfo(true, true);
-    document()->renderer()->layer()->hitTest(nodeInfo, point);
-    Node *innerNode = nodeInfo.innerNode();
+    HitTestResult result(true, true);
+    document()->renderer()->layer()->hitTest(result, point);
+    Node *innerNode = result.innerNode();
     if (!innerNode || !innerNode->renderer())
         return false;
@@ -2923 +2925 @@
 }
 
-RenderObject::NodeInfo Frame::nodeInfoAtPoint(const IntPoint& point, bool allowShadowContent)
-{
-    RenderObject::NodeInfo nodeInfo(true, true);
-    renderer()->layer()->hitTest(nodeInfo, point);
+HitTestResult Frame::hitTestResultAtPoint(const IntPoint& point, bool allowShadowContent)
+{
+    HitTestResult result(true, true);
+    renderer()->layer()->hitTest(result, point);
 
     Node *n;
@@ -2933 +2935 @@
     
     while (true) {
-        n = nodeInfo.innerNode();
+        n = result.innerNode();
         if (!n || !n->renderer() || !n->renderer()->isWidget())
             break;
@@ -2948 +2950 @@
         widgetPoint.setY(widgetPoint.y() - absY + view->contentsY());
 
-        RenderObject::NodeInfo widgetNodeInfo(true, true);
-        frame->renderer()->layer()->hitTest(widgetNodeInfo, widgetPoint);
-        nodeInfo = widgetNodeInfo;
+        HitTestResult widgetHitTestResult(true, true);
+        frame->renderer()->layer()->hitTest(widgetHitTestResult, widgetPoint);
+        result = widgetHitTestResult;
+        result.setPoint(widgetPoint);
     }
     
     if (!allowShadowContent) {
-        Node* node = nodeInfo.innerNode();
+        Node* node = result.innerNode();
         if (node)
             node = node->shadowAncestorNode();
-        nodeInfo.setInnerNode(node);
-        node = nodeInfo.innerNonSharedNode();
+        result.setInnerNode(node);
+        node = result.innerNonSharedNode();
         if (node)
             node = node->shadowAncestorNode();
-        nodeInfo.setInnerNonSharedNode(node); 
-    }
-    return nodeInfo;
+        result.setInnerNonSharedNode(node); 
+    }
+    return result;
 }
 

trunk/WebCore/page/Frame.h

@@ -34 +34 @@
 #include "KURL.h"
 #include "Node.h"
-#include "RenderObject.h"
 #include "RenderLayer.h"
 #include "ScrollBar.h"
@@ -74 +73 @@
 class Plugin;
 class MouseEventWithHitTestResults;
+class HitTestResult;
 class Range;
 class RenderLayer;
+class RenderObject;
 class ResourceRequest;
 class Selection;
@@ -801 +802 @@
 #endif
 
-  RenderObject::NodeInfo nodeInfoAtPoint(const IntPoint&, bool allowShadowContent);
+  HitTestResult hitTestResultAtPoint(const IntPoint&, bool allowShadowContent);
   bool hasSelection();
   String documentTypeString() const;

trunk/WebCore/page/FrameView.cpp

@@ -41 +41 @@
 #include "MouseEvent.h"
 #include "MouseEventWithHitTestResults.h"
+#include "HitTestResult.h"
 #include "OverflowEvent.h"
 #include "PlatformKeyboardEvent.h"
@@ -1239 +1240 @@
             IntPoint vPoint = windowToContents(e.pos());
 
-            RenderObject::NodeInfo hitTestResult(true, false);
+            HitTestResult hitTestResult(true, false);
             doc->renderer()->layer()->hitTest(hitTestResult, vPoint); 
             Node *node = hitTestResult.innerNode();

trunk/WebCore/platform/mac/ClipboardMac.h

@@ -32 +32 @@
 #include "IntPoint.h"
 #include "Clipboard.h"
+#include "ClipboardAccessPolicy.h"
 #include "CachedResourceClient.h"
 
@@ -49 +50 @@
 class ClipboardMac : public Clipboard, public CachedResourceClient {
 public:
-    // security mechanisms
-    typedef enum {
-        Numb, ImageWritable, Writable, TypesReadable, Readable
-    } AccessPolicy;
-
-    ClipboardMac(bool forDragging, NSPasteboard *pasteboard, AccessPolicy policy, FrameMac *frame = 0);
+    ClipboardMac(bool forDragging, NSPasteboard *pasteboard, ClipboardAccessPolicy policy, FrameMac *frame = 0);
     virtual ~ClipboardMac();
 
@@ -87 +83 @@
 #endif
 
-    void setAccessPolicy(AccessPolicy policy);
-    AccessPolicy accessPolicy() const;
+    void setAccessPolicy(ClipboardAccessPolicy);
     void setDragHasStarted() { m_dragStarted = true; }
     
@@ -101 +96 @@
     CachedImage* m_dragImage;
     RefPtr<Node> m_dragImageElement;
-    AccessPolicy m_policy;
+    ClipboardAccessPolicy m_policy;
     int m_changeCount;
     bool m_dragStarted;

trunk/WebCore/platform/mac/ClipboardMac.mm

@@ -34 +34 @@
 namespace WebCore {
 
-ClipboardMac::ClipboardMac(bool forDragging, NSPasteboard *pasteboard, AccessPolicy policy, FrameMac *frame)
+ClipboardMac::ClipboardMac(bool forDragging, NSPasteboard *pasteboard, ClipboardAccessPolicy policy, FrameMac *frame)
   : m_pasteboard(HardRetain(pasteboard)), m_forDragging(forDragging), m_dragImage(0),
     m_policy(policy), m_dragStarted(false), m_frame(frame)
@@ -51 +51 @@
 }
 
-void ClipboardMac::setAccessPolicy(AccessPolicy policy)
+void ClipboardMac::setAccessPolicy(ClipboardAccessPolicy policy)
 {
     // once you go numb, can never go back
-    ASSERT(m_policy != Numb || policy == Numb);
+    ASSERT(m_policy != ClipboardNumb || policy == ClipboardNumb);
     m_policy = policy;
-}
-
-ClipboardMac::AccessPolicy ClipboardMac::accessPolicy() const
-{
-    return m_policy;
 }
 
@@ -122 +117 @@
 void ClipboardMac::clearData(const String &type)
 {
-    if (m_policy != Writable) {
+    if (m_policy != ClipboardWritable) {
         return;
     }
@@ -135 +130 @@
 void ClipboardMac::clearAllData()
 {
-    if (m_policy != Writable) {
+    if (m_policy != ClipboardWritable) {
         return;
     }
@@ -146 +141 @@
 {
     success = false;
-    if (m_policy != Readable) {
+    if (m_policy != ClipboardReadable) {
         return String();
     }
@@ -208 +203 @@
 bool ClipboardMac::setData(const String &type, const String &data)
 {
-    if (m_policy != Writable)
+    if (m_policy != ClipboardWritable)
         return false;
     // note NSPasteboard enforces changeCount itself on writing - can't write if not the owner
@@ -241 +236 @@
 HashSet<String> ClipboardMac::types() const
 {
-    if (m_policy != Readable && m_policy != TypesReadable)
+    if (m_policy != ClipboardReadable && m_policy != ClipboardTypesReadable)
         return HashSet<String>();
 
@@ -297 +292 @@
 void ClipboardMac::setDragImage(CachedImage* image, Node *node, const IntPoint &loc)
 {
-    if (m_policy == ImageWritable || m_policy == Writable) {
+    if (m_policy == ClipboardImageWritable || m_policy == ClipboardWritable) {
         if (m_dragImage)
             m_dragImage->deref(this);
@@ -363 +358 @@
 void ClipboardMac::setDropEffect(const String &s)
 {
-    if (m_policy == Readable || m_policy == TypesReadable) {
+    if (m_policy == ClipboardReadable || m_policy == ClipboardTypesReadable) {
         m_dropEffect = s;
     }
@@ -375 +370 @@
 void ClipboardMac::setEffectAllowed(const String &s)
 {
-    if (m_policy == Writable)
+    if (m_policy == ClipboardWritable)
         m_effectAllowed = s;
 }

trunk/WebCore/rendering/EllipsisBox.cpp

@@ -25 +25 @@
 #include "Document.h"
 #include "GraphicsContext.h"
+#include "HitTestResult.h"
 #include "TextStyle.h"
 
@@ -61 +62 @@
 }
 
-bool EllipsisBox::nodeAtPoint(RenderObject::NodeInfo& info, int x, int y, int tx, int ty)
+bool EllipsisBox::nodeAtPoint(HitTestResult& info, int x, int y, int tx, int ty)
 {
     tx += m_x;

trunk/WebCore/rendering/EllipsisBox.h

@@ -27 +27 @@
 namespace WebCore {
 
+class HitTestResult;
+
 class EllipsisBox : public InlineBox {
 public:
@@ -36 +38 @@
     {
     }
-
-    virtual void paint(RenderObject::PaintInfo&, int tx, int ty);
-    virtual bool nodeAtPoint(RenderObject::NodeInfo&, int x, int y, int tx, int ty);
+    
+    virtual void paint(RenderObject::PaintInfo& i, int _tx, int _ty);
+    virtual bool nodeAtPoint(HitTestResult& info, int _x, int _y, int _tx, int _ty);
 
 private:

trunk/WebCore/rendering/InlineBox.cpp

@@ -24 +24 @@
 
 #include "InlineFlowBox.h"
+#include "HitTestResult.h"
 #include "RenderArena.h"
 #include "RootInlineBox.h"
@@ -149 +150 @@
 }
 
-bool InlineBox::nodeAtPoint(RenderObject::NodeInfo& i, int x, int y, int tx, int ty)
+bool InlineBox::nodeAtPoint(HitTestResult& i, int x, int y, int tx, int ty)
 {
     // Hit test all phases of replaced elements atomically, as though the replaced element established its

trunk/WebCore/rendering/InlineBox.h

@@ -28 +28 @@
 namespace WebCore {
 
+class HitTestResult;
 class RootInlineBox;
 
@@ -82 +83 @@
 
     virtual void paint(RenderObject::PaintInfo&, int tx, int ty);
-    virtual bool nodeAtPoint(RenderObject::NodeInfo&, int x, int y, int tx, int ty);
+    virtual bool nodeAtPoint(HitTestResult&, int x, int y, int tx, int ty);
 
     // Overloaded new operator.

trunk/WebCore/rendering/InlineFlowBox.cpp

@@ -28 +28 @@
 #include "GraphicsContext.h"
 #include "InlineTextBox.h"
+#include "HitTestResult.h"
+#include "RootInlineBox.h"
 #include "RenderBlock.h"
 #include "RenderFlow.h"
@@ -522 +524 @@
 }
 
-bool InlineFlowBox::nodeAtPoint(RenderObject::NodeInfo& i, int x, int y, int tx, int ty)
+bool InlineFlowBox::nodeAtPoint(HitTestResult& i, int x, int y, int tx, int ty)
 {
     // Check children first.

trunk/WebCore/rendering/InlineFlowBox.h

@@ -27 +27 @@
 
 namespace WebCore {
+
+class HitTestResult;
 
 class InlineFlowBox : public InlineRunBox {
@@ -71 +73 @@
     virtual void clearTruncation();
 
-    virtual void paintBackgroundAndBorder(RenderObject::PaintInfo&, int tx, int ty);
-    void paintBackgrounds(GraphicsContext*, const Color&, const BackgroundLayer*,
-                          int my, int mh, int tx, int ty, int w, int h);
-    void paintBackground(GraphicsContext*, const Color&, const BackgroundLayer*,
-                         int my, int mh, int tx, int ty, int w, int h);
-    virtual void paintDecorations(RenderObject::PaintInfo&, int tx, int ty, bool paintedChildren = false);
-    virtual void paint(RenderObject::PaintInfo&, int tx, int ty);
-    virtual bool nodeAtPoint(RenderObject::NodeInfo&, int x, int y, int tx, int ty);
+    virtual void paintBackgroundAndBorder(RenderObject::PaintInfo& i, int _tx, int _ty);
+    void paintBackgrounds(GraphicsContext* p, const Color& c, const BackgroundLayer* bgLayer,
+                          int my, int mh, int _tx, int _ty, int w, int h);
+    void paintBackground(GraphicsContext* p, const Color& c, const BackgroundLayer* bgLayer,
+                         int my, int mh, int _tx, int _ty, int w, int h);
+    virtual void paintDecorations(RenderObject::PaintInfo& i, int _tx, int _ty, bool paintedChildren = false);
+    virtual void paint(RenderObject::PaintInfo& i, int _tx, int _ty);
+    virtual bool nodeAtPoint(HitTestResult&, int, int, int, int);
 
     int marginBorderPaddingLeft();

trunk/WebCore/rendering/InlineTextBox.cpp

@@ -29 +29 @@
 #include "Frame.h"
 #include "GraphicsContext.h"
+#include "HitTestResult.h"
 #include "Range.h"
 #include "RenderArena.h"
@@ -220 +221 @@
 }
 
-bool InlineTextBox::nodeAtPoint(RenderObject::NodeInfo& i, int x, int y, int tx, int ty)
+bool InlineTextBox::nodeAtPoint(HitTestResult& i, int x, int y, int tx, int ty)
 {
     if (isLineBreak())

trunk/WebCore/rendering/InlineTextBox.h

@@ -38 +38 @@
 class StringImpl;
 class MarkedTextUnderline;
+class HitTestResult;
 class Position;
 
@@ -70 +71 @@
     bool isSelected(int startPos, int endPos) const;
     void selectionStartEnd(int& sPos, int& ePos);
-
-    virtual void paint(RenderObject::PaintInfo&, int tx, int ty);
-    virtual bool nodeAtPoint(RenderObject::NodeInfo&, int x, int y, int tx, int ty);
+    
+    virtual void paint(RenderObject::PaintInfo& i, int tx, int ty);
+    virtual bool nodeAtPoint(HitTestResult&, int, int, int, int);
 
     RenderText* textObject() const;

trunk/WebCore/rendering/RenderBlock.cpp

@@ -30 +30 @@
 #include "GraphicsContext.h"
 #include "InlineTextBox.h"
+#include "HitTestResult.h"
 #include "RenderTableCell.h"
 #include "RenderTextFragment.h"
@@ -2499 +2500 @@
 }
 
-bool RenderBlock::isPointInScrollbar(NodeInfo& info, int _x, int _y, int _tx, int _ty)
+bool RenderBlock::isPointInScrollbar(HitTestResult& info, int _x, int _y, int _tx, int _ty)
 {
     if (!scrollsOverflow())
@@ -2529 +2530 @@
 }
 
-bool RenderBlock::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _ty, HitTestAction hitTestAction)
+bool RenderBlock::nodeAtPoint(HitTestResult& info, int _x, int _y, int _tx, int _ty, HitTestAction hitTestAction)
 {
     bool inlineFlow = isInlineFlow();

trunk/WebCore/rendering/RenderBlock.h

@@ -199 +199 @@
     int leftOffset(int y) const { return leftRelOffset(y, leftOffset(), true); }
 
-    virtual bool nodeAtPoint(NodeInfo& info, int x, int y, int tx, int ty,
+    virtual bool nodeAtPoint(HitTestResult& info, int x, int y, int tx, int ty,
                              HitTestAction hitTestAction);
 
-    virtual bool isPointInScrollbar(NodeInfo& info, int x, int y, int tx, int ty);
+    virtual bool isPointInScrollbar(HitTestResult& info, int x, int y, int tx, int ty);
 
     virtual VisiblePosition positionForCoordinates(int x, int y);

trunk/WebCore/rendering/RenderBox.cpp

@@ -255 +255 @@
 
 // Hit Testing
-bool RenderBox::nodeAtPoint(NodeInfo& info, int x, int y, int tx, int ty, HitTestAction action)
+bool RenderBox::nodeAtPoint(HitTestResult& info, int x, int y, int tx, int ty, HitTestAction action)
 {
     tx += m_x;

trunk/WebCore/rendering/RenderBox.h

@@ -44 +44 @@
     virtual void setStyle(RenderStyle*);
     virtual void paint(PaintInfo& i, int _tx, int _ty);
-    virtual bool nodeAtPoint(NodeInfo& i, int _x, int _y, int _tx, int _ty, HitTestAction hitTestAction);
+    virtual bool nodeAtPoint(HitTestResult& i, int _x, int _y, int _tx, int _ty, HitTestAction hitTestAction);
 
     virtual void destroy();

trunk/WebCore/rendering/RenderFlow.cpp

@@ -417 +417 @@
 }
 
-bool RenderFlow::hitTestLines(NodeInfo& i, int x, int y, int tx, int ty, HitTestAction hitTestAction)
+bool RenderFlow::hitTestLines(HitTestResult& i, int x, int y, int tx, int ty, HitTestAction hitTestAction)
 {
     if (hitTestAction != HitTestForeground)

trunk/WebCore/rendering/RenderFlow.h

@@ -77 +77 @@
     
     void paintLines(PaintInfo& i, int _tx, int _ty);
-    bool hitTestLines(NodeInfo& i, int x, int y, int tx, int ty, HitTestAction hitTestAction);
+    bool hitTestLines(HitTestResult& i, int x, int y, int tx, int ty, HitTestAction hitTestAction);
 
     virtual IntRect getAbsoluteRepaintRect();

trunk/WebCore/rendering/RenderForeignObject.cpp

@@ -119 +119 @@
 }
 
-bool RenderForeignObject::nodeAtPoint(NodeInfo& info, int x, int y, int tx, int ty, HitTestAction hitTestAction)
+bool RenderForeignObject::nodeAtPoint(HitTestResult& info, int x, int y, int tx, int ty, HitTestAction hitTestAction)
 {
     AffineTransform totalTransform = absoluteTransform();

trunk/WebCore/rendering/RenderForeignObject.h

@@ -47 +47 @@
     virtual void layout();
 
-    virtual bool nodeAtPoint(NodeInfo&, int x, int y, int tx, int ty, HitTestAction);
+    virtual bool nodeAtPoint(HitTestResult&, int x, int y, int tx, int ty, HitTestAction);
 
  private:

trunk/WebCore/rendering/RenderFrameSet.cpp

@@ -34 +34 @@
 #include "TextStream.h"
 #include "MouseEvent.h"
+#include "HitTestResult.h"
 #include "RenderFrame.h"
 #include "RenderView.h"
@@ -75 +76 @@
 }
 
-bool RenderFrameSet::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _ty,
+bool RenderFrameSet::nodeAtPoint(HitTestResult& info, int _x, int _y, int _tx, int _ty,
                                  HitTestAction hitTestAction)
 {

trunk/WebCore/rendering/RenderFrameSet.h

@@ -55 +55 @@
     void setResizing(bool);
 
-    virtual bool nodeAtPoint(NodeInfo&, int x, int y, int tx, int ty, HitTestAction);
+    virtual bool nodeAtPoint(HitTestResult&, int x, int y, int tx, int ty, HitTestAction);
 
     HTMLFrameSetElement* element() const

trunk/WebCore/rendering/RenderImage.cpp

@@ -35 +35 @@
 #include "HTMLMapElement.h"
 #include "HTMLNames.h"
+#include "HitTestResult.h"
 #include "RenderView.h"
 #include "TextStyle.h"
@@ -311 +312 @@
 }
 
-bool RenderImage::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _ty, HitTestAction hitTestAction)
+bool RenderImage::nodeAtPoint(HitTestResult& info, int _x, int _y, int _tx, int _ty, HitTestAction hitTestAction)
 {
     bool inside = RenderReplaced::nodeAtPoint(info, _x, _y, _tx, _ty, hitTestAction);

trunk/WebCore/rendering/RenderImage.h

@@ -69 +69 @@
     Image* image() { return m_cachedImage ? m_cachedImage->image() : nullImage(); }
 
-    virtual bool nodeAtPoint(NodeInfo&, int x, int y, int tx, int ty, HitTestAction);
+    virtual bool nodeAtPoint(HitTestResult&, int x, int y, int tx, int ty, HitTestAction);
     
     virtual int calcReplacedWidth() const;

trunk/WebCore/rendering/RenderInline.cpp

@@ -336 +336 @@
 }
 
-bool RenderInline::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _ty,
+bool RenderInline::nodeAtPoint(HitTestResult& info, int _x, int _y, int _tx, int _ty,
                                HitTestAction hitTestAction)
 {

trunk/WebCore/rendering/RenderInline.h

@@ -60 +60 @@
     virtual void paint(PaintInfo& i, int tx, int ty);
 
-    virtual bool nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _ty,
+    virtual bool nodeAtPoint(HitTestResult& info, int _x, int _y, int _tx, int _ty,
                              HitTestAction hitTestAction);
     

trunk/WebCore/rendering/RenderLayer.cpp

@@ -54 +54 @@
 #include "HTMLMarqueeElement.h"
 #include "HTMLNames.h"
+#include "HitTestResult.h"
 #include "OverflowEvent.h"
 #include "PlatformMouseEvent.h"
@@ -865 +866 @@
     
     if (currentFrame->mouseDownMayStartSelect()) {
-        RenderObject::NodeInfo renderInfo(true, false, true);
+        HitTestResult renderInfo(true, false, true);
         if (hitTest(renderInfo, currentPos)) {
             VisiblePosition pos(renderInfo.innerNode()->renderer()->positionForPoint(currentPos));
@@ -1471 +1472 @@
 }
 
-bool RenderLayer::hitTest(RenderObject::NodeInfo& info, const IntPoint& point)
+bool RenderLayer::hitTest(HitTestResult& info, const IntPoint& point)
 {
     renderer()->document()->updateLayout();
@@ -1497 +1498 @@
 }
 
-RenderLayer* RenderLayer::hitTestLayer(RenderLayer* rootLayer, RenderObject::NodeInfo& info,
-                                       const IntPoint& mousePos, const IntRect& hitTestRect)
+RenderLayer* RenderLayer::hitTestLayer(RenderLayer* rootLayer, HitTestResult& info, const IntPoint& mousePos, const IntRect& hitTestRect)
 {
     // Calculate the clip rects we should use.
@@ -1830 +1830 @@
 }
 
-void RenderLayer::updateHoverActiveState(RenderObject::NodeInfo& info)
+void RenderLayer::updateHoverActiveState(HitTestResult& info)
 {
     // We don't update :hover/:active state when the info is marked as readonly.

trunk/WebCore/rendering/RenderLayer.h

@@ -52 +52 @@
 
 class CachedResource;
+class HitTestResult;
 class RenderView;
 class RenderFrameSet;
@@ -292 +293 @@
     // layers that intersect the point from front to back.
     void paint(GraphicsContext*, const IntRect& damageRect, PaintRestriction = PaintRestrictionNone, RenderObject* paintingRoot = 0);
-    bool hitTest(RenderObject::NodeInfo&, const IntPoint&);
+    bool hitTest(HitTestResult&, const IntPoint&);
 
     // This method figures out our layerBounds in coordinates relative to
@@ -309 +310 @@
     IntRect absoluteBoundingBox() const;
 
-    void updateHoverActiveState(RenderObject::NodeInfo& info);
+    void updateHoverActiveState(HitTestResult&);
     
     IntRect repaintRect() const { return m_repaintRect; }
@@ -337 +338 @@
     void paintLayer(RenderLayer* rootLayer, GraphicsContext*, const IntRect& paintDirtyRect,
         bool haveTransparency, PaintRestriction, RenderObject* paintingRoot);
-    RenderLayer* hitTestLayer(RenderLayer* rootLayer, RenderObject::NodeInfo&, const IntPoint&, const IntRect& hitTestRect);
+    RenderLayer* hitTestLayer(RenderLayer* rootLayer, HitTestResult&, const IntPoint&, const IntRect& hitTestRect);
     void computeScrollDimensions(bool* needHBar = 0, bool* needVBar = 0);
 

trunk/WebCore/rendering/RenderListBox.cpp

@@ -33 +33 @@
 #include "HTMLOptGroupElement.h"
 #include "HTMLSelectElement.h"
+#include "HitTestResult.h"
 #include "PlatformScrollBar.h" 
 #include "RenderBR.h"
@@ -326 +327 @@
 }
 
-bool RenderListBox::isPointInScrollbar(NodeInfo& info, int _x, int _y, int _tx, int _ty)
+bool RenderListBox::isPointInScrollbar(HitTestResult& info, int _x, int _y, int _tx, int _ty)
 {
     if (!m_vBar)

trunk/WebCore/rendering/RenderListBox.h

@@ -45 +45 @@
     virtual const char* renderName() const { return "RenderListBox"; }
     virtual void paintObject(PaintInfo&, int tx, int ty);
-    virtual bool isPointInScrollbar(NodeInfo&, int x, int y, int tx, int ty);
+    virtual bool isPointInScrollbar(HitTestResult&, int x, int y, int tx, int ty);
 
     virtual bool scroll(ScrollDirection direction, ScrollGranularity granularity, float multiplier=1.0);

trunk/WebCore/rendering/RenderObject.cpp

@@ -43 +43 @@
 #include "HTMLOListElement.h"
 #include "KURL.h"
+#include "HitTestResult.h"
 #include "Position.h"
 #include "RenderArena.h"
@@ -2534 +2535 @@
 }
 
-bool RenderObject::hitTest(NodeInfo& info, int x, int y, int tx, int ty, HitTestFilter hitTestFilter)
+bool RenderObject::hitTest(HitTestResult& info, int x, int y, int tx, int ty, HitTestFilter hitTestFilter)
 {
     bool inside = false;
@@ -2557 +2558 @@
 }
 
-void RenderObject::setInnerNode(NodeInfo& info)
+void RenderObject::setInnerNode(HitTestResult& info)
 {
     if (info.innerNode())
@@ -2578 +2579 @@
 }
 
-bool RenderObject::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _ty,
+bool RenderObject::nodeAtPoint(HitTestResult& info, int _x, int _y, int _tx, int _ty,
                                HitTestAction hitTestAction)
 {

trunk/WebCore/rendering/RenderObject.h

@@ -58 +58 @@
 class InlineBox;
 class InlineFlowBox;
+class HitTestResult;
 class PlatformScrollbar;
 class Position;
@@ -491 +492 @@
     void collectDashboardRegions(Vector<DashboardRegionValue>&);
 
-    // does a query on the rendertree and finds the innernode
-    // and overURL for the given position
-    // if readonly == false, it will recalc hover styles accordingly
-    class NodeInfo {
-    public:
-        NodeInfo(bool readonly, bool active, bool mouseMove = false)
-            : m_innerNode(0), m_innerNonSharedNode(0), m_innerURLElement(0), 
-              m_scrollbar(0), m_readonly(readonly), m_active(active), m_mouseMove(mouseMove)
-            { }
-
-        Node* innerNode() const { return m_innerNode; }
-        Node* innerNonSharedNode() const { return m_innerNonSharedNode; }
-        Element* URLElement() const { return m_innerURLElement; }
-        PlatformScrollbar* scrollbar() const { return m_scrollbar; }
-        bool readonly() const { return m_readonly; }
-        bool active() const { return m_active; }
-        bool mouseMove() const { return m_mouseMove; }
-        
-        void setInnerNode(Node* n) { m_innerNode = n; }
-        void setInnerNonSharedNode(Node* n) { m_innerNonSharedNode = n; }
-        void setURLElement(Element* n) { m_innerURLElement = n; }
-        void setScrollbar(PlatformScrollbar* s) { m_scrollbar = s; }
-
-    private:
-        Node* m_innerNode;
-        Node* m_innerNonSharedNode;
-        Element* m_innerURLElement;
-        PlatformScrollbar* m_scrollbar;
-        bool m_readonly;
-        bool m_active;
-        bool m_mouseMove;
-    };
-
     // Used to signal a specific subrect within an object that must be repainted after
     // layout is complete.
@@ -533 +501 @@
     };
     
-    bool hitTest(NodeInfo& info, int x, int y, int tx, int ty, HitTestFilter hitTestFilter = HitTestAll);
-    virtual bool nodeAtPoint(NodeInfo& info, int x, int y, int tx, int ty,
+    bool hitTest(HitTestResult& info, int x, int y, int tx, int ty, HitTestFilter hitTestFilter = HitTestAll);
+    virtual bool nodeAtPoint(HitTestResult& info, int x, int y, int tx, int ty,
                              HitTestAction hitTestAction);
-    void setInnerNode(NodeInfo& info);
+    void setInnerNode(HitTestResult& info);
 
     virtual VisiblePosition positionForCoordinates(int x, int y);

trunk/WebCore/rendering/RenderPath.cpp

@@ -284 +284 @@
 }
 
-bool RenderPath::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _ty, HitTestAction hitTestAction)
+bool RenderPath::nodeAtPoint(HitTestResult& info, int _x, int _y, int _tx, int _ty, HitTestAction hitTestAction)
 {
     // We only draw in the forground phase, so we only hit-test then.

trunk/WebCore/rendering/RenderPath.h

@@ -72 +72 @@
     virtual void absoluteRects(Vector<IntRect>&, int tx, int ty);
 
-    virtual bool nodeAtPoint(NodeInfo&, int x, int y, int tx, int ty, HitTestAction);
+    virtual bool nodeAtPoint(HitTestResult&, int x, int y, int tx, int ty, HitTestAction);
     
     // FIXME: When the other SVG classes get pointer-events support this should be moved elsewhere

trunk/WebCore/rendering/RenderSVGImage.cpp

@@ -206 +206 @@
 }
 
-bool RenderSVGImage::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _ty, HitTestAction hitTestAction)
+bool RenderSVGImage::nodeAtPoint(HitTestResult& info, int _x, int _y, int _tx, int _ty, HitTestAction hitTestAction)
 {
     AffineTransform totalTransform = absoluteTransform();

trunk/WebCore/rendering/RenderSVGImage.h

@@ -55 +55 @@
         virtual void computeAbsoluteRepaintRect(IntRect&, bool f);
 
-        virtual bool nodeAtPoint(NodeInfo&, int _x, int _y, int _tx, int _ty, HitTestAction);
+        virtual bool nodeAtPoint(HitTestResult&, int _x, int _y, int _tx, int _ty, HitTestAction);
 
     private:

trunk/WebCore/rendering/RenderSVGText.cpp

@@ -96 +96 @@
 }
 
-bool RenderSVGText::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _ty, HitTestAction hitTestAction)
+bool RenderSVGText::nodeAtPoint(HitTestResult& info, int _x, int _y, int _tx, int _ty, HitTestAction hitTestAction)
 {
     AffineTransform totalTransform = absoluteTransform();

trunk/WebCore/rendering/RenderSVGText.h

@@ -42 +42 @@
     virtual void setLocalTransform(const AffineTransform& transform) { m_transform = transform; }
     virtual void paint(PaintInfo& i, int _tx, int _ty);
-    virtual bool nodeAtPoint(NodeInfo&, int x, int y, int tx, int ty, HitTestAction);
+    virtual bool nodeAtPoint(HitTestResult&, int x, int y, int tx, int ty, HitTestAction);
     virtual void absoluteRects(Vector<IntRect>&, int tx, int ty);
     virtual void computeAbsoluteRepaintRect(IntRect& r, bool f);

trunk/WebCore/rendering/RenderTableRow.cpp

@@ -139 +139 @@
 
 // Hit Testing
-bool RenderTableRow::nodeAtPoint(NodeInfo& info, int x, int y, int tx, int ty, HitTestAction action)
+bool RenderTableRow::nodeAtPoint(HitTestResult& info, int x, int y, int tx, int ty, HitTestAction action)
 {
     // Table rows cannot ever be hit tested.  Effectively they do not exist.

trunk/WebCore/rendering/RenderTableRow.h

@@ -46 +46 @@
     virtual void layout();
     virtual IntRect getAbsoluteRepaintRect();
-    virtual bool nodeAtPoint(NodeInfo& info, int x, int y, int tx, int ty, HitTestAction action);
+    virtual bool nodeAtPoint(HitTestResult& info, int x, int y, int tx, int ty, HitTestAction action);
 
     // The only time rows get a layer is when they have transparency.

trunk/WebCore/rendering/RenderTableSection.cpp

@@ -987 +987 @@
 
 // Hit Testing
-bool RenderTableSection::nodeAtPoint(NodeInfo& info, int x, int y, int tx, int ty, HitTestAction action)
+bool RenderTableSection::nodeAtPoint(HitTestResult& info, int x, int y, int tx, int ty, HitTestAction action)
 {
     // Table sections cannot ever be hit tested.  Effectively they do not exist.

trunk/WebCore/rendering/RenderTableSection.h

@@ -112 +112 @@
     virtual RenderObject* removeChildNode(RenderObject* child);
 
-    virtual bool nodeAtPoint(NodeInfo& info, int x, int y, int tx, int ty, HitTestAction action);
+    virtual bool nodeAtPoint(HitTestResult& info, int x, int y, int tx, int ty, HitTestAction action);
 
     // this gets a cell grid data structure. changing the number of

trunk/WebCore/rendering/RenderText.h

@@ -71 +71 @@
     virtual void layout() { assert(false); }
 
-    virtual bool nodeAtPoint(NodeInfo&, int, int, int, int, HitTestAction) { assert(false); return false; }
+    virtual bool nodeAtPoint(HitTestResult&, int, int, int, int, HitTestAction) { assert(false); return false; }
 
     virtual void absoluteRects(Vector<IntRect>&, int tx, int ty);

trunk/WebCore/rendering/RenderTextControl.cpp

@@ -31 +31 @@
 #include "HTMLTextAreaElement.h"
 #include "HTMLTextFieldInnerElement.h"
+#include "HitTestResult.h"
 #include "RenderTheme.h"
 #include "SelectionController.h"
@@ -345 +346 @@
 }
 
-bool RenderTextControl::nodeAtPoint(NodeInfo& info, int x, int y, int tx, int ty, HitTestAction hitTestAction)
+bool RenderTextControl::nodeAtPoint(HitTestResult& info, int x, int y, int tx, int ty, HitTestAction hitTestAction)
 {
     // If we're within the text control, we want to act as if we've hit the inner div, incase the point 

trunk/WebCore/rendering/RenderTextControl.h

@@ -41 +41 @@
     virtual bool canHaveChildren() const { return false; }
     virtual short baselinePosition( bool, bool ) const;
-    virtual bool nodeAtPoint(NodeInfo&, int x, int y, int tx, int ty, HitTestAction);
+    virtual bool nodeAtPoint(HitTestResult&, int x, int y, int tx, int ty, HitTestAction);
                              
     RenderStyle* createDivStyle(RenderStyle* startStyle);

trunk/WebCore/rendering/RootInlineBox.cpp

@@ -31 +31 @@
 #include "FrameMac.h"
 #endif
+#include "HitTestResult.h"
 
 using namespace std;
@@ -142 +143 @@
 }
 
-bool RootInlineBox::nodeAtPoint(RenderObject::NodeInfo& i, int x, int y, int tx, int ty)
+bool RootInlineBox::nodeAtPoint(HitTestResult& i, int x, int y, int tx, int ty)
 {
     if (m_ellipsisBox && object()->style()->visibility() == VISIBLE) {

trunk/WebCore/rendering/RootInlineBox.h

@@ -30 +30 @@
 
 class EllipsisBox;
+class HitTestResult;
+
 struct GapRects;
 
@@ -86 +88 @@
 
     EllipsisBox* ellipsisBox() const { return m_ellipsisBox; }
-    void paintEllipsisBox(RenderObject::PaintInfo&, int tx, int ty) const;
-    bool hitTestEllipsisBox(RenderObject::NodeInfo&, int x, int y, int tx, int ty, HitTestAction, bool inBox);
+
+    void paintEllipsisBox(RenderObject::PaintInfo& i, int _tx, int _ty) const;
+    bool hitTestEllipsisBox(HitTestResult& info, int _x, int _y, int _tx, int _ty,
+                            HitTestAction hitTestAction, bool inBox);
     
     virtual void clearTruncation();
@@ -96 +100 @@
 #endif
 
-    virtual void paint(RenderObject::PaintInfo&, int tx, int ty);
-    virtual bool nodeAtPoint(RenderObject::NodeInfo&, int x, int y, int tx, int ty);
+    virtual void paint(RenderObject::PaintInfo& i, int _tx, int _ty);
+    virtual bool nodeAtPoint(HitTestResult&, int, int, int, int);
 
     bool hasSelectedChildren() const { return m_hasSelectedChildren; }

trunk/WebKit/ChangeLog

@@ +1 @@
+2006-10-28  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Darin.
+
+        This is the WebKit half of pushing the guts of elementAtPoint and 
+        WebElementDictionary into WebCore. Among other things, this patch 
+        makes WebElementDictionary.m and WebHTMLView.m Objective-C++
+
+        * MigrateHeaders.make: Add DOMElementInternal.h to the list of 
+        headers to migrate.
+        * Misc/WebElementDictionary.h: Replaced DOMNode, DOMElement, and 
+        NSPoint member variables with a HitTestResult member variable.
+        * Misc/WebElementDictionary.m:
+        (addLookupKey): Formatting.
+        (-[WebElementDictionary initWithHitTestResult:]): Constructor just 
+        takes a HitTestResult now and sets the member variable.
+        (-[WebElementDictionary dealloc]): delete HitTestResult.
+        (-[WebElementDictionary finalize]): Address HitTestResult.
+        (-[WebElementDictionary _domNode]): Use HitTestResult and call into 
+        WebCore.
+        (-[WebElementDictionary objectForKey:]): Same.
+        (-[WebElementDictionary _webFrame]): Same.
+        (-[WebElementDictionary _targetWebFrame]): Same.
+        (-[WebElementDictionary _title]): Same.
+        (-[WebElementDictionary _imageRect]): Same.
+        (-[WebElementDictionary _isSelected]): Same.
+        * WebKit.xcodeproj/project.pbxproj:
+        * WebView/WebFrame.mm:
+        (core): Convert from DOMNode* to Node*
+        (kit): Convert from Node* to DOMNode*
+        * WebView/WebFrameInternal.h: Support for the above.
+        * WebView/WebHTMLView.m:
+        (-[WebHTMLView elementAtPoint:allowShadowContent:]): Call directly 
+        into Frame.cpp to get HitTestResult.
+
 2006-10-27  Maciej Stachowiak  <mjs@apple.com>
 

trunk/WebKit/MigrateHeaders.make

@@ -156 +156 @@
     $(PUBLIC_HEADERS_DIR)/DOMNamedNodeMap.h \
     $(PUBLIC_HEADERS_DIR)/DOMNode.h \
+    $(INTERNAL_HEADERS_DIR)/DOMNodeInternal.h \
     $(PRIVATE_HEADERS_DIR)/DOMNodePrivate.h \
     $(PUBLIC_HEADERS_DIR)/DOMNodeFilter.h \

trunk/WebKit/Misc/WebElementDictionary.h

@@ -29 +29 @@
 #import <Foundation/NSDictionary.h>
 
-@class DOMNode;
-@class DOMElement;
+namespace WebCore { 
+    class HitTestResult;
+}
 
 @interface WebElementDictionary : NSDictionary {
-    DOMNode *_innerNode;
-    DOMNode *_innerNonSharedNode;
-    DOMElement *_URLElement;
+    WebCore::HitTestResult* _result;
     NSMutableDictionary *_cache;
     NSMutableSet *_nilValues;
-    NSPoint _point;
     BOOL _cacheComplete;
 }
-- (id)initWithInnerNonSharedNode:(DOMNode *)innerNonSharedNode innerNode:(DOMNode *)innerNode URLElement:(DOMElement *)URLElement andPoint:(NSPoint)point;
+- (id)initWithHitTestResult:(const WebCore::HitTestResult&)result;
 @end

trunk/WebKit/Misc/WebElementDictionary.m

@@ -38 +38 @@
 #import <WebKit/DOMCore.h>
 #import <WebKit/DOMExtensions.h>
+#import <WebCore/FrameMac.h>
+#import <WebCore/HitTestResult.h>
+
+using namespace WebCore;
 
 typedef enum {
@@ -55 +59 @@
 static void addLookupKey(NSString *key, SEL selector, WebElementTargetObject target)
 {
-    WebElementMethod *elementMethod = static_cast<WebElementMethod*>(malloc(sizeof(WebElementMethod)));
+    WebElementMethod* elementMethod = static_cast<WebElementMethod*>(malloc(sizeof(WebElementMethod)));
     elementMethod->target = target;
     elementMethod->selector = selector;
@@ -89 +93 @@
 }
 
-- (id)initWithInnerNonSharedNode:(DOMNode *)innerNonSharedNode innerNode:(DOMNode *)innerNode URLElement:(DOMElement *)URLElement andPoint:(NSPoint)point
+- (id)initWithHitTestResult:(const HitTestResult&)result
 {
     [[self class] initializeLookupTable];
     [super init];
-    _point = point;
-    _innerNode = [innerNode retain];
-    _innerNonSharedNode = [innerNonSharedNode retain];
-    _URLElement = [URLElement retain];
+    _result = new HitTestResult(result);
     return self;
 }
@@ -102 +103 @@
 - (void)dealloc
 {
-    [_innerNode release];
-    [_innerNonSharedNode release];
-    [_URLElement release];
+    delete _result;
     [_cache release];
     [_nilValues release];
@@ -110 +109 @@
 }
 
+- (void)finalize
+{
+    delete _result;
+    [super finalize];
+}
+
 - (void)_fillCache
 {
@@ -128 +133 @@
         [self _fillCache];
     return [_cache keyEnumerator];
+}
+
+- (DOMNode *)_domNode
+{
+    return kit(_result->innerNonSharedNode());
 }
 
@@ -146 +156 @@
             break;
         case WebElementInnerNonSharedNode:
-            target = _innerNonSharedNode;
+            target = [self _domNode];
             break;
         case WebElementInnerNode:
-            target = _innerNode;
+            target = kit(_result->innerNode());
             break;
         case WebElementURLElement:
-            target = _URLElement;
+            target = kit(_result->URLElement());
             break;
     }
@@ -176 +186 @@
 }
 
-- (DOMNode *)_domNode
-{
-    return [[_innerNonSharedNode retain] autorelease];
-}
-
 - (WebFrame *)_webFrame
 {
-    return [[_innerNonSharedNode ownerDocument] webFrame];
+    return [[[self _domNode] ownerDocument] webFrame];
 }
 
 - (WebFrame *)_targetWebFrame
 {
-    if (!_URLElement || ![_URLElement respondsToSelector:@selector(target)])
-        return nil;
-    WebFrame *webFrame = [[_innerNonSharedNode ownerDocument] webFrame];
-    NSString *targetName = [_URLElement performSelector:@selector(target)];
-    if ([targetName length])
-        return [webFrame findFrameNamed:targetName];
-    return webFrame;
+    FrameMac* webCoreFrame = Mac(_result->targetFrame());
+    return kit(webCoreFrame);
 }
 
 - (NSString *)_title
 {
-    // Find the title in the nearest enclosing DOM node.
-    // For <area> tags in image maps, walk the tree for the <area>, not the <img> using it.
-    for (DOMNode *titleNode = _innerNode; titleNode; titleNode = [titleNode parentNode]) {
-        if ([titleNode isKindOfClass:[DOMHTMLElement class]]) {
-            NSString *title = [(DOMHTMLElement *)titleNode titleDisplayString];
-            if ([title length])
-                return title;
-        }
-    }
+    return _result->title();
+}
+
+- (NSValue *)_imageRect
+{
+    if ([self objectForKey:WebElementImageURLKey])
+        return [NSValue valueWithRect:_result->boundingBox()];
     return nil;
 }
 
-- (NSValue *)_imageRect
-{
-    if ([self objectForKey:WebElementImageURLKey])
-        return [NSValue valueWithRect:[_innerNonSharedNode boundingBox]];
-    return nil;
-}
-
 - (NSNumber *)_isSelected
 {
-    return [NSNumber numberWithBool:[[[[_innerNonSharedNode ownerDocument] webFrame] _bridge] isPointInsideSelection:_point]];
+    return [NSNumber numberWithBool:_result->isSelected()];
 }
 @end

trunk/WebKit/WebKit.xcodeproj/project.pbxproj

@@ -1231 +1231 @@
                         isa = PBXProject;
                         buildConfigurationList = 149C283208902B0F008A9EFC /* Build configuration list for PBXProject "WebKit" */;
-                        compatibilityVersion = "Xcode 2.4";
                         hasScannedForEncodings = 1;
                         knownRegions = (
@@ -1245 +1244 @@
                         productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
                         projectDirPath = "";
-                        projectRoot = "";
-                        shouldCheckCompatibility = 1;
                         targets = (
                                 9398100A0824BF01008DF038 /* WebKit */,

trunk/WebKit/WebView/WebFrame.mm

@@ -32 +32 @@
 #import "DOMElementInternal.h"
 #import "DOMHTMLElementInternal.h"
+#import "DOMNodeInternal.h"
 #import "DOMRangeInternal.h"
 #import "WebBackForwardList.h"
@@ -72 +73 @@
 #import <WebKit/DOMElement.h>
 #import <WebKit/DOMHTMLElement.h>
+#import <WebKit/DOMNode.h>
 #import <WebKit/DOMRange.h>
 
@@ -158 +160 @@
 {
     return [DOMElement _elementWith:element];
+}
+
+Node* core(DOMNode *node)
+{
+    return [node _node];
+}
+
+DOMNode *kit(Node* node)
+{
+    return [DOMNode _nodeWith:node];
 }
 

trunk/WebKit/WebView/WebFrameInternal.h

@@ -36 +36 @@
 
 @class DOMElement;
+@class DOMNode;
 @class DOMRange;
 @class WebInspector;
@@ -53 +54 @@
     class FrameLoader;
     class HTMLElement;
+    class Node;
     class Range;
 }
@@ -61 +63 @@
 WebCore::Element* core(DOMElement *);
 DOMElement *kit(WebCore::Element*);
+
+WebCore::Node* core(DOMNode *);
+DOMNode *kit(WebCore::Node*);
 
 WebCore::Document* core(DOMDocument *);

trunk/WebKit/WebView/WebHTMLView.m

@@ -69 +69 @@
 #import <WebCore/FloatRect.h>
 #import <WebCore/FrameMac.h>
+#import <WebCore/HitTestResult.h>
 #import <WebCore/SelectionController.h>
 #import <WebCore/WebCoreTextRenderer.h>
@@ -6043 +6044 @@
 - (NSDictionary *)elementAtPoint:(NSPoint)point allowShadowContent:(BOOL)allow;
 {
-    DOMNode *innerNode = nil;
-    DOMNode *innerNonSharedNode = nil;
-    DOMElement *URLElement = nil;
-    [[self _bridge] getInnerNonSharedNode:&innerNonSharedNode innerNode:&innerNode URLElement:&URLElement atPoint:point allowShadowContent:allow];
-    NSView *innerView = [[[[innerNonSharedNode ownerDocument] webFrame] frameView] documentView];
-    NSPoint innerPoint = innerView ? [self convertPoint:point toView:innerView] : point;
-    return [[[WebElementDictionary alloc] initWithInnerNonSharedNode:innerNonSharedNode innerNode:innerNode URLElement:URLElement andPoint:innerPoint] autorelease];
+    Frame* frame = core([self _frame]);
+    HitTestResult result(true, false);
+    if (frame->renderer())
+        result = frame->hitTestResultAtPoint(IntPoint(point), allow);
+    return [[[WebElementDictionary alloc] initWithHitTestResult:result] autorelease];
 }