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

[loislo at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit e81e1b096499af805d3ae2057d5ab67453f09042
Author: loislo at chromium.org <loislo at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 28 14:32:26 2010 +0000

    2010-07-28  Ilya Tikhonovsky  <loislo at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            WebInspector: Navigating to anchor prior to opening WebInspector
            makes resource have 'other' type.
            https://bugs.webkit.org/show_bug.cgi?id=43110
    
            * inspector/InspectorResource.cpp:
            (WebCore::InspectorResource::type):
            (WebCore::InspectorResource::resourceData):
            * inspector/front-end/ResourceView.js:
            (WebInspector.ResourceView.prototype._innerSelectContentTab):
    
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64203 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8c12f6c..2f31dc3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-07-28  Ilya Tikhonovsky  <loislo at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        WebInspector: Navigating to anchor prior to opening WebInspector
+        makes resource have 'other' type.
+        https://bugs.webkit.org/show_bug.cgi?id=43110
+
+        * inspector/InspectorResource.cpp:
+        (WebCore::InspectorResource::type):
+        (WebCore::InspectorResource::resourceData):
+        * inspector/front-end/ResourceView.js:
+        (WebInspector.ResourceView.prototype._innerSelectContentTab):
+
 2010-07-28  Andreas Kling  <andreas.kling at nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/inspector/InspectorResource.cpp b/WebCore/inspector/InspectorResource.cpp
index 3ba3bf2..69618c3 100644
--- a/WebCore/inspector/InspectorResource.cpp
+++ b/WebCore/inspector/InspectorResource.cpp
@@ -283,7 +283,7 @@ InspectorResource::Type InspectorResource::type() const
     if (!m_overrideContent.isNull())
         return m_overrideContentType;
 
-    if (m_requestURL == m_loader->requestURL()) {
+    if (equalIgnoringFragmentIdentifier(m_requestURL, m_loader->requestURL())) {
         InspectorResource::Type resourceType = cachedResourceType();
         if (resourceType == Other)
             return Doc;
@@ -291,7 +291,7 @@ InspectorResource::Type InspectorResource::type() const
         return resourceType;
     }
 
-    if (m_loader->frameLoader() && m_requestURL == m_loader->frameLoader()->iconURL())
+    if (m_loader->frameLoader() && equalIgnoringFragmentIdentifier(m_requestURL, m_loader->frameLoader()->iconURL()))
         return Image;
 
     return cachedResourceType();
@@ -322,7 +322,7 @@ String InspectorResource::sourceString() const
 
 PassRefPtr<SharedBuffer> InspectorResource::resourceData(String* textEncodingName) const
 {
-    if (m_requestURL == m_loader->requestURL()) {
+    if (equalIgnoringFragmentIdentifier(m_requestURL, m_loader->requestURL())) {
         *textEncodingName = m_frame->document()->inputEncoding();
         return m_loader->mainResourceData();
     }
diff --git a/WebCore/inspector/front-end/ResourceView.js b/WebCore/inspector/front-end/ResourceView.js
index bfd1576..7ce09b6 100644
--- a/WebCore/inspector/front-end/ResourceView.js
+++ b/WebCore/inspector/front-end/ResourceView.js
@@ -176,7 +176,8 @@ WebInspector.ResourceView.prototype = {
         this.tabbedPane.selectTabById("content");
         if ("resize" in this)
             this.resize();
-        this.contentTabSelected();
+        if (this.hasContentTab())
+            this.contentTabSelected();
     },
 
     _refreshURL: function()

-- 
WebKit Debian packaging