Title: [216215] trunk/Source/WebCore
- Revision
- 216215
- Author
- joep...@webkit.org
- Date
- 2017-05-04 16:04:34 -0700 (Thu, 04 May 2017)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (216214 => 216215)
--- trunk/Source/WebCore/ChangeLog 2017-05-04 23:03:52 UTC (rev 216214)
+++ trunk/Source/WebCore/ChangeLog 2017-05-04 23:04:34 UTC (rev 216215)
@@ -1,3 +1,16 @@
+2017-05-04 Joseph Pecoraro <pecor...@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_hs...@apple.com>
[WK2] Add support for keeping the selection in a focused editable element when dragging begins
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (216214 => 216215)
--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2017-05-04 23:03:52 UTC (rev 216214)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2017-05-04 23:04:34 UTC (rev 216215)
@@ -115,12 +115,13 @@
if (!cachedResource)
return false;
+ *base64Encoded = !hasTextContent(cachedResource);
+
if (!cachedResource->encodedSize()) {
- *result = String();
+ *result = emptyString();
return true;
}
- *base64Encoded = !hasTextContent(cachedResource);
if (*base64Encoded) {
if (auto* buffer = cachedResource->resourceBuffer()) {
*result = base64Encode(buffer->data(), buffer->size());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
