<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[209625] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/209625">209625</a></dd>
<dt>Author</dt> <dd>krollin@apple.com</dd>
<dt>Date</dt> <dd>2016-12-09 13:59:21 -0800 (Fri, 09 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix string specification in print format
https://bugs.webkit.org/show_bug.cgi?id=165650
Reviewed by Alex Christensen.
Change "%{public}s" string specifier to something that can be changed
to "%s" at compile time when the build environment doesn't support the
former.
* NetworkProcess/capture/NetworkCaptureLogging.h:
* NetworkProcess/capture/NetworkCaptureManager.cpp:
(WebKit::NetworkCapture::Manager::initialize):
(WebKit::NetworkCapture::Manager::findMatch):
(WebKit::NetworkCapture::Manager::findExactMatch):
(WebKit::NetworkCapture::Manager::findBestFuzzyMatch):
(WebKit::NetworkCapture::Manager::fuzzyMatchURLs):
(WebKit::NetworkCapture::Manager::logPlayedBackResource):
(WebKit::NetworkCapture::Manager::openCacheFile):
(WebKit::NetworkCapture::Manager::getLine):
* NetworkProcess/capture/NetworkCaptureRecorder.cpp:
(WebKit::NetworkCapture::Recorder::recordRequestSent):
(WebKit::NetworkCapture::Recorder::recordResponseReceived):
(WebKit::NetworkCapture::Recorder::recordRedirectReceived):
(WebKit::NetworkCapture::Recorder::recordRedirectSent):
(WebKit::NetworkCapture::Recorder::writeEvents):
* NetworkProcess/capture/NetworkCaptureResource.cpp:
(WebKit::NetworkCapture::Resource::url):
(WebKit::NetworkCapture::Resource::EventStream::nextEvent):
* NetworkProcess/capture/NetworkDataTaskReplay.cpp:
(WebKit::NetworkCapture::NetworkDataTaskReplay::NetworkDataTaskReplay):
(WebKit::NetworkCapture::NetworkDataTaskReplay::~NetworkDataTaskReplay):
(WebKit::NetworkCapture::NetworkDataTaskReplay::resume):
(WebKit::NetworkCapture::NetworkDataTaskReplay::suspend):
(WebKit::NetworkCapture::NetworkDataTaskReplay::complete):
(WebKit::NetworkCapture::NetworkDataTaskReplay::invalidateAndCancel):
(WebKit::NetworkCapture::NetworkDataTaskReplay::enqueueEventHandler):
(WebKit::NetworkCapture::NetworkDataTaskReplay::replayRequestSent):
(WebKit::NetworkCapture::NetworkDataTaskReplay::replayResponseReceived):
(WebKit::NetworkCapture::NetworkDataTaskReplay::replayRedirectReceived):
(WebKit::NetworkCapture::NetworkDataTaskReplay::replayRedirectSent):
(WebKit::NetworkCapture::NetworkDataTaskReplay::replayDataReceived):
(WebKit::NetworkCapture::NetworkDataTaskReplay::replayFinished):
(WebKit::NetworkCapture::NetworkDataTaskReplay::didReceiveResponse):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscaptureNetworkCaptureLoggingh">trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureLogging.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscaptureNetworkCaptureManagercpp">trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscaptureNetworkCaptureRecordercpp">trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureRecorder.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscaptureNetworkCaptureResourcecpp">trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureResource.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscaptureNetworkDataTaskReplaycpp">trunk/Source/WebKit2/NetworkProcess/capture/NetworkDataTaskReplay.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (209624 => 209625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-12-09 20:54:16 UTC (rev 209624)
+++ trunk/Source/WebKit2/ChangeLog 2016-12-09 21:59:21 UTC (rev 209625)
</span><span class="lines">@@ -1,3 +1,49 @@
</span><ins>+2016-12-09 Keith Rollin <krollin@apple.com>
+
+ Fix string specification in print format
+ https://bugs.webkit.org/show_bug.cgi?id=165650
+
+ Reviewed by Alex Christensen.
+
+ Change "%{public}s" string specifier to something that can be changed
+ to "%s" at compile time when the build environment doesn't support the
+ former.
+
+ * NetworkProcess/capture/NetworkCaptureLogging.h:
+ * NetworkProcess/capture/NetworkCaptureManager.cpp:
+ (WebKit::NetworkCapture::Manager::initialize):
+ (WebKit::NetworkCapture::Manager::findMatch):
+ (WebKit::NetworkCapture::Manager::findExactMatch):
+ (WebKit::NetworkCapture::Manager::findBestFuzzyMatch):
+ (WebKit::NetworkCapture::Manager::fuzzyMatchURLs):
+ (WebKit::NetworkCapture::Manager::logPlayedBackResource):
+ (WebKit::NetworkCapture::Manager::openCacheFile):
+ (WebKit::NetworkCapture::Manager::getLine):
+ * NetworkProcess/capture/NetworkCaptureRecorder.cpp:
+ (WebKit::NetworkCapture::Recorder::recordRequestSent):
+ (WebKit::NetworkCapture::Recorder::recordResponseReceived):
+ (WebKit::NetworkCapture::Recorder::recordRedirectReceived):
+ (WebKit::NetworkCapture::Recorder::recordRedirectSent):
+ (WebKit::NetworkCapture::Recorder::writeEvents):
+ * NetworkProcess/capture/NetworkCaptureResource.cpp:
+ (WebKit::NetworkCapture::Resource::url):
+ (WebKit::NetworkCapture::Resource::EventStream::nextEvent):
+ * NetworkProcess/capture/NetworkDataTaskReplay.cpp:
+ (WebKit::NetworkCapture::NetworkDataTaskReplay::NetworkDataTaskReplay):
+ (WebKit::NetworkCapture::NetworkDataTaskReplay::~NetworkDataTaskReplay):
+ (WebKit::NetworkCapture::NetworkDataTaskReplay::resume):
+ (WebKit::NetworkCapture::NetworkDataTaskReplay::suspend):
+ (WebKit::NetworkCapture::NetworkDataTaskReplay::complete):
+ (WebKit::NetworkCapture::NetworkDataTaskReplay::invalidateAndCancel):
+ (WebKit::NetworkCapture::NetworkDataTaskReplay::enqueueEventHandler):
+ (WebKit::NetworkCapture::NetworkDataTaskReplay::replayRequestSent):
+ (WebKit::NetworkCapture::NetworkDataTaskReplay::replayResponseReceived):
+ (WebKit::NetworkCapture::NetworkDataTaskReplay::replayRedirectReceived):
+ (WebKit::NetworkCapture::NetworkDataTaskReplay::replayRedirectSent):
+ (WebKit::NetworkCapture::NetworkDataTaskReplay::replayDataReceived):
+ (WebKit::NetworkCapture::NetworkDataTaskReplay::replayFinished):
+ (WebKit::NetworkCapture::NetworkDataTaskReplay::didReceiveResponse):
+
</ins><span class="cx"> 2016-12-09 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> WebView doesn't become first responder in element fullscreen.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscaptureNetworkCaptureLoggingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureLogging.h (209624 => 209625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureLogging.h 2016-12-09 20:54:16 UTC (rev 209624)
+++ trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureLogging.h 2016-12-09 21:59:21 UTC (rev 209625)
</span><span class="lines">@@ -34,11 +34,17 @@
</span><span class="cx">
</span><span class="cx"> #define DEBUG_STR(s) (s).ascii().data()
</span><span class="cx">
</span><ins>+#if RELEASE_LOG_DISABLED
+#define STRING_SPECIFIER "%s"
+#else
+#define STRING_SPECIFIER "%{public}s"
+#endif
+
</ins><span class="cx"> #if ENABLE(WTF_CAPTURE_INTERNAL_DEBUGGING)
</span><span class="cx"> #define DEBUG_LOG_QUOTE(str) #str
</span><span class="cx"> #define DEBUG_LOG_EXPAND_AND_QUOTE(str) DEBUG_LOG_QUOTE(str)
</span><del>-#define DEBUG_LOG(format, ...) RELEASE_LOG(Network, "#PLT: %p - %{public}s::%{public}s: " format, this, DEBUG_LOG_EXPAND_AND_QUOTE(DEBUG_CLASS), __FUNCTION__, ##__VA_ARGS__)
-#define DEBUG_LOG_ERROR(format, ...) RELEASE_LOG_ERROR(Network, "#PLT: %p - %{public}s::%{public}s: " format, this, DEBUG_LOG_EXPAND_AND_QUOTE(DEBUG_CLASS), __FUNCTION__, ##__VA_ARGS__)
</del><ins>+#define DEBUG_LOG(format, ...) RELEASE_LOG(Network, "#PLT: %p - " STRING_SPECIFIER "::" STRING_SPECIFIER ": " format, this, DEBUG_LOG_EXPAND_AND_QUOTE(DEBUG_CLASS), __FUNCTION__, ##__VA_ARGS__)
+#define DEBUG_LOG_ERROR(format, ...) RELEASE_LOG_ERROR(Network, "#PLT: %p - " STRING_SPECIFIER "::" STRING_SPECIFIER ": " format, this, DEBUG_LOG_EXPAND_AND_QUOTE(DEBUG_CLASS), __FUNCTION__, ##__VA_ARGS__)
</ins><span class="cx"> #if ENABLE(WTF_VERBOSE_CAPTURE_INTERNAL_DEBUGGING)
</span><span class="cx"> #define DEBUG_LOG_VERBOSE(format, ...) DEBUG_LOG(format, ##__VA_ARGS__)
</span><span class="cx"> #else
</span><span class="lines">@@ -46,7 +52,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #else
</span><span class="cx"> #define DEBUG_LOG(...) ((void)0)
</span><del>-#define DEBUG_LOG_ERROR(...) ((void)0)
</del><ins>+#define DEBUG_LOG_ERROR(...) RELEASE_LOG_ERROR(Network, __VA_ARGS__)
</ins><span class="cx"> #define DEBUG_LOG_VERBOSE(...) ((void)0)
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscaptureNetworkCaptureManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureManager.cpp (209624 => 209625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureManager.cpp 2016-12-09 20:54:16 UTC (rev 209624)
+++ trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureManager.cpp 2016-12-09 21:59:21 UTC (rev 209625)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> m_recordFileHandle = WebCore::FileHandle(reportRecordPath(), WebCore::OpenForWrite);
</span><span class="cx"> m_replayFileHandle = WebCore::FileHandle(reportReplayPath(), WebCore::OpenForWrite);
</span><span class="cx">
</span><del>- DEBUG_LOG("Cache location = %{public}s", DEBUG_STR(m_recordReplayCacheLocation));
</del><ins>+ DEBUG_LOG("Cache location = " STRING_SPECIFIER, DEBUG_STR(m_recordReplayCacheLocation));
</ins><span class="cx">
</span><span class="cx"> if (isReplaying())
</span><span class="cx"> loadResources();
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx">
</span><span class="cx"> Resource* Manager::findMatch(const WebCore::ResourceRequest& request)
</span><span class="cx"> {
</span><del>- DEBUG_LOG_VERBOSE("URL = %{public}s", DEBUG_STR(request.url().string()));
</del><ins>+ DEBUG_LOG_VERBOSE("URL = " STRING_SPECIFIER, DEBUG_STR(request.url().string()));
</ins><span class="cx">
</span><span class="cx"> auto bestMatch = findExactMatch(request);
</span><span class="cx"> if (!bestMatch)
</span><span class="lines">@@ -99,12 +99,12 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WTF_CAPTURE_INTERNAL_DEBUGGING)
</span><span class="cx"> if (!bestMatch)
</span><del>- DEBUG_LOG("Could not find match for: %{public}s", DEBUG_STR(request.url().string()));
</del><ins>+ DEBUG_LOG("Could not find match for: " STRING_SPECIFIER, DEBUG_STR(request.url().string()));
</ins><span class="cx"> else if (request.url() == bestMatch->url())
</span><del>- DEBUG_LOG("Found exact match for: %{public}s", DEBUG_STR(request.url().string()));
</del><ins>+ DEBUG_LOG("Found exact match for: " STRING_SPECIFIER, DEBUG_STR(request.url().string()));
</ins><span class="cx"> else {
</span><del>- DEBUG_LOG("Found fuzzy match for: %{public}s", DEBUG_STR(request.url().string()));
- DEBUG_LOG(" replaced with : %{public}s", DEBUG_STR(bestMatch->url().string()));
</del><ins>+ DEBUG_LOG("Found fuzzy match for: " STRING_SPECIFIER, DEBUG_STR(request.url().string()));
+ DEBUG_LOG(" replaced with : " STRING_SPECIFIER, DEBUG_STR(bestMatch->url().string()));
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> if (lower != std::end(m_cachedResources) && lower->url() == url) {
</span><del>- DEBUG_LOG_VERBOSE("Found exact match: %{public}s", DEBUG_STR(lower->url().string()));
</del><ins>+ DEBUG_LOG_VERBOSE("Found exact match: " STRING_SPECIFIER, DEBUG_STR(lower->url().string()));
</ins><span class="cx"> return &*lower;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> int thisScore = fuzzyMatchURLs(url, requestParameters, iResource->url(), iResource->queryParameters());
</span><span class="cx"> // TODO: Consider ignoring any matches < 0 as being too different.
</span><span class="cx"> if (bestScore < thisScore) {
</span><del>- DEBUG_LOG("New best match (%d): %{public}s", thisScore, DEBUG_STR(iResource->url().string()));
</del><ins>+ DEBUG_LOG("New best match (%d): " STRING_SPECIFIER, thisScore, DEBUG_STR(iResource->url().string()));
</ins><span class="cx"> bestScore = thisScore;
</span><span class="cx"> bestMatch = &*iResource;
</span><span class="cx"> if (bestScore == kMaxMatch)
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> // match.
</span><span class="cx">
</span><span class="cx"> if (!protocolHostAndPortAreEqual(requestURL, resourceURL)) {
</span><del>- DEBUG_LOG("Scheme/host/port mismatch: %{public}s != %{public}s", DEBUG_STR(requestURL.string()), DEBUG_STR(resourceURL.string()));
</del><ins>+ DEBUG_LOG("Scheme/host/port mismatch: " STRING_SPECIFIER " != " STRING_SPECIFIER, DEBUG_STR(requestURL.string()), DEBUG_STR(resourceURL.string()));
</ins><span class="cx"> return kMinMatch;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -178,13 +178,13 @@
</span><span class="cx"> // If fragments don't match, return this as the "worst" match.
</span><span class="cx">
</span><span class="cx"> if (requestURL.fragmentIdentifier() != resourceURL.fragmentIdentifier()) {
</span><del>- DEBUG_LOG("Fragments mismatch: %{public}s != %{public}s", DEBUG_STR(requestURL.string()), DEBUG_STR(resourceURL.string()));
</del><ins>+ DEBUG_LOG("Fragments mismatch: " STRING_SPECIFIER " != " STRING_SPECIFIER, DEBUG_STR(requestURL.string()), DEBUG_STR(resourceURL.string()));
</ins><span class="cx"> return kMinMatch;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DEBUG_LOG("Fuzzy matching:");
</span><del>- DEBUG_LOG(" : %{public}s", DEBUG_STR(requestURL.string()));
- DEBUG_LOG(" : %{public}s", DEBUG_STR(resourceURL.string()));
</del><ins>+ DEBUG_LOG(" : " STRING_SPECIFIER, DEBUG_STR(requestURL.string()));
+ DEBUG_LOG(" : " STRING_SPECIFIER, DEBUG_STR(resourceURL.string()));
</ins><span class="cx">
</span><span class="cx"> // Compare the path components and the query parameters. Score each partial
</span><span class="cx"> // match as +4, each mismatch as -1, and each missing component as -1.
</span><span class="lines">@@ -285,14 +285,14 @@
</span><span class="cx"> if (requestParameter->first == resourceParameter->first) {
</span><span class="cx"> #if ENABLE(WTF_CAPTURE_INTERNAL_DEBUGGING)
</span><span class="cx"> if (requestParameter->second == resourceParameter->second)
</span><del>- DEBUG_LOG("Matching parameter names and values: \"%{public}s\" = \"%{public}s\"", DEBUG_STR(requestParameter->first), DEBUG_STR(requestParameter->second));
</del><ins>+ DEBUG_LOG("Matching parameter names and values: \"" STRING_SPECIFIER "\" = \"" STRING_SPECIFIER "\"", DEBUG_STR(requestParameter->first), DEBUG_STR(requestParameter->second));
</ins><span class="cx"> else
</span><del>- DEBUG_LOG("Mismatching parameter values: \"%{public}s\" = \"%{public}s\" vs. \"%{public}s\"", DEBUG_STR(requestParameter->first), DEBUG_STR(requestParameter->second), DEBUG_STR(resourceParameter->second));
</del><ins>+ DEBUG_LOG("Mismatching parameter values: \"" STRING_SPECIFIER "\" = \"" STRING_SPECIFIER "\" vs. \"" STRING_SPECIFIER "\"", DEBUG_STR(requestParameter->first), DEBUG_STR(requestParameter->second), DEBUG_STR(resourceParameter->second));
</ins><span class="cx"> #endif
</span><span class="cx"> score += (requestParameter->second == resourceParameter->second) ? kParameterMatchScore : kParameterMismatchScore;
</span><span class="cx"> DEBUG_LOG("Score = %d", score);
</span><span class="cx"> } else {
</span><del>- DEBUG_LOG("Mismatching parameter names: %{public}s, %{public}s", DEBUG_STR(requestParameter->first), DEBUG_STR(resourceParameter->first));
</del><ins>+ DEBUG_LOG("Mismatching parameter names: " STRING_SPECIFIER ", " STRING_SPECIFIER, DEBUG_STR(requestParameter->first), DEBUG_STR(resourceParameter->first));
</ins><span class="cx">
</span><span class="cx"> const auto scanForwardForMatch = [this, &score, kParameterMatchScore, kParameterMismatchScore, kParameterMissingScore](const auto& fixedIter, auto& scanningIter, const auto& scannerEnd) {
</span><span class="cx"> auto scanner = scanningIter;
</span><span class="lines">@@ -305,9 +305,9 @@
</span><span class="cx"> DEBUG_LOG("Score = %d", score);
</span><span class="cx"> #if ENABLE(WTF_CAPTURE_INTERNAL_DEBUGGING)
</span><span class="cx"> if (fixedIter->second == scanner->second)
</span><del>- DEBUG_LOG("Matching parameter names and values: \"%{public}s\" = \"%{public}s\"", DEBUG_STR(fixedIter->first), DEBUG_STR(fixedIter->second));
</del><ins>+ DEBUG_LOG("Matching parameter names and values: \"" STRING_SPECIFIER "\" = \"" STRING_SPECIFIER "\"", DEBUG_STR(fixedIter->first), DEBUG_STR(fixedIter->second));
</ins><span class="cx"> else
</span><del>- DEBUG_LOG("Mismatching parameter values: \"%{public}s\" = \"%{public}s\" vs. \"%{public}s\"", DEBUG_STR(fixedIter->first), DEBUG_STR(fixedIter->second), DEBUG_STR(scanner->second));
</del><ins>+ DEBUG_LOG("Mismatching parameter values: \"" STRING_SPECIFIER "\" = \"" STRING_SPECIFIER "\" vs. \"" STRING_SPECIFIER "\"", DEBUG_STR(fixedIter->first), DEBUG_STR(fixedIter->second), DEBUG_STR(scanner->second));
</ins><span class="cx"> #endif
</span><span class="cx"> score += (fixedIter->second == scanner->second) ? kParameterMatchScore : kParameterMismatchScore;
</span><span class="cx"> DEBUG_LOG("Score = %d", score);
</span><span class="lines">@@ -317,8 +317,8 @@
</span><span class="cx">
</span><span class="cx"> if (!scanForwardForMatch(requestParameter, resourceParameter, std::end(resourceParameters))) {
</span><span class="cx"> if (!scanForwardForMatch(resourceParameter, requestParameter, std::end(requestParameters))) {
</span><del>- DEBUG_LOG("Unmatched parameter: %{public}s=%{public}s", DEBUG_STR(requestParameter->first), DEBUG_STR(requestParameter->second));
- DEBUG_LOG("Unmatched parameter: %{public}s=%{public}s", DEBUG_STR(resourceParameter->first), DEBUG_STR(resourceParameter->second));
</del><ins>+ DEBUG_LOG("Unmatched parameter: " STRING_SPECIFIER "=" STRING_SPECIFIER, DEBUG_STR(requestParameter->first), DEBUG_STR(requestParameter->second));
+ DEBUG_LOG("Unmatched parameter: " STRING_SPECIFIER "=" STRING_SPECIFIER, DEBUG_STR(resourceParameter->first), DEBUG_STR(resourceParameter->second));
</ins><span class="cx"> score += kParameterMissingScore + kParameterMissingScore;
</span><span class="cx"> DEBUG_LOG("Score = %d", score);
</span><span class="cx"> }
</span><span class="lines">@@ -436,9 +436,9 @@
</span><span class="cx"> const auto& url = request.url();
</span><span class="cx">
</span><span class="cx"> if (wasCacheMiss)
</span><del>- DEBUG_LOG("Cache miss: URL = %{public}s", DEBUG_STR(url.string()));
</del><ins>+ DEBUG_LOG("Cache miss: URL = " STRING_SPECIFIER, DEBUG_STR(url.string()));
</ins><span class="cx"> else
</span><del>- DEBUG_LOG("Cache hit: URL = %{public}s", DEBUG_STR(url.string()));
</del><ins>+ DEBUG_LOG("Cache hit: URL = " STRING_SPECIFIER, DEBUG_STR(url.string()));
</ins><span class="cx">
</span><span class="cx"> m_replayFileHandle.printf("%s %s\n", wasCacheMiss ? "miss" : "hit ", DEBUG_STR(url.string()));
</span><span class="cx"> }
</span><span class="lines">@@ -458,7 +458,7 @@
</span><span class="cx"> if (mode != WebCore::OpenForRead) {
</span><span class="cx"> const auto& parentDir = WebCore::directoryName(filePath);
</span><span class="cx"> if (!WebCore::makeAllDirectories(parentDir)) {
</span><del>- DEBUG_LOG_ERROR("Error %d trying to create intermediate directories: %{public}s", errno, DEBUG_STR(parentDir));
</del><ins>+ DEBUG_LOG_ERROR("Error %d trying to create intermediate directories: " STRING_SPECIFIER, errno, DEBUG_STR(parentDir));
</ins><span class="cx"> return fileHandle;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -471,9 +471,9 @@
</span><span class="cx"> // file handle.
</span><span class="cx">
</span><span class="cx"> if (mode == WebCore::OpenForRead)
</span><del>- DEBUG_LOG_ERROR("Error %d trying to open %{public}s for reading", errno, DEBUG_STR(filePath));
</del><ins>+ DEBUG_LOG_ERROR("Error %d trying to open " STRING_SPECIFIER " for reading", errno, DEBUG_STR(filePath));
</ins><span class="cx"> else
</span><del>- DEBUG_LOG_ERROR("Error %d trying to open %{public}s for writing", errno, DEBUG_STR(filePath));
</del><ins>+ DEBUG_LOG_ERROR("Error %d trying to open " STRING_SPECIFIER " for writing", errno, DEBUG_STR(filePath));
</ins><span class="cx">
</span><span class="cx"> return fileHandle;
</span><span class="cx"> }
</span><span class="lines">@@ -513,7 +513,7 @@
</span><span class="cx"> String word;
</span><span class="cx"> while (getWord(p, end, word)) {
</span><span class="cx"> if (!word.isEmpty()) {
</span><del>- DEBUG_LOG_VERBOSE("Adding word: %{public}s", DEBUG_STR(word));
</del><ins>+ DEBUG_LOG_VERBOSE("Adding word: " STRING_SPECIFIER, DEBUG_STR(word));
</ins><span class="cx"> line.append(word);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscaptureNetworkCaptureRecordercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureRecorder.cpp (209624 => 209625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureRecorder.cpp 2016-12-09 20:54:16 UTC (rev 209624)
+++ trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureRecorder.cpp 2016-12-09 21:59:21 UTC (rev 209625)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> if (m_events.size())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- DEBUG_LOG("Sent request for URL = %{public}s", DEBUG_STR(request.url().string()));
</del><ins>+ DEBUG_LOG("Sent request for URL = " STRING_SPECIFIER, DEBUG_STR(request.url().string()));
</ins><span class="cx">
</span><span class="cx"> m_initialRequest = request;
</span><span class="cx"> recordEvent(RequestSentEvent(request));
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> {
</span><span class="cx"> // Called when receiving a response other than a redirect or error.
</span><span class="cx">
</span><del>- DEBUG_LOG("Received response from URL = %{public}s", DEBUG_STR(response.url().string()));
</del><ins>+ DEBUG_LOG("Received response from URL = " STRING_SPECIFIER, DEBUG_STR(response.url().string()));
</ins><span class="cx"> ASSERT(m_events.size());
</span><span class="cx">
</span><span class="cx"> // TODO: Is there a better response to receiving a multi-part resource?
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx">
</span><span class="cx"> void Recorder::recordRedirectReceived(const WebCore::ResourceRequest& request, const WebCore::ResourceResponse& response)
</span><span class="cx"> {
</span><del>- DEBUG_LOG("Received redirect to URL = %{public}s", DEBUG_STR(request.url().string()));
</del><ins>+ DEBUG_LOG("Received redirect to URL = " STRING_SPECIFIER, DEBUG_STR(request.url().string()));
</ins><span class="cx"> ASSERT(m_events.size());
</span><span class="cx">
</span><span class="cx"> recordEvent(RedirectReceivedEvent(request, response));
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx">
</span><span class="cx"> void Recorder::recordRedirectSent(const WebCore::ResourceRequest& request)
</span><span class="cx"> {
</span><del>- DEBUG_LOG("Sent redirect for URL = %{public}s", DEBUG_STR(request.url().string()));
</del><ins>+ DEBUG_LOG("Sent redirect for URL = " STRING_SPECIFIER, DEBUG_STR(request.url().string()));
</ins><span class="cx"> ASSERT(m_events.size());
</span><span class="cx">
</span><span class="cx"> recordEvent(RedirectSentEvent(request));
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> // file. It also works better with JSON parsers that expect to find a
</span><span class="cx"> // NUL at the end of their input.
</span><span class="cx"> if (handle.write(asString.c_str(), asString.size() + 1) == -1) {
</span><del>- DEBUG_LOG_ERROR("Error trying to write to file for URL = %{public}s", DEBUG_STR(m_initialRequest.url().string()));
</del><ins>+ DEBUG_LOG_ERROR("Error trying to write to file for URL = " STRING_SPECIFIER, DEBUG_STR(m_initialRequest.url().string()));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscaptureNetworkCaptureResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureResource.cpp (209624 => 209625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureResource.cpp 2016-12-09 20:54:16 UTC (rev 209624)
+++ trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureResource.cpp 2016-12-09 21:59:21 UTC (rev 209625)
</span><span class="lines">@@ -46,9 +46,9 @@
</span><span class="cx"> auto events = eventStream();
</span><span class="cx"> auto event = events.nextEvent();
</span><span class="cx"> if (!event)
</span><del>- DEBUG_LOG_ERROR("Event stream does not contain events: file = %{public}s", DEBUG_STR(m_eventFilePath));
</del><ins>+ DEBUG_LOG_ERROR("Event stream does not contain events: file = " STRING_SPECIFIER, DEBUG_STR(m_eventFilePath));
</ins><span class="cx"> else if (!WTF::holds_alternative<RequestSentEvent>(*event))
</span><del>- DEBUG_LOG_ERROR("Event stream does not have a requestSent event: file = %{public}s", DEBUG_STR(m_eventFilePath));
</del><ins>+ DEBUG_LOG_ERROR("Event stream does not have a requestSent event: file = " STRING_SPECIFIER, DEBUG_STR(m_eventFilePath));
</ins><span class="cx"> else {
</span><span class="cx"> auto requestSentEvent = WTF::get<RequestSentEvent>(*event);
</span><span class="cx"> WebCore::URLParser parser(requestSentEvent.request.url);
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> OptionalCaptureEvent Resource::EventStream::nextEvent()
</span><span class="cx"> {
</span><span class="cx"> if (m_offset == m_mappedEventFile.size()) {
</span><del>- DEBUG_LOG_ERROR("Unable to return event - at end of file: %{public}s", DEBUG_STR(m_eventFilePath));
</del><ins>+ DEBUG_LOG_ERROR("Unable to return event - at end of file: " STRING_SPECIFIER, DEBUG_STR(m_eventFilePath));
</ins><span class="cx"> return std::nullopt;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> ++m_offset;
</span><span class="cx">
</span><span class="cx"> if (m_offset == m_mappedEventFile.size()) {
</span><del>- DEBUG_LOG_ERROR("Unable to return event - no terminating NUL: %{public}s", DEBUG_STR(m_eventFilePath));
</del><ins>+ DEBUG_LOG_ERROR("Unable to return event - no terminating NUL: " STRING_SPECIFIER, DEBUG_STR(m_eventFilePath));
</ins><span class="cx"> return std::nullopt;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscaptureNetworkDataTaskReplaycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/capture/NetworkDataTaskReplay.cpp (209624 => 209625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/capture/NetworkDataTaskReplay.cpp 2016-12-09 20:54:16 UTC (rev 209624)
+++ trunk/Source/WebKit2/NetworkProcess/capture/NetworkDataTaskReplay.cpp 2016-12-09 21:59:21 UTC (rev 209625)
</span><span class="lines">@@ -50,8 +50,8 @@
</span><span class="cx"> , m_currentRequest(m_firstRequest)
</span><span class="cx"> , m_resource(resource)
</span><span class="cx"> {
</span><del>- DEBUG_LOG("request URL = %{public}s", DEBUG_STR(m_firstRequest.url().string()));
- DEBUG_LOG("cached URL = %{public}s", resource ? DEBUG_STR(resource->url().string()) : "<not found>");
</del><ins>+ DEBUG_LOG("request URL = " STRING_SPECIFIER, DEBUG_STR(m_firstRequest.url().string()));
+ DEBUG_LOG("cached URL = " STRING_SPECIFIER, resource ? DEBUG_STR(resource->url().string()) : "<not found>");
</ins><span class="cx">
</span><span class="cx"> m_session->registerNetworkDataTask(*this);
</span><span class="cx">
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">
</span><span class="cx"> NetworkDataTaskReplay::~NetworkDataTaskReplay()
</span><span class="cx"> {
</span><del>- DEBUG_LOG("URL = %{public}s", DEBUG_STR(m_firstRequest.url().string()));
</del><ins>+ DEBUG_LOG("URL = " STRING_SPECIFIER, DEBUG_STR(m_firstRequest.url().string()));
</ins><span class="cx">
</span><span class="cx"> m_session->unregisterNetworkDataTask(*this);
</span><span class="cx"> }
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkDataTaskReplay::resume()
</span><span class="cx"> {
</span><del>- DEBUG_LOG("URL = %{public}s", DEBUG_STR(m_firstRequest.url().string()));
</del><ins>+ DEBUG_LOG("URL = " STRING_SPECIFIER, DEBUG_STR(m_firstRequest.url().string()));
</ins><span class="cx">
</span><span class="cx"> if (m_state == State::Canceling || m_state == State::Completed)
</span><span class="cx"> return;
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkDataTaskReplay::suspend()
</span><span class="cx"> {
</span><del>- DEBUG_LOG("URL = %{public}s", DEBUG_STR(m_firstRequest.url().string()));
</del><ins>+ DEBUG_LOG("URL = " STRING_SPECIFIER, DEBUG_STR(m_firstRequest.url().string()));
</ins><span class="cx">
</span><span class="cx"> if (m_state == State::Canceling || m_state == State::Completed)
</span><span class="cx"> return;
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkDataTaskReplay::complete()
</span><span class="cx"> {
</span><del>- DEBUG_LOG("URL = %{public}s", DEBUG_STR(m_firstRequest.url().string()));
</del><ins>+ DEBUG_LOG("URL = " STRING_SPECIFIER, DEBUG_STR(m_firstRequest.url().string()));
</ins><span class="cx">
</span><span class="cx"> if (m_state == State::Completed)
</span><span class="cx"> return;
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkDataTaskReplay::invalidateAndCancel()
</span><span class="cx"> {
</span><del>- DEBUG_LOG("URL = %{public}s", DEBUG_STR(m_firstRequest.url().string()));
</del><ins>+ DEBUG_LOG("URL = " STRING_SPECIFIER, DEBUG_STR(m_firstRequest.url().string()));
</ins><span class="cx">
</span><span class="cx"> cancel();
</span><span class="cx"> complete();
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkDataTaskReplay::enqueueEventHandler()
</span><span class="cx"> {
</span><del>- DEBUG_LOG("URL = %{public}s", DEBUG_STR(m_firstRequest.url().string()));
</del><ins>+ DEBUG_LOG("URL = " STRING_SPECIFIER, DEBUG_STR(m_firstRequest.url().string()));
</ins><span class="cx">
</span><span class="cx"> RunLoop::main().dispatch([this, protectedThis = makeRef(*this)] {
</span><span class="cx"> DEBUG_LOG("enqueueEventHandler callback");
</span><span class="lines">@@ -138,13 +138,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_resource) {
</span><del>- DEBUG_LOG_ERROR("Error loading resource: could not find cached resource, URL = %{public}s", DEBUG_STR(m_currentRequest.url().string()));
</del><ins>+ DEBUG_LOG_ERROR("Error loading resource: could not find cached resource, URL = " STRING_SPECIFIER, DEBUG_STR(m_currentRequest.url().string()));
</ins><span class="cx"> didFinish(Error::NotFoundError); // TODO: Turn this into a 404?
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!equalLettersIgnoringASCIICase(m_currentRequest.httpMethod(), "get")) {
</span><del>- DEBUG_LOG_ERROR("Error loading resource: unsupported method (%{public}s), URL = %{public}s", DEBUG_STR(m_currentRequest.httpMethod()), DEBUG_STR(m_currentRequest.url().string()));
</del><ins>+ DEBUG_LOG_ERROR("Error loading resource: unsupported method (" STRING_SPECIFIER "), URL = " STRING_SPECIFIER, DEBUG_STR(m_currentRequest.httpMethod()), DEBUG_STR(m_currentRequest.url().string()));
</ins><span class="cx"> didFinish(Error::MethodNotAllowed);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx">
</span><span class="cx"> auto event = m_eventStream.nextEvent();
</span><span class="cx"> if (!event) {
</span><del>- DEBUG_LOG_ERROR("Error loading resource: nextEvent return null, URL = %{public}s", DEBUG_STR(m_currentRequest.url().string()));
</del><ins>+ DEBUG_LOG_ERROR("Error loading resource: nextEvent return null, URL = " STRING_SPECIFIER, DEBUG_STR(m_currentRequest.url().string()));
</ins><span class="cx"> didFinish(Error::NotFoundError); // TODO: Turn this into a 404?
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkDataTaskReplay::replayRequestSent(const RequestSentEvent& event)
</span><span class="cx"> {
</span><del>- DEBUG_LOG("URL = %{public}s", DEBUG_STR(m_firstRequest.url().string()));
</del><ins>+ DEBUG_LOG("URL = " STRING_SPECIFIER, DEBUG_STR(m_firstRequest.url().string()));
</ins><span class="cx">
</span><span class="cx"> enqueueEventHandler();
</span><span class="cx"> }
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkDataTaskReplay::replayResponseReceived(const ResponseReceivedEvent& event)
</span><span class="cx"> {
</span><del>- DEBUG_LOG("URL = %{public}s", DEBUG_STR(m_firstRequest.url().string()));
</del><ins>+ DEBUG_LOG("URL = " STRING_SPECIFIER, DEBUG_STR(m_firstRequest.url().string()));
</ins><span class="cx">
</span><span class="cx"> WebCore::ResourceResponse response(event.response);
</span><span class="cx"> didReceiveResponse(WTFMove(response));
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkDataTaskReplay::replayRedirectReceived(const RedirectReceivedEvent& event)
</span><span class="cx"> {
</span><del>- DEBUG_LOG("URL = %{public}s", DEBUG_STR(m_firstRequest.url().string()));
</del><ins>+ DEBUG_LOG("URL = " STRING_SPECIFIER, DEBUG_STR(m_firstRequest.url().string()));
</ins><span class="cx">
</span><span class="cx"> WebCore::ResourceResponse receivedResponse = event.response;
</span><span class="cx"> WebCore::ResourceRequest receivedRequest = event.request;
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(m_client);
</span><span class="cx"> m_client->willPerformHTTPRedirection(WTFMove(receivedResponse), WTFMove(receivedRequest), [this, protectedThis = makeRef(*this)] (const WebCore::ResourceRequest& updatedRequest) {
</span><del>- DEBUG_LOG("replayRedirectReceived callback: URL = %{public}s", DEBUG_STR(m_firstRequest.url().string()));
</del><ins>+ DEBUG_LOG("replayRedirectReceived callback: URL = " STRING_SPECIFIER, DEBUG_STR(m_firstRequest.url().string()));
</ins><span class="cx">
</span><span class="cx"> m_currentRequest = updatedRequest;
</span><span class="cx"> enqueueEventHandler();
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkDataTaskReplay::replayRedirectSent(const RedirectSentEvent& event)
</span><span class="cx"> {
</span><del>- DEBUG_LOG("URL = %{public}s", DEBUG_STR(m_firstRequest.url().string()));
</del><ins>+ DEBUG_LOG("URL = " STRING_SPECIFIER, DEBUG_STR(m_firstRequest.url().string()));
</ins><span class="cx">
</span><span class="cx"> enqueueEventHandler();
</span><span class="cx"> }
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkDataTaskReplay::replayDataReceived(const DataReceivedEvent& event)
</span><span class="cx"> {
</span><del>- DEBUG_LOG("URL = %{public}s", DEBUG_STR(m_firstRequest.url().string()));
</del><ins>+ DEBUG_LOG("URL = " STRING_SPECIFIER, DEBUG_STR(m_firstRequest.url().string()));
</ins><span class="cx">
</span><span class="cx"> ASSERT(m_client);
</span><span class="cx"> m_client->didReceiveData(event.data.copyRef());
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkDataTaskReplay::replayFinished(const FinishedEvent& event)
</span><span class="cx"> {
</span><del>- DEBUG_LOG("URL = %{public}s", DEBUG_STR(m_firstRequest.url().string()));
</del><ins>+ DEBUG_LOG("URL = " STRING_SPECIFIER, DEBUG_STR(m_firstRequest.url().string()));
</ins><span class="cx">
</span><span class="cx"> didFinish(event.error);
</span><span class="cx"> }
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkDataTaskReplay::didReceiveResponse(WebCore::ResourceResponse&& response)
</span><span class="cx"> {
</span><del>- DEBUG_LOG("URL = %{public}s", DEBUG_STR(m_firstRequest.url().string()));
</del><ins>+ DEBUG_LOG("URL = " STRING_SPECIFIER, DEBUG_STR(m_firstRequest.url().string()));
</ins><span class="cx">
</span><span class="cx"> ASSERT(m_client);
</span><span class="cx"> m_client->didReceiveResponseNetworkSession(WTFMove(response), [this, protectedThis = makeRef(*this)](WebCore::PolicyAction policyAction) {
</span></span></pre>
</div>
</div>
</body>
</html>