Don't pass the return value of CString::data() to a TRACE_EVENT
(cherry picked from commit 50c7391c22737e14a73e127e7ff027c62efb1286)
Bug: 964768
Change-Id: I59c2384cda133f97730e88a266bba542aeaaa828
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1637864
Reviewed-by: Vlad Tsyrklevich <vtsyrklevich@chromium.org>
Commit-Queue: Nate Chapin <japhet@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#665185}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1663353
Cr-Commit-Position: refs/branch-heads/3809@{#392}
Cr-Branched-From: d82dec1a818f378c464ba307ddd9c92133eac355-refs/heads/master@{#665002}
diff --git a/third_party/blink/renderer/core/frame/frame_serializer.cc b/third_party/blink/renderer/core/frame/frame_serializer.cc
index e2333d9..bbdbbd0 100644
--- a/third_party/blink/renderer/core/frame/frame_serializer.cc
+++ b/third_party/blink/renderer/core/frame/frame_serializer.cc
@@ -369,7 +369,7 @@
}
TRACE_EVENT2("page-serialization", "FrameSerializer::serializeCSSStyleSheet",
- "type", "CSS", "url", url.ElidedString().Utf8().data());
+ "type", "CSS", "url", url.ElidedString().Utf8());
// Only report UMA metric if this is not a reentrant CSS serialization call.
TimeTicks css_start_time;
if (!is_serializing_css_) {
@@ -496,7 +496,7 @@
loaded_image_count_++;
TRACE_EVENT2("page-serialization", "FrameSerializer::addImageToResources",
- "type", "image", "url", url.ElidedString().Utf8().data());
+ "type", "image", "url", url.ElidedString().Utf8());
base::TimeTicks image_start_time = CurrentTimeTicks();
scoped_refptr<const SharedBuffer> data = image->GetImage()->Data();
diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
index c2214f3..4a4e6d9 100644
--- a/third_party/blink/renderer/core/loader/document_loader.cc
+++ b/third_party/blink/renderer/core/loader/document_loader.cc
@@ -402,7 +402,7 @@
single_page_app_navigation_type, kSPANavTypeCount);
TRACE_EVENT1("blink", "FrameLoader::updateForSameDocumentNavigation", "url",
- new_url.GetString().Ascii().data());
+ new_url.GetString().Ascii());
// Generate start and stop notifications only when loader is completed so that
// we don't fire them for fragment redirection that happens in window.onload