Title: [173547] trunk/Source/WebInspectorUI
Revision
173547
Author
[email protected]
Date
2014-09-11 16:12:53 -0700 (Thu, 11 Sep 2014)

Log Message

Web Inspector: Fix assert in QuickConsole - main frame execution context path component
https://bugs.webkit.org/show_bug.cgi?id=136748

Patch by Joseph Pecoraro <[email protected]> on 2014-09-11
Reviewed by Timothy Hatcher.

This can get called for the MainFrame on page navigations.
In such cases we can return a better result from this method.

* UserInterface/Views/QuickConsole.js:
(WebInspector.QuickConsole.prototype._insertExecutionContextPathComponentForFrame):

Modified Paths

Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (173546 => 173547)


--- trunk/Source/WebInspectorUI/ChangeLog	2014-09-11 22:46:00 UTC (rev 173546)
+++ trunk/Source/WebInspectorUI/ChangeLog	2014-09-11 23:12:53 UTC (rev 173547)
@@ -1,5 +1,18 @@
 2014-09-11  Joseph Pecoraro  <[email protected]>
 
+        Web Inspector: Fix assert in QuickConsole - main frame execution context path component
+        https://bugs.webkit.org/show_bug.cgi?id=136748
+
+        Reviewed by Timothy Hatcher.
+
+        This can get called for the MainFrame on page navigations.
+        In such cases we can return a better result from this method.
+
+        * UserInterface/Views/QuickConsole.js:
+        (WebInspector.QuickConsole.prototype._insertExecutionContextPathComponentForFrame):
+
+2014-09-11  Joseph Pecoraro  <[email protected]>
+
         Web Inspector: Hide DOM search result highlights when find banner is not showing
         https://bugs.webkit.org/show_bug.cgi?id=136749
 

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/QuickConsole.js (173546 => 173547)


--- trunk/Source/WebInspectorUI/UserInterface/Views/QuickConsole.js	2014-09-11 22:46:00 UTC (rev 173546)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/QuickConsole.js	2014-09-11 23:12:53 UTC (rev 173547)
@@ -246,9 +246,8 @@
 
     _insertExecutionContextPathComponentForFrame: function(frame, skipRebuild)
     {
-        console.assert(!frame.isMainFrame());
         if (frame.isMainFrame())
-            return null;
+            return this._mainFrameExecutionContextPathComponent;
 
         console.assert(!this._frameIdentifierToExecutionContextPathComponentMap[frame.id]);
         if (this._frameIdentifierToExecutionContextPathComponentMap[frame.id])
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to