Changeset 57337 in webkit

Timestamp:

Apr 9, 2010 6:44:44 AM (14 years ago)

Author:

pfeldman@chromium.org

Message:

2010-04-09 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: Cannot select elements within iframes with the magnifying glass.

​https://bugs.webkit.org/show_bug.cgi?id=31732

• inspector/InspectorController.cpp: (WebCore::InspectorController::inspect): (WebCore::InspectorController::handleMousePress):
• inspector/InspectorController.h:
• page/EventHandler.cpp: (WebCore::EventHandler::handleMousePressEvent):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorController.cpp (modified) (3 diffs)
• inspector/InspectorController.h (modified) (1 diff)
• page/EventHandler.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-09  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: Cannot select elements within iframes with the magnifying glass.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31732
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::inspect):
+        (WebCore::InspectorController::handleMousePress):
+        * inspector/InspectorController.h:
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleMousePressEvent):
+
 2010-04-09  Tasuku Suzuki  <tasuku.suzuki@nokia.com>
 

trunk/WebCore/inspector/InspectorController.cpp

@@ -226 +226 @@
 }
 
-// Trying to inspect something in a frame with JavaScript disabled would later lead to
-// crashes trying to create JavaScript wrappers. Some day we could fix this issue, but
-// for now prevent crashes here by never targeting a node in such a frame.
-static bool canPassNodeToJavaScript(Node* node)
-{
-    if (!node)
-        return false;
-    Frame* frame = node->document()->frame();
-    return frame && frame->script()->canExecuteScripts(NotAboutToExecuteScript);
-}
-
 void InspectorController::inspect(Node* node)
 {
-    if (!canPassNodeToJavaScript(node) || !enabled())
+    if (!enabled())
         return;
 
@@ -386 +375 @@
 }
 
-void InspectorController::handleMousePressOnNode(Node* node)
+void InspectorController::handleMousePress()
 {
     if (!enabled())
@@ -392 +381 @@
 
     ASSERT(m_searchingForNode);
-    ASSERT(node);
-    if (!node)
-        return;
-
+    if (!m_highlightedNode)
+        return;
+
+    RefPtr<Node> node = m_highlightedNode;
     setSearchingForNode(false);
-    inspect(node);
+    inspect(node.get());
 }
 

trunk/WebCore/inspector/InspectorController.h

@@ -144 +144 @@
     bool searchingForNodeInPage() const { return m_searchingForNode; }
     void mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags);
-    void handleMousePressOnNode(Node*);
+    void handleMousePress();
 
     void setInspectorFrontendClient(PassOwnPtr<InspectorFrontendClient> client);

trunk/WebCore/page/EventHandler.cpp

@@ -1205 +1205 @@
         InspectorController* inspector = page->inspectorController();
         if (inspector && inspector->enabled() && inspector->searchingForNodeInPage()) {
-            inspector->handleMousePressOnNode(m_mousePressNode.get());
+            inspector->handleMousePress();
             invalidateClick();
             return true;