[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

yurys at chromium.org yurys at chromium.org
Wed Dec 22 13:25:47 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 0f8585cef1e2667bfbba99c0a22337accbb23f2e
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 15 01:42:54 2010 +0000

    2010-09-14  Yury Semikhatsky  <yurys at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: Links from "Profiles" don't lead to "Scripts"
            https://bugs.webkit.org/show_bug.cgi?id=45756
    
            * inspector/front-end/ProfileDataGridTree.js:
            (WebInspector.ProfileDataGridNode.prototype.createCell): use standard routine to create resource link
            * inspector/front-end/inspector.js: code cleanup: removed no-op method
            (WebInspector.addMainEventListeners):
    2010-09-14  Yury Semikhatsky  <yurys at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: Links from "Profiles" don't lead to "Scripts"
            https://bugs.webkit.org/show_bug.cgi?id=45756
    
            * src/js/DevTools.js: remove obsolete code
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67525 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f5d3de0..edf0f40 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-14  Yury Semikhatsky  <yurys at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: Links from "Profiles" don't lead to "Scripts"
+        https://bugs.webkit.org/show_bug.cgi?id=45756
+
+        * inspector/front-end/ProfileDataGridTree.js:
+        (WebInspector.ProfileDataGridNode.prototype.createCell): use standard routine to create resource link
+        * inspector/front-end/inspector.js: code cleanup: removed no-op method
+        (WebInspector.addMainEventListeners):
+
 2010-09-14  Patrick Gansterer  <paroga at paroga.com>
 
         Reviewed by Adam Roben.
diff --git a/WebCore/inspector/front-end/ProfileDataGridTree.js b/WebCore/inspector/front-end/ProfileDataGridTree.js
index b10f392..adf34f1 100644
--- a/WebCore/inspector/front-end/ProfileDataGridTree.js
+++ b/WebCore/inspector/front-end/ProfileDataGridTree.js
@@ -96,19 +96,10 @@ WebInspector.ProfileDataGridNode.prototype = {
             cell.addStyleClass("highlight");
 
         if (this.profileNode.url) {
-            var fileName = WebInspector.displayNameForURL(this.profileNode.url);
-
-            var urlElement = document.createElement("a");
-            urlElement.className = "profile-node-file webkit-html-resource-link";
-            urlElement.href = this.profileNode.url;
-            urlElement.lineNumber = this.profileNode.lineNumber;
-            urlElement.preferredPanel = "scripts";
-
+            var lineNumber;
             if (this.profileNode.lineNumber > 0)
-                urlElement.textContent = fileName + ":" + this.profileNode.lineNumber;
-            else
-                urlElement.textContent = fileName;
-
+                lineNumber = this.profileNode.lineNumber;
+            var urlElement = WebInspector.linkifyResourceAsNode(this.profileNode.url, "scripts", lineNumber, "profile-node-file");
             cell.insertBefore(urlElement, cell.firstChild);
         }
 
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index 3fdd5b4..cbaba2d 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -721,18 +721,6 @@ WebInspector.disconnectFromBackend = function()
     InspectorFrontendHost.disconnectFromBackend();
 }
 
-WebInspector.documentMouseOver = function(event)
-{
-    if (event.target.tagName !== "A")
-        return;
-
-    const anchor = event.target;
-    if (!anchor.hasStyleClass("webkit-html-resource-link"))
-        return;
-    if (anchor.href && anchor.href.indexOf("/data:") != -1)
-        return;
-}
-
 WebInspector.documentClick = function(event)
 {
     var anchor = event.target.enclosingNodeOrSelfWithNodeName("a");
@@ -1887,7 +1875,6 @@ WebInspector.addMainEventListeners = function(doc)
     doc.defaultView.addEventListener("focus", this.windowFocused.bind(this), false);
     doc.defaultView.addEventListener("blur", this.windowBlurred.bind(this), false);
     doc.addEventListener("click", this.documentClick.bind(this), true);
-    doc.addEventListener("mouseover", this.documentMouseOver.bind(this), true);
 }
 
 WebInspector._searchFieldManualFocus = function(event)
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 656e742..57c8e93 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-14  Yury Semikhatsky  <yurys at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: Links from "Profiles" don't lead to "Scripts"
+        https://bugs.webkit.org/show_bug.cgi?id=45756
+
+        * src/js/DevTools.js: remove obsolete code
+
 2010-09-14  Tony Chang  <tony at chromium.org>
 
         Reviewed by Kent Tamura.
diff --git a/WebKit/chromium/src/js/DevTools.js b/WebKit/chromium/src/js/DevTools.js
index f55be4e..0c7241d 100644
--- a/WebKit/chromium/src/js/DevTools.js
+++ b/WebKit/chromium/src/js/DevTools.js
@@ -162,7 +162,3 @@ WebInspector.resetToolbarColors = function()
 
 }
 
-// TODO(yurys): should be removed when eclipse debugger stops using it.
-if (window.RemoteDebuggerAgent) {
-    RemoteDebuggerAgent.setContextId = function() {};
-}

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list