Changeset 127902 in webkit

Timestamp:

Sep 7, 2012 11:51:37 AM (12 years ago)

Author:

vsevik@chromium.org

Message:

Web Inspector: [REGRESSION] Content is not available for dynamically loaded script sometimes.
​https://bugs.webkit.org/show_bug.cgi?id=95954

Reviewed by Yury Semikhatsky.

Source/WebCore:

Resource now loads content from request when it is available.
Content was loaded from PageAgent before where it might be not available if the resource was already GCed.

Test: http/tests/inspector/resource-tree/resource-request-content-after-loading-and-clearing-cache.html

• inspector/front-end/Resource.js:

(WebInspector.Resource.prototype._innerRequestContent.contentLoaded):
(WebInspector.Resource.prototype._innerRequestContent.resourceContentLoaded):
(WebInspector.Resource.prototype._innerRequestContent):

LayoutTests:

• http/tests/inspector/resource-tree/resource-request-content-after-loading-and-clearing-cache-expected.txt: Added.
• http/tests/inspector/resource-tree/resource-request-content-after-loading-and-clearing-cache.html: Added.
• http/tests/inspector/resource-tree/resources/dynamic-script.js: Added.

(foo):

• http/tests/inspector/resources-test.js:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/inspector/resource-tree/resource-request-content-after-loading-and-clearing-cache-expected.txt (added)
• LayoutTests/http/tests/inspector/resource-tree/resource-request-content-after-loading-and-clearing-cache.html (added)
• LayoutTests/http/tests/inspector/resource-tree/resources/dynamic-script.js (added)
• LayoutTests/http/tests/inspector/resources-test.js (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/Resource.js (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-09-06  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: [REGRESSION] Content is not available for dynamically loaded script sometimes.
+        https://bugs.webkit.org/show_bug.cgi?id=95954
+
+        Reviewed by Yury Semikhatsky.
+
+        * http/tests/inspector/resource-tree/resource-request-content-after-loading-and-clearing-cache-expected.txt: Added.
+        * http/tests/inspector/resource-tree/resource-request-content-after-loading-and-clearing-cache.html: Added.
+        * http/tests/inspector/resource-tree/resources/dynamic-script.js: Added.
+        (foo):
+        * http/tests/inspector/resources-test.js:
+
 2012-09-07  Dominic Mazzoni  <dmazzoni@google.com>
 

trunk/LayoutTests/http/tests/inspector/resources-test.js

@@ -83 +83 @@
 }
 
-InspectorTest.resourceMatchingURL = function(resourceURL, callback)
+InspectorTest.resourceMatchingURL = function(resourceURL)
 {
     var result = null;

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-06  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: [REGRESSION] Content is not available for dynamically loaded script sometimes.
+        https://bugs.webkit.org/show_bug.cgi?id=95954
+
+        Reviewed by Yury Semikhatsky.
+
+        Resource now loads content from request when it is available.
+        Content was loaded from PageAgent before where it might be not available if the resource was already GCed.
+
+        Test: http/tests/inspector/resource-tree/resource-request-content-after-loading-and-clearing-cache.html
+
+        * inspector/front-end/Resource.js:
+        (WebInspector.Resource.prototype._innerRequestContent.contentLoaded):
+        (WebInspector.Resource.prototype._innerRequestContent.resourceContentLoaded):
+        (WebInspector.Resource.prototype._innerRequestContent):
+
 2012-09-07  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/inspector/front-end/Resource.js

@@ -312 +312 @@
 
         /**
-         * @param {?Protocol.Error} error
          * @param {string} content
          * @param {boolean} contentEncoded
          */
-        function callback(error, content, contentEncoded)
+        function contentLoaded(content, contentEncoded)
         {
-            this._content = error ? null : content;
+            this._content = content;
             this._contentEncoded = contentEncoded;
             var callbacks = this._pendingContentCallbacks.slice();
@@ -326 +325 @@
             delete this._contentRequested;
         }
-        PageAgent.getResourceContent(this.frameId, this.url, callback.bind(this));
+
+        /**
+         * @param {?Protocol.Error} error
+         * @param {string} content
+         * @param {boolean} contentEncoded
+         */
+        function resourceContentLoaded(error, content, contentEncoded)
+        {
+            if (error)
+                console.error("Resource content request failed: " + error);
+            contentLoaded.call(this, error ? null : content, contentEncoded);
+        }
+        
+        if (this.request) {
+            /**
+             * @param {string} content
+             * @param {boolean} contentEncoded
+             * @param {string} mimeType
+             */
+            function requestContentLoaded(content, contentEncoded, mimeType)
+            {
+                contentLoaded.call(this, content, contentEncoded);
+            }
+            
+            this.request.requestContent(requestContentLoaded.bind(this));
+            return;
+        }
+        PageAgent.getResourceContent(this.frameId, this.url, resourceContentLoaded.bind(this));
     },