Changeset 181386 in webkit

Timestamp:

Mar 11, 2015 7:09:29 AM (9 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: SearchResultTreeElement.representedObject is missing a saveIdentityToCookie implementation
​https://bugs.webkit.org/show_bug.cgi?id=134698

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2015-03-11
Reviewed by Timothy Hatcher.

This will restore selection of a global search tree element if you
close and reopen the inspector in such a case.

• UserInterface/Models/DOMSearchMatchObject.js:

(WebInspector.DOMSearchMatchObject.prototype.get resource):
(WebInspector.DOMSearchMatchObject.titleForDOMNode):
Cookie has the resource URL, DOM Node title, and text range.

• UserInterface/Models/SourceCodeSearchMatchObject.js:

(WebInspector.SourceCodeSearchMatchObject.prototype.get sourceCodeTextRange):
Cookie has the source code URL and text range.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Models/DOMSearchMatchObject.js (modified) (3 diffs)
• UserInterface/Models/SourceCodeSearchMatchObject.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2015-03-11  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: SearchResultTreeElement.representedObject is missing a saveIdentityToCookie implementation
+        https://bugs.webkit.org/show_bug.cgi?id=134698
+
+        Reviewed by Timothy Hatcher.
+
+        This will restore selection of a global search tree element if you
+        close and reopen the inspector in such a case.
+
+        * UserInterface/Models/DOMSearchMatchObject.js:
+        (WebInspector.DOMSearchMatchObject.prototype.get resource):
+        (WebInspector.DOMSearchMatchObject.titleForDOMNode):
+        Cookie has the resource URL, DOM Node title, and text range.
+
+        * UserInterface/Models/SourceCodeSearchMatchObject.js:
+        (WebInspector.SourceCodeSearchMatchObject.prototype.get sourceCodeTextRange):
+        Cookie has the source code URL and text range.
+
 2015-03-10  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Models/DOMSearchMatchObject.js

@@ -45 +45 @@
 WebInspector.DOMSearchMatchObject.DOMMatchNodeIconStyleClassName = "dom-match-node-icon";
 
+WebInspector.DOMSearchMatchObject.TypeIdentifier = "dom-search-match-object";
+WebInspector.DOMSearchMatchObject.URLCookieKey = "resource-url";
+WebInspector.DOMSearchMatchObject.TitleKey = "title";
+WebInspector.DOMSearchMatchObject.TextRangeKey = "text-range";
+
 WebInspector.DOMSearchMatchObject.prototype = {
     constructor: WebInspector.DOMSearchMatchObject,
+    __proto__: WebInspector.Object.prototype,
 
     // Public
+
+    get resource()
+    {
+        return this._resource;
+    },
 
     get domNode()
@@ -78 +89 @@
     },
 
+    saveIdentityToCookie(cookie)
+    {
+        cookie[WebInspector.DOMSearchMatchObject.URLCookieKey] = this._resource.url.hash;
+        cookie[WebInspector.DOMSearchMatchObject.TitleKey] = this._title;
+        var textRange = this._sourceCodeTextRange.textRange;
+        cookie[WebInspector.DOMSearchMatchObject.TextRangeKey] = [textRange.startLine, textRange.startColumn, textRange.endLine, textRange.endColumn].join();
+    },
+
     // Private
 
-    _generateClassName: function()
+    _generateClassName()
     {
         switch (this._domNode.nodeType()) {
@@ -155 +174 @@
     }
 };
-
-WebInspector.DOMSearchMatchObject.prototype.__proto__ = WebInspector.Object.prototype;

trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeSearchMatchObject.js

@@ -38 +38 @@
 WebInspector.SourceCodeSearchMatchObject.SourceCodeMatchIconStyleClassName = "source-code-match-icon";
 
+WebInspector.SourceCodeSearchMatchObject.TypeIdentifier = "source-code-search-match-object";
+WebInspector.SourceCodeSearchMatchObject.URLCookieKey = "source-code-url";
+WebInspector.SourceCodeSearchMatchObject.TextRangeKey = "text-range";
+
 WebInspector.SourceCodeSearchMatchObject.prototype = {
     constructor: WebInspector.SourceCodeSearchMatchObject,
+    __proto__: WebInspector.Object.prototype,
 
     get sourceCode()
@@ -64 +69 @@
     {
         return this._sourceCodeTextRange;
+    },
+
+    saveIdentityToCookie(cookie)
+    {
+        if (this._sourceCode.url)
+            cookie[WebInspector.SourceCodeSearchMatchObject.URLCookieKey] = this._sourceCode.url.hash;
+
+        var textRange = this._sourceCodeTextRange.textRange;
+        cookie[WebInspector.SourceCodeSearchMatchObject.TextRangeKey] = [textRange.startLine, textRange.startColumn, textRange.endLine, textRange.endColumn].join();
     }
 };
-
-WebInspector.SourceCodeSearchMatchObject.prototype.__proto__ = WebInspector.Object.prototype;