Changeset 162361 in webkit

Timestamp:

Jan 20, 2014 11:25:01 AM (10 years ago)

Author:

timothy@apple.com

Message:

Fix jumping to a text position when showing a resource.

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

Reviewed by Joseph Pecoraro.

• UserInterface/FrameContentView.js:

(WebInspector.FrameContentView.prototype.showSourceCode): Just use showResponse's arguments
which already does the same logic to call revealPosition.

• UserInterface/ResourceClusterContentView.js:

(WebInspector.ResourceClusterContentView.prototype.restoreFromCookie): This was the bug.
lineNumber and columnNumber need honored here. They were only honored by FrameContentView.

• UserInterface/ResourceSidebarPanel.js:

(WebInspector.ResourceSidebarPanel.prototype.showSourceCode): Use showContentViewForRepresentedObject
which also accepts a cookie and handles creating the content view for us.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/FrameContentView.js (modified) (1 diff)
• UserInterface/ResourceClusterContentView.js (modified) (1 diff)
• UserInterface/ResourceSidebarPanel.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2014-01-20  Timothy Hatcher  <timothy@apple.com>
+
+        Fix jumping to a text position when showing a resource.
+
+        https://bugs.webkit.org/show_bug.cgi?id=127271
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/FrameContentView.js:
+        (WebInspector.FrameContentView.prototype.showSourceCode): Just use showResponse's arguments
+        which already does the same logic to call revealPosition.
+        * UserInterface/ResourceClusterContentView.js:
+        (WebInspector.ResourceClusterContentView.prototype.restoreFromCookie): This was the bug.
+        lineNumber and columnNumber need honored here. They were only honored by FrameContentView.
+        * UserInterface/ResourceSidebarPanel.js:
+        (WebInspector.ResourceSidebarPanel.prototype.showSourceCode): Use showContentViewForRepresentedObject
+        which also accepts a cookie and handles creating the content view for us.
+
 2014-01-16  Brian Burg  <bburg@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/FrameContentView.js

@@ -125 +125 @@
             return null;
 
-        var responseContentView = resourceContentView.showResponse();
-        if (typeof responseContentView.revealPosition === "function")
-            responseContentView.revealPosition(positionToReveal, textRangeToSelect, forceUnformatted);
-
-        return resourceContentView;
+        return resourceContentView.showResponse(positionToReveal, textRangeToSelect, forceUnformatted);
     },
 

trunk/Source/WebInspectorUI/UserInterface/ResourceClusterContentView.js

@@ -150 +150 @@
     restoreFromCookie: function(cookie)
     {
-        var viewIdentifier = cookie[WebInspector.ResourceClusterContentView.ContentViewIdentifierCookieKey];
-        this._showContentViewForIdentifier(viewIdentifier);
+        var contentView = this._showContentViewForIdentifier(cookie[WebInspector.ResourceClusterContentView.ContentViewIdentifierCookieKey]);
+        if (typeof contentView.revealPosition === "function" && "lineNumber" in cookie && "columnNumber" in cookie)
+            contentView.revealPosition(new WebInspector.SourceCodePosition(cookie.lineNumber, cookie.columnNumber));
     },
 

trunk/Source/WebInspectorUI/UserInterface/ResourceSidebarPanel.js

@@ -159 +159 @@
             representedObject = representedObject.parentFrame;
 
-        var newContentView = WebInspector.contentBrowser.contentViewForRepresentedObject(representedObject);
         var cookie = positionToReveal ? {lineNumber: positionToReveal.lineNumber, columnNumber: positionToReveal.columnNumber} : {};
-
-        WebInspector.contentBrowser.showContentView(newContentView, cookie);
+        WebInspector.contentBrowser.showContentViewForRepresentedObject(representedObject, cookie);
     },