[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[pfeldman at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 9a8d60b38d1571496d837569fea09fa9b5d4d448
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 4 18:48:35 2010 +0000

    2010-03-04  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: Clicking on an error should take me to the error
    
            https://bugs.webkit.org/show_bug.cgi?id=34860
    
            * inspector/front-end/ResourceView.js:
            (WebInspector.ResourceView):
            (WebInspector.ResourceView.prototype._selectTab):
            (WebInspector.ResourceView.prototype.selectContentTab):
            * inspector/front-end/ResourcesPanel.js:
            (WebInspector.ResourcesPanel.prototype.showResource):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55536 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 444182f..3a86ba7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,21 @@
 
         Reviewed by Timothy Hatcher.
 
+        Web Inspector: Clicking on an error should take me to the error
+
+        https://bugs.webkit.org/show_bug.cgi?id=34860
+
+        * inspector/front-end/ResourceView.js:
+        (WebInspector.ResourceView):
+        (WebInspector.ResourceView.prototype._selectTab):
+        (WebInspector.ResourceView.prototype.selectContentTab):
+        * inspector/front-end/ResourcesPanel.js:
+        (WebInspector.ResourcesPanel.prototype.showResource):
+
+2010-03-03  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
         Web Inspector: Remove sync access to resourceTrackingEnabled.
 
         https://bugs.webkit.org/show_bug.cgi?id=35693
diff --git a/WebCore/inspector/front-end/ResourceView.js b/WebCore/inspector/front-end/ResourceView.js
index b7b01ac..54cbb02 100644
--- a/WebCore/inspector/front-end/ResourceView.js
+++ b/WebCore/inspector/front-end/ResourceView.js
@@ -47,7 +47,7 @@ WebInspector.ResourceView = function(resource)
     this.tabsElement.appendChild(this.contentTabElement);
 
     this.headersTabElement.addEventListener("click", this._selectHeadersTab.bind(this), false);
-    this.contentTabElement.addEventListener("click", this._selectContentTab.bind(this), false);
+    this.contentTabElement.addEventListener("click", this.selectContentTab.bind(this), false);
 
     this.headersElement = document.createElement("div");
     this.headersElement.className = "resource-view-headers";
@@ -155,7 +155,7 @@ WebInspector.ResourceView.prototype = {
             if (WebInspector.settings.resourceViewTab === "headers")
                 this._selectHeadersTab();
             else
-                this._selectContentTab();
+                this.selectContentTab();
         } else
             this._innerSelectContentTab();
     },
@@ -169,7 +169,7 @@ WebInspector.ResourceView.prototype = {
         this.contentElement.addStyleClass("hidden");
     },
 
-    _selectContentTab: function()
+    selectContentTab: function()
     {
         WebInspector.settings.resourceViewTab = "content";
         this._innerSelectContentTab();
diff --git a/WebCore/inspector/front-end/ResourcesPanel.js b/WebCore/inspector/front-end/ResourcesPanel.js
index 49898ce..ff1287e 100644
--- a/WebCore/inspector/front-end/ResourcesPanel.js
+++ b/WebCore/inspector/front-end/ResourcesPanel.js
@@ -487,6 +487,7 @@ WebInspector.ResourcesPanel.prototype = {
 
         var view = this.resourceViewForResource(resource);
         view.headersVisible = true;
+        view.selectContentTab();
         view.show(this.viewsContainerElement);
 
         if (line) {

-- 
WebKit Debian packaging