Changeset 112305 in webkit

Timestamp:

Mar 27, 2012 1:08:07 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

<​http://webkit.org/b/82362> Web Inspector: Provide private -[DOMNode inspect]

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2012-03-27
Reviewed by Timothy Hatcher.

No new tests, this is only an ObjC SPI.

• bindings/objc/DOM.mm:
• bindings/objc/DOMPrivate.h:

(-[DOMNode inspect]):
Call through to InspectorController inspect for the node.

• inspector/InspectorDOMAgent.cpp:

(WebCore::InspectorDOMAgent::handleMousePress):
(WebCore::InspectorDOMAgent::inspect):
Whenever we inspect an element, clear the node search.
The frontend already takes this approach.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/objc/DOM.mm (modified) (2 diffs)
• bindings/objc/DOMPrivate.h (modified) (1 diff)
• inspector/InspectorDOMAgent.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-27  Joseph Pecoraro  <pecoraro@apple.com>
+
+        <http://webkit.org/b/82362> Web Inspector: Provide private -[DOMNode inspect]
+
+        Reviewed by Timothy Hatcher.
+
+        No new tests, this is only an ObjC SPI.
+
+        * bindings/objc/DOM.mm:
+        * bindings/objc/DOMPrivate.h:
+        (-[DOMNode inspect]):
+        Call through to InspectorController inspect for the node.
+
+        * inspector/InspectorDOMAgent.cpp:
+        (WebCore::InspectorDOMAgent::handleMousePress):
+        (WebCore::InspectorDOMAgent::inspect):
+        Whenever we inspect an element, clear the node search.
+        The frontend already takes this approach.
+
 2012-03-27  Joe Mason  <jmason@rim.com>
 

trunk/Source/WebCore/bindings/objc/DOM.mm

@@ -44 +44 @@
 #import "WebScriptObjectPrivate.h"
 #import <wtf/HashMap.h>
+
+#if ENABLE(INSPECTOR)
+#import "InspectorController.h"
+#import "Page.h"
+#endif
 
 #if ENABLE(SVG_DOM_OBJC_BINDINGS)
@@ -390 +395 @@
     return kit(rects);
 }
+
+- (void)inspect
+{
+#if ENABLE(INSPECTOR)
+    WebCore::Node* node = core(self);
+    if (WebCore::Document* document = node->document()) {
+        if (WebCore::Page* page = document->page())
+            page->inspectorController()->inspect(node);
+    }
+#endif
+}
+
 @end
 

trunk/Source/WebCore/bindings/objc/DOMPrivate.h

@@ -30 +30 @@
 - (NSImage *)renderedImage;
 - (NSArray *)textRects;
+- (void)inspect;
 @end
 

trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp

@@ -915 +915 @@
     if (m_highlightData && m_highlightData->node) {
         RefPtr<Node> node = m_highlightData->node;
-        setSearchingForNode(false, 0);
         inspect(node.get());
     }
@@ -923 +922 @@
 void InspectorDOMAgent::inspect(Node* node)
 {
+    setSearchingForNode(false, 0);
+
     if (node->nodeType() != Node::ELEMENT_NODE && node->nodeType() != Node::DOCUMENT_NODE)
         node = node->parentNode();