Changeset 216215 in webkit

Timestamp:

May 4, 2017, 4:04:34 PM (8 years ago)

Author:

Joseph Pecoraro

Message:

REGRESSION(r216138): Web Inspector: ASSERT(!content.isNull()) when checking for source map url opening inspector
​https://bugs.webkit.org/show_bug.cgi?id=171697
<rdar://problem/31999512>

Reviewed by Matt Baker.

• inspector/InspectorPageAgent.cpp:

(WebCore::InspectorPageAgent::cachedResourceContent):
Always set base64Encoded when returning true. Return the empty
string instead of a null string matching previous behavior.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorPageAgent.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-05-04  Joseph Pecoraro  <pecoraro@apple.com>
+
+        REGRESSION(r216138): Web Inspector: ASSERT(!content.isNull()) when checking for source map url opening inspector
+        https://bugs.webkit.org/show_bug.cgi?id=171697
+        <rdar://problem/31999512>
+
+        Reviewed by Matt Baker.
+
+        * inspector/InspectorPageAgent.cpp:
+        (WebCore::InspectorPageAgent::cachedResourceContent):
+        Always set base64Encoded when returning true. Return the empty
+        string instead of a null string matching previous behavior.
+
 2017-05-04  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/inspector/InspectorPageAgent.cpp

@@ -116 +116 @@
         return false;
 
+    *base64Encoded = !hasTextContent(cachedResource);
+
     if (!cachedResource->encodedSize()) {
-        *result = String();
+        *result = emptyString();
         return true;
     }
 
-    *base64Encoded = !hasTextContent(cachedResource);
     if (*base64Encoded) {
         if (auto* buffer = cachedResource->resourceBuffer()) {