Changeset 56931 in webkit

Timestamp:

Apr 1, 2010 12:58:34 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-01 Ilya Tikhonovsky <​loislo@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: Sometimes js code can detach page from it's frame and in that case
Dispatch Events will stay in the TimelineAgent's events stack. Only immediate events will
appear at frontend.
​https://bugs.webkit.org/show_bug.cgi?id=36890

• bindings/v8/V8Proxy.cpp: (WebCore::V8Proxy::callFunction):
• dom/Node.cpp: (WebCore::Node::dispatchGenericEvent):
• page/DOMWindow.cpp: (WebCore::DOMWindow::dispatchEvent):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/V8Proxy.cpp (modified) (2 diffs)
• dom/Node.cpp (modified) (2 diffs)
• page/DOMWindow.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-01  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: Sometimes js code can detach page from it's frame and in that case
+        Dispatch Events will stay in the TimelineAgent's events stack. Only immediate events will
+        appear at frontend.
+        https://bugs.webkit.org/show_bug.cgi?id=36890
+
+        * bindings/v8/V8Proxy.cpp:
+        (WebCore::V8Proxy::callFunction):
+        * dom/Node.cpp:
+        (WebCore::Node::dispatchGenericEvent):
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::dispatchEvent):
+
 2010-04-01  Chris Fleizach  <cfleizach@apple.com>
 

trunk/WebCore/bindings/v8/V8Proxy.cpp

@@ -477 +477 @@
 
 #if ENABLE(INSPECTOR)
-        InspectorTimelineAgent* timelineAgent = 0;
-        if (InspectorTimelineAgent::instanceCount()) {
-            timelineAgent = m_frame->page() ? m_frame->page()->inspectorTimelineAgent() : 0;
-            if (timelineAgent) {
+        Page* inspectedPage = InspectorTimelineAgent::instanceCount() ? m_frame->page(): 0;
+        if (inspectedPage)
+            if (InspectorTimelineAgent* timelineAgent = inspectedPage->inspectorTimelineAgent()) {
                 v8::ScriptOrigin origin = function->GetScriptOrigin();
-                if (!origin.ResourceName().IsEmpty())
-                    timelineAgent->willCallFunction(v8ValueToWebCoreString(origin.ResourceName()), function->GetScriptLineNumber() + 1);
-                else
-                    timelineAgent = 0;
-            }
-        }
+                String resourceName("undefined");
+                int lineNumber = 1;
+                if (!origin.ResourceName().IsEmpty()) {
+                    resourceName = toWebCoreString(origin.ResourceName());
+                    lineNumber = function->GetScriptLineNumber() + 1;
+                }
+                timelineAgent->willCallFunction(resourceName, lineNumber);
+            } else
+                inspectedPage = 0;
 #endif // !ENABLE(INSPECTOR)
 
@@ -495 +497 @@
 
 #if ENABLE(INSPECTOR)
-        if (timelineAgent && m_frame->page() && timelineAgent == m_frame->page()->inspectorTimelineAgent())
-            timelineAgent->didCallFunction();
+        if (inspectedPage)
+            if (InspectorTimelineAgent* timelineAgent = inspectedPage->inspectorTimelineAgent())
+                timelineAgent->didCallFunction();
 #endif // !ENABLE(INSPECTOR)
 

trunk/WebCore/dom/Node.cpp

@@ -2611 +2611 @@
 
 #if ENABLE(INSPECTOR)
-    InspectorTimelineAgent* timelineAgent = document()->inspectorTimelineAgent();
-    bool timelineAgentIsActive = timelineAgent && eventHasListeners(event->type(), targetForWindowEvents, this, ancestors);
-    if (timelineAgentIsActive)
-        timelineAgent->willDispatchEvent(*event);
+    Page* inspectedPage = InspectorTimelineAgent::instanceCount() ? document()->page() : 0;
+    if (inspectedPage)
+        if (InspectorTimelineAgent* timelineAgent = eventHasListeners(event->type(), targetForWindowEvents, this, ancestors) ? inspectedPage->inspectorTimelineAgent() : 0)
+            timelineAgent->willDispatchEvent(*event);
+        else
+            inspectedPage = 0;
 #endif
 
@@ -2698 +2700 @@
 doneWithDefault:
 #if ENABLE(INSPECTOR)
-    if (timelineAgentIsActive && (timelineAgent = document()->inspectorTimelineAgent()))
-        timelineAgent->didDispatchEvent();
+    if (inspectedPage)
+        if (InspectorTimelineAgent* timelineAgent = inspectedPage->inspectorTimelineAgent())
+            timelineAgent->didDispatchEvent();
 #endif
 

trunk/WebCore/page/DOMWindow.cpp

@@ -1434 +1434 @@
 
 #if ENABLE(INSPECTOR)
-    InspectorTimelineAgent* timelineAgent = inspectorTimelineAgent();
-    bool timelineAgentIsActive = timelineAgent && hasEventListeners(event->type());
-    if (timelineAgentIsActive)
-        timelineAgent->willDispatchEvent(*event);
+    Page* inspectedPage = InspectorTimelineAgent::instanceCount() && frame() ? frame()->page() : 0;
+    if (inspectedPage)
+        if (InspectorTimelineAgent* timelineAgent = hasEventListeners(event->type()) ? inspectedPage->inspectorTimelineAgent() : 0)
+            timelineAgent->willDispatchEvent(*event);
+        else
+            inspectedPage = 0;
 #endif
 
@@ -1443 +1445 @@
 
 #if ENABLE(INSPECTOR)
-    if (timelineAgentIsActive) {
-      timelineAgent = inspectorTimelineAgent();
-      if (timelineAgent)
+    if (inspectedPage)
+        if (InspectorTimelineAgent* timelineAgent = inspectedPage->inspectorTimelineAgent())
             timelineAgent->didDispatchEvent();
-    }
 #endif