Changeset 64203 in webkit

Timestamp:

Jul 28, 2010 7:32:26 AM (14 years ago)

Author:

loislo@chromium.org

Message:

2010-07-28 Ilya Tikhonovsky <​loislo@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):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorResource.cpp (modified) (3 diffs)
• inspector/front-end/ResourceView.js (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-28  Ilya Tikhonovsky  <loislo@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@nokia.com>
 

trunk/WebCore/inspector/InspectorResource.cpp

@@ -284 +284 @@
         return m_overrideContentType;
 
-    if (m_requestURL == m_loader->requestURL()) {
+    if (equalIgnoringFragmentIdentifier(m_requestURL, m_loader->requestURL())) {
         InspectorResource::Type resourceType = cachedResourceType();
         if (resourceType == Other)
@@ -292 +292 @@
     }
 
-    if (m_loader->frameLoader() && m_requestURL == m_loader->frameLoader()->iconURL())
+    if (m_loader->frameLoader() && equalIgnoringFragmentIdentifier(m_requestURL, m_loader->frameLoader()->iconURL()))
         return Image;
 
@@ -323 +323 @@
 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();

trunk/WebCore/inspector/front-end/ResourceView.js

@@ -177 +177 @@
         if ("resize" in this)
             this.resize();
-        this.contentTabSelected();
+        if (this.hasContentTab())
+            this.contentTabSelected();
     },