Changeset 191081 in webkit

Timestamp:

Oct 14, 2015 8:53:49 PM (9 years ago)

Author:

commit-queue@webkit.org

Message:

REGRESSION: Web Inspector hangs for many seconds when trying to reload page
​https://bugs.webkit.org/show_bug.cgi?id=150065

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2015-10-14
Reviewed by Mark Lam.

When debugging Web Pages, the same Debugger (PageScriptDebugServer) is
attached to each of the different JSGlobalObjects on the page. This could
mean multiple frames or isolated scripting contexts. Therefore we should
only need to send sourceParsed events to the frontend for scripts within
this new JSGlobalObject, not any JSGlobalObject that has this debugger.

• debugger/Debugger.cpp:

(JSC::Debugger::attach):
Only send sourceParsed events for Scripts in this JSGlobalObject.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• debugger/Debugger.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-10-14  Joseph Pecoraro  <pecoraro@apple.com>
+
+        REGRESSION: Web Inspector hangs for many seconds when trying to reload page
+        https://bugs.webkit.org/show_bug.cgi?id=150065
+
+        Reviewed by Mark Lam.
+
+        When debugging Web Pages, the same Debugger (PageScriptDebugServer) is
+        attached to each of the different JSGlobalObjects on the page. This could
+        mean multiple frames or isolated scripting contexts. Therefore we should
+        only need to send sourceParsed events to the frontend for scripts within
+        this new JSGlobalObject, not any JSGlobalObject that has this debugger.
+
+        * debugger/Debugger.cpp:
+        (JSC::Debugger::attach):
+        Only send sourceParsed events for Scripts in this JSGlobalObject.
+
 2015-10-14  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/JavaScriptCore/debugger/Debugger.cpp

@@ -42 +42 @@
 struct GatherSourceProviders : public MarkedBlock::VoidFunctor {
     HashSet<SourceProvider*> sourceProviders;
-    JSC::Debugger* m_debugger;
-
-    GatherSourceProviders(JSC::Debugger* debugger)
-        : m_debugger(debugger) { }
+    JSGlobalObject* m_globalObject;
+
+    GatherSourceProviders(JSGlobalObject* globalObject)
+        : m_globalObject(globalObject) { }
 
     IterationStatus operator()(JSCell* cell)
@@ -53 +53 @@
             return IterationStatus::Continue;
 
-        if (function->scope()->globalObject()->debugger() != m_debugger)
+        if (function->scope()->globalObject() != m_globalObject)
             return IterationStatus::Continue;
 
@@ -144 +144 @@
     m_globalObjects.add(globalObject);
 
-    // Call sourceParsed() because it will execute JavaScript in the inspector.
-    GatherSourceProviders gatherSourceProviders(this);
+    // Call sourceParsed because it will execute JavaScript in the inspector.
+    GatherSourceProviders gatherSourceProviders(globalObject);
     {
         HeapIterationScope iterationScope(m_vm.heap);