Diff
Modified: trunk/Source/WebKit2/ChangeLog (209624 => 209625)
--- 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)
@@ -1,3 +1,49 @@
+2016-12-09 Keith Rollin <krol...@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):
+
2016-12-09 Jeremy Jones <jere...@apple.com>
WebView doesn't become first responder in element fullscreen.
Modified: trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureLogging.h (209624 => 209625)
--- 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)
@@ -34,11 +34,17 @@
#define DEBUG_STR(s) (s).ascii().data()
+#if RELEASE_LOG_DISABLED
+#define STRING_SPECIFIER "%s"
+#else
+#define STRING_SPECIFIER "%{public}s"
+#endif
+
#if ENABLE(WTF_CAPTURE_INTERNAL_DEBUGGING)
#define DEBUG_LOG_QUOTE(str) #str
#define DEBUG_LOG_EXPAND_AND_QUOTE(str) DEBUG_LOG_QUOTE(str)
-#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__)
+#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__)
#if ENABLE(WTF_VERBOSE_CAPTURE_INTERNAL_DEBUGGING)
#define DEBUG_LOG_VERBOSE(format, ...) DEBUG_LOG(format, ##__VA_ARGS__)
#else
@@ -46,7 +52,7 @@
#endif
#else
#define DEBUG_LOG(...) ((void)0)
-#define DEBUG_LOG_ERROR(...) ((void)0)
+#define DEBUG_LOG_ERROR(...) RELEASE_LOG_ERROR(Network, __VA_ARGS__)
#define DEBUG_LOG_VERBOSE(...) ((void)0)
#endif
Modified: trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureManager.cpp (209624 => 209625)
--- 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)
@@ -76,7 +76,7 @@
m_recordFileHandle = WebCore::FileHandle(reportRecordPath(), WebCore::OpenForWrite);
m_replayFileHandle = WebCore::FileHandle(reportReplayPath(), WebCore::OpenForWrite);
- DEBUG_LOG("Cache location = %{public}s", DEBUG_STR(m_recordReplayCacheLocation));
+ DEBUG_LOG("Cache location = " STRING_SPECIFIER, DEBUG_STR(m_recordReplayCacheLocation));
if (isReplaying())
loadResources();
@@ -91,7 +91,7 @@
Resource* Manager::findMatch(const WebCore::ResourceRequest& request)
{
- DEBUG_LOG_VERBOSE("URL = "" DEBUG_STR(request.url().string()));
+ DEBUG_LOG_VERBOSE("URL = "" STRING_SPECIFIER, DEBUG_STR(request.url().string()));
auto bestMatch = findExactMatch(request);
if (!bestMatch)
@@ -99,12 +99,12 @@
#if ENABLE(WTF_CAPTURE_INTERNAL_DEBUGGING)
if (!bestMatch)
- DEBUG_LOG("Could not find match for: %{public}s", DEBUG_STR(request.url().string()));
+ DEBUG_LOG("Could not find match for: " STRING_SPECIFIER, DEBUG_STR(request.url().string()));
else if (request.url() == bestMatch->url())
- DEBUG_LOG("Found exact match for: %{public}s", DEBUG_STR(request.url().string()));
+ DEBUG_LOG("Found exact match for: " STRING_SPECIFIER, DEBUG_STR(request.url().string()));
else {
- DEBUG_LOG("Found fuzzy match for: %{public}s", DEBUG_STR(request.url().string()));
- DEBUG_LOG(" replaced with : %{public}s", DEBUG_STR(bestMatch->url().string()));
+ DEBUG_LOG("Found fuzzy match for: " STRING_SPECIFIER, DEBUG_STR(request.url().string()));
+ DEBUG_LOG(" replaced with : " STRING_SPECIFIER, DEBUG_STR(bestMatch->url().string()));
}
#endif
@@ -119,7 +119,7 @@
});
if (lower != std::end(m_cachedResources) && lower->url() == url) {
- DEBUG_LOG_VERBOSE("Found exact match: %{public}s", DEBUG_STR(lower->url().string()));
+ DEBUG_LOG_VERBOSE("Found exact match: " STRING_SPECIFIER, DEBUG_STR(lower->url().string()));
return &*lower;
}
@@ -145,7 +145,7 @@
int thisScore = fuzzyMatchURLs(url, requestParameters, iResource->url(), iResource->queryParameters());
// TODO: Consider ignoring any matches < 0 as being too different.
if (bestScore < thisScore) {
- DEBUG_LOG("New best match (%d): %{public}s", thisScore, DEBUG_STR(iResource->url().string()));
+ DEBUG_LOG("New best match (%d): " STRING_SPECIFIER, thisScore, DEBUG_STR(iResource->url().string()));
bestScore = thisScore;
bestMatch = &*iResource;
if (bestScore == kMaxMatch)
@@ -171,7 +171,7 @@
// match.
if (!protocolHostAndPortAreEqual(requestURL, resourceURL)) {
- DEBUG_LOG("Scheme/host/port mismatch: %{public}s != %{public}s", DEBUG_STR(requestURL.string()), DEBUG_STR(resourceURL.string()));
+ DEBUG_LOG("Scheme/host/port mismatch: " STRING_SPECIFIER " != " STRING_SPECIFIER, DEBUG_STR(requestURL.string()), DEBUG_STR(resourceURL.string()));
return kMinMatch;
}
@@ -178,13 +178,13 @@
// If fragments don't match, return this as the "worst" match.
if (requestURL.fragmentIdentifier() != resourceURL.fragmentIdentifier()) {
- DEBUG_LOG("Fragments mismatch: %{public}s != %{public}s", DEBUG_STR(requestURL.string()), DEBUG_STR(resourceURL.string()));
+ DEBUG_LOG("Fragments mismatch: " STRING_SPECIFIER " != " STRING_SPECIFIER, DEBUG_STR(requestURL.string()), DEBUG_STR(resourceURL.string()));
return kMinMatch;
}
DEBUG_LOG("Fuzzy matching:");
- DEBUG_LOG(" : %{public}s", DEBUG_STR(requestURL.string()));
- DEBUG_LOG(" : %{public}s", DEBUG_STR(resourceURL.string()));
+ DEBUG_LOG(" : " STRING_SPECIFIER, DEBUG_STR(requestURL.string()));
+ DEBUG_LOG(" : " STRING_SPECIFIER, DEBUG_STR(resourceURL.string()));
// Compare the path components and the query parameters. Score each partial
// match as +4, each mismatch as -1, and each missing component as -1.
@@ -285,14 +285,14 @@
if (requestParameter->first == resourceParameter->first) {
#if ENABLE(WTF_CAPTURE_INTERNAL_DEBUGGING)
if (requestParameter->second == resourceParameter->second)
- DEBUG_LOG("Matching parameter names and values: \"%{public}s\" = \"%{public}s\"", DEBUG_STR(requestParameter->first), DEBUG_STR(requestParameter->second));
+ DEBUG_LOG("Matching parameter names and values: \"" STRING_SPECIFIER "\" = \"" STRING_SPECIFIER "\"", DEBUG_STR(requestParameter->first), DEBUG_STR(requestParameter->second));
else
- DEBUG_LOG("Mismatching parameter values: \"%{public}s\" = \"%{public}s\" vs. \"%{public}s\"", DEBUG_STR(requestParameter->first), DEBUG_STR(requestParameter->second), DEBUG_STR(resourceParameter->second));
+ DEBUG_LOG("Mismatching parameter values: \"" STRING_SPECIFIER "\" = \"" STRING_SPECIFIER "\" vs. \"" STRING_SPECIFIER "\"", DEBUG_STR(requestParameter->first), DEBUG_STR(requestParameter->second), DEBUG_STR(resourceParameter->second));
#endif
score += (requestParameter->second == resourceParameter->second) ? kParameterMatchScore : kParameterMismatchScore;
DEBUG_LOG("Score = %d", score);
} else {
- DEBUG_LOG("Mismatching parameter names: %{public}s, %{public}s", DEBUG_STR(requestParameter->first), DEBUG_STR(resourceParameter->first));
+ DEBUG_LOG("Mismatching parameter names: " STRING_SPECIFIER ", " STRING_SPECIFIER, DEBUG_STR(requestParameter->first), DEBUG_STR(resourceParameter->first));
const auto scanForwardForMatch = [this, &score, kParameterMatchScore, kParameterMismatchScore, kParameterMissingScore](const auto& fixedIter, auto& scanningIter, const auto& scannerEnd) {
auto scanner = scanningIter;
@@ -305,9 +305,9 @@
DEBUG_LOG("Score = %d", score);
#if ENABLE(WTF_CAPTURE_INTERNAL_DEBUGGING)
if (fixedIter->second == scanner->second)
- DEBUG_LOG("Matching parameter names and values: \"%{public}s\" = \"%{public}s\"", DEBUG_STR(fixedIter->first), DEBUG_STR(fixedIter->second));
+ DEBUG_LOG("Matching parameter names and values: \"" STRING_SPECIFIER "\" = \"" STRING_SPECIFIER "\"", DEBUG_STR(fixedIter->first), DEBUG_STR(fixedIter->second));
else
- DEBUG_LOG("Mismatching parameter values: \"%{public}s\" = \"%{public}s\" vs. \"%{public}s\"", DEBUG_STR(fixedIter->first), DEBUG_STR(fixedIter->second), DEBUG_STR(scanner->second));
+ DEBUG_LOG("Mismatching parameter values: \"" STRING_SPECIFIER "\" = \"" STRING_SPECIFIER "\" vs. \"" STRING_SPECIFIER "\"", DEBUG_STR(fixedIter->first), DEBUG_STR(fixedIter->second), DEBUG_STR(scanner->second));
#endif
score += (fixedIter->second == scanner->second) ? kParameterMatchScore : kParameterMismatchScore;
DEBUG_LOG("Score = %d", score);
@@ -317,8 +317,8 @@
if (!scanForwardForMatch(requestParameter, resourceParameter, std::end(resourceParameters))) {
if (!scanForwardForMatch(resourceParameter, requestParameter, std::end(requestParameters))) {
- 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));
+ 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));
score += kParameterMissingScore + kParameterMissingScore;
DEBUG_LOG("Score = %d", score);
}
@@ -436,9 +436,9 @@
const auto& url = ""
if (wasCacheMiss)
- DEBUG_LOG("Cache miss: URL = "" DEBUG_STR(url.string()));
+ DEBUG_LOG("Cache miss: URL = "" STRING_SPECIFIER, DEBUG_STR(url.string()));
else
- DEBUG_LOG("Cache hit: URL = "" DEBUG_STR(url.string()));
+ DEBUG_LOG("Cache hit: URL = "" STRING_SPECIFIER, DEBUG_STR(url.string()));
m_replayFileHandle.printf("%s %s\n", wasCacheMiss ? "miss" : "hit ", DEBUG_STR(url.string()));
}
@@ -458,7 +458,7 @@
if (mode != WebCore::OpenForRead) {
const auto& parentDir = WebCore::directoryName(filePath);
if (!WebCore::makeAllDirectories(parentDir)) {
- DEBUG_LOG_ERROR("Error %d trying to create intermediate directories: %{public}s", errno, DEBUG_STR(parentDir));
+ DEBUG_LOG_ERROR("Error %d trying to create intermediate directories: " STRING_SPECIFIER, errno, DEBUG_STR(parentDir));
return fileHandle;
}
@@ -471,9 +471,9 @@
// file handle.
if (mode == WebCore::OpenForRead)
- DEBUG_LOG_ERROR("Error %d trying to open %{public}s for reading", errno, DEBUG_STR(filePath));
+ DEBUG_LOG_ERROR("Error %d trying to open " STRING_SPECIFIER " for reading", errno, DEBUG_STR(filePath));
else
- DEBUG_LOG_ERROR("Error %d trying to open %{public}s for writing", errno, DEBUG_STR(filePath));
+ DEBUG_LOG_ERROR("Error %d trying to open " STRING_SPECIFIER " for writing", errno, DEBUG_STR(filePath));
return fileHandle;
}
@@ -513,7 +513,7 @@
String word;
while (getWord(p, end, word)) {
if (!word.isEmpty()) {
- DEBUG_LOG_VERBOSE("Adding word: %{public}s", DEBUG_STR(word));
+ DEBUG_LOG_VERBOSE("Adding word: " STRING_SPECIFIER, DEBUG_STR(word));
line.append(word);
}
}
Modified: trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureRecorder.cpp (209624 => 209625)
--- 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)
@@ -58,7 +58,7 @@
if (m_events.size())
return;
- DEBUG_LOG("Sent request for URL = "" DEBUG_STR(request.url().string()));
+ DEBUG_LOG("Sent request for URL = "" STRING_SPECIFIER, DEBUG_STR(request.url().string()));
m_initialRequest = request;
recordEvent(RequestSentEvent(request));
@@ -68,7 +68,7 @@
{
// Called when receiving a response other than a redirect or error.
- DEBUG_LOG("Received response from URL = "" DEBUG_STR(response.url().string()));
+ DEBUG_LOG("Received response from URL = "" STRING_SPECIFIER, DEBUG_STR(response.url().string()));
ASSERT(m_events.size());
// TODO: Is there a better response to receiving a multi-part resource?
@@ -83,7 +83,7 @@
void Recorder::recordRedirectReceived(const WebCore::ResourceRequest& request, const WebCore::ResourceResponse& response)
{
- DEBUG_LOG("Received redirect to URL = "" DEBUG_STR(request.url().string()));
+ DEBUG_LOG("Received redirect to URL = "" STRING_SPECIFIER, DEBUG_STR(request.url().string()));
ASSERT(m_events.size());
recordEvent(RedirectReceivedEvent(request, response));
@@ -91,7 +91,7 @@
void Recorder::recordRedirectSent(const WebCore::ResourceRequest& request)
{
- DEBUG_LOG("Sent redirect for URL = "" DEBUG_STR(request.url().string()));
+ DEBUG_LOG("Sent redirect for URL = "" STRING_SPECIFIER, DEBUG_STR(request.url().string()));
ASSERT(m_events.size());
recordEvent(RedirectSentEvent(request));
@@ -142,7 +142,7 @@
// file. It also works better with JSON parsers that expect to find a
// NUL at the end of their input.
if (handle.write(asString.c_str(), asString.size() + 1) == -1) {
- DEBUG_LOG_ERROR("Error trying to write to file for URL = "" DEBUG_STR(m_initialRequest.url().string()));
+ DEBUG_LOG_ERROR("Error trying to write to file for URL = "" STRING_SPECIFIER, DEBUG_STR(m_initialRequest.url().string()));
return;
}
}
Modified: trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureResource.cpp (209624 => 209625)
--- 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)
@@ -46,9 +46,9 @@
auto events = eventStream();
auto event = events.nextEvent();
if (!event)
- DEBUG_LOG_ERROR("Event stream does not contain events: file = %{public}s", DEBUG_STR(m_eventFilePath));
+ DEBUG_LOG_ERROR("Event stream does not contain events: file = " STRING_SPECIFIER, DEBUG_STR(m_eventFilePath));
else if (!WTF::holds_alternative<RequestSentEvent>(*event))
- DEBUG_LOG_ERROR("Event stream does not have a requestSent event: file = %{public}s", DEBUG_STR(m_eventFilePath));
+ DEBUG_LOG_ERROR("Event stream does not have a requestSent event: file = " STRING_SPECIFIER, DEBUG_STR(m_eventFilePath));
else {
auto requestSentEvent = WTF::get<RequestSentEvent>(*event);
WebCore::URLParser parser(requestSentEvent.request.url);
@@ -93,7 +93,7 @@
OptionalCaptureEvent Resource::EventStream::nextEvent()
{
if (m_offset == m_mappedEventFile.size()) {
- DEBUG_LOG_ERROR("Unable to return event - at end of file: %{public}s", DEBUG_STR(m_eventFilePath));
+ DEBUG_LOG_ERROR("Unable to return event - at end of file: " STRING_SPECIFIER, DEBUG_STR(m_eventFilePath));
return std::nullopt;
}
@@ -104,7 +104,7 @@
++m_offset;
if (m_offset == m_mappedEventFile.size()) {
- DEBUG_LOG_ERROR("Unable to return event - no terminating NUL: %{public}s", DEBUG_STR(m_eventFilePath));
+ DEBUG_LOG_ERROR("Unable to return event - no terminating NUL: " STRING_SPECIFIER, DEBUG_STR(m_eventFilePath));
return std::nullopt;
}
Modified: trunk/Source/WebKit2/NetworkProcess/capture/NetworkDataTaskReplay.cpp (209624 => 209625)
--- 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)
@@ -50,8 +50,8 @@
, m_currentRequest(m_firstRequest)
, m_resource(resource)
{
- DEBUG_LOG("request URL = "" DEBUG_STR(m_firstRequest.url().string()));
- DEBUG_LOG("cached URL = "" resource ? DEBUG_STR(resource->url().string()) : "<not found>");
+ 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>");
m_session->registerNetworkDataTask(*this);
@@ -61,7 +61,7 @@
NetworkDataTaskReplay::~NetworkDataTaskReplay()
{
- DEBUG_LOG("URL = "" DEBUG_STR(m_firstRequest.url().string()));
+ DEBUG_LOG("URL = "" STRING_SPECIFIER, DEBUG_STR(m_firstRequest.url().string()));
m_session->unregisterNetworkDataTask(*this);
}
@@ -68,7 +68,7 @@
void NetworkDataTaskReplay::resume()
{
- DEBUG_LOG("URL = "" DEBUG_STR(m_firstRequest.url().string()));
+ DEBUG_LOG("URL = "" STRING_SPECIFIER, DEBUG_STR(m_firstRequest.url().string()));
if (m_state == State::Canceling || m_state == State::Completed)
return;
@@ -85,7 +85,7 @@
void NetworkDataTaskReplay::suspend()
{
- DEBUG_LOG("URL = "" DEBUG_STR(m_firstRequest.url().string()));
+ DEBUG_LOG("URL = "" STRING_SPECIFIER, DEBUG_STR(m_firstRequest.url().string()));
if (m_state == State::Canceling || m_state == State::Completed)
return;
@@ -105,7 +105,7 @@
void NetworkDataTaskReplay::complete()
{
- DEBUG_LOG("URL = "" DEBUG_STR(m_firstRequest.url().string()));
+ DEBUG_LOG("URL = "" STRING_SPECIFIER, DEBUG_STR(m_firstRequest.url().string()));
if (m_state == State::Completed)
return;
@@ -116,7 +116,7 @@
void NetworkDataTaskReplay::invalidateAndCancel()
{
- DEBUG_LOG("URL = "" DEBUG_STR(m_firstRequest.url().string()));
+ DEBUG_LOG("URL = "" STRING_SPECIFIER, DEBUG_STR(m_firstRequest.url().string()));
cancel();
complete();
@@ -124,7 +124,7 @@
void NetworkDataTaskReplay::enqueueEventHandler()
{
- DEBUG_LOG("URL = "" DEBUG_STR(m_firstRequest.url().string()));
+ DEBUG_LOG("URL = "" STRING_SPECIFIER, DEBUG_STR(m_firstRequest.url().string()));
RunLoop::main().dispatch([this, protectedThis = makeRef(*this)] {
DEBUG_LOG("enqueueEventHandler callback");
@@ -138,13 +138,13 @@
}
if (!m_resource) {
- DEBUG_LOG_ERROR("Error loading resource: could not find cached resource, URL = "" DEBUG_STR(m_currentRequest.url().string()));
+ DEBUG_LOG_ERROR("Error loading resource: could not find cached resource, URL = "" STRING_SPECIFIER, DEBUG_STR(m_currentRequest.url().string()));
didFinish(Error::NotFoundError); // TODO: Turn this into a 404?
return;
}
if (!equalLettersIgnoringASCIICase(m_currentRequest.httpMethod(), "get")) {
- DEBUG_LOG_ERROR("Error loading resource: unsupported method (%{public}s), URL = "" DEBUG_STR(m_currentRequest.httpMethod()), DEBUG_STR(m_currentRequest.url().string()));
+ DEBUG_LOG_ERROR("Error loading resource: unsupported method (" STRING_SPECIFIER "), URL = "" STRING_SPECIFIER, DEBUG_STR(m_currentRequest.httpMethod()), DEBUG_STR(m_currentRequest.url().string()));
didFinish(Error::MethodNotAllowed);
return;
}
@@ -151,7 +151,7 @@
auto event = m_eventStream.nextEvent();
if (!event) {
- DEBUG_LOG_ERROR("Error loading resource: nextEvent return null, URL = "" DEBUG_STR(m_currentRequest.url().string()));
+ DEBUG_LOG_ERROR("Error loading resource: nextEvent return null, URL = "" STRING_SPECIFIER, DEBUG_STR(m_currentRequest.url().string()));
didFinish(Error::NotFoundError); // TODO: Turn this into a 404?
return;
}
@@ -182,7 +182,7 @@
void NetworkDataTaskReplay::replayRequestSent(const RequestSentEvent& event)
{
- DEBUG_LOG("URL = "" DEBUG_STR(m_firstRequest.url().string()));
+ DEBUG_LOG("URL = "" STRING_SPECIFIER, DEBUG_STR(m_firstRequest.url().string()));
enqueueEventHandler();
}
@@ -189,7 +189,7 @@
void NetworkDataTaskReplay::replayResponseReceived(const ResponseReceivedEvent& event)
{
- DEBUG_LOG("URL = "" DEBUG_STR(m_firstRequest.url().string()));
+ DEBUG_LOG("URL = "" STRING_SPECIFIER, DEBUG_STR(m_firstRequest.url().string()));
WebCore::ResourceResponse response(event.response);
didReceiveResponse(WTFMove(response));
@@ -197,7 +197,7 @@
void NetworkDataTaskReplay::replayRedirectReceived(const RedirectReceivedEvent& event)
{
- DEBUG_LOG("URL = "" DEBUG_STR(m_firstRequest.url().string()));
+ DEBUG_LOG("URL = "" STRING_SPECIFIER, DEBUG_STR(m_firstRequest.url().string()));
WebCore::ResourceResponse receivedResponse = event.response;
WebCore::ResourceRequest receivedRequest = event.request;
@@ -204,7 +204,7 @@
ASSERT(m_client);
m_client->willPerformHTTPRedirection(WTFMove(receivedResponse), WTFMove(receivedRequest), [this, protectedThis = makeRef(*this)] (const WebCore::ResourceRequest& updatedRequest) {
- DEBUG_LOG("replayRedirectReceived callback: URL = "" DEBUG_STR(m_firstRequest.url().string()));
+ DEBUG_LOG("replayRedirectReceived callback: URL = "" STRING_SPECIFIER, DEBUG_STR(m_firstRequest.url().string()));
m_currentRequest = updatedRequest;
enqueueEventHandler();
@@ -213,7 +213,7 @@
void NetworkDataTaskReplay::replayRedirectSent(const RedirectSentEvent& event)
{
- DEBUG_LOG("URL = "" DEBUG_STR(m_firstRequest.url().string()));
+ DEBUG_LOG("URL = "" STRING_SPECIFIER, DEBUG_STR(m_firstRequest.url().string()));
enqueueEventHandler();
}
@@ -220,7 +220,7 @@
void NetworkDataTaskReplay::replayDataReceived(const DataReceivedEvent& event)
{
- DEBUG_LOG("URL = "" DEBUG_STR(m_firstRequest.url().string()));
+ DEBUG_LOG("URL = "" STRING_SPECIFIER, DEBUG_STR(m_firstRequest.url().string()));
ASSERT(m_client);
m_client->didReceiveData(event.data.copyRef());
@@ -230,7 +230,7 @@
void NetworkDataTaskReplay::replayFinished(const FinishedEvent& event)
{
- DEBUG_LOG("URL = "" DEBUG_STR(m_firstRequest.url().string()));
+ DEBUG_LOG("URL = "" STRING_SPECIFIER, DEBUG_STR(m_firstRequest.url().string()));
didFinish(event.error);
}
@@ -237,7 +237,7 @@
void NetworkDataTaskReplay::didReceiveResponse(WebCore::ResourceResponse&& response)
{
- DEBUG_LOG("URL = "" DEBUG_STR(m_firstRequest.url().string()));
+ DEBUG_LOG("URL = "" STRING_SPECIFIER, DEBUG_STR(m_firstRequest.url().string()));
ASSERT(m_client);
m_client->didReceiveResponseNetworkSession(WTFMove(response), [this, protectedThis = makeRef(*this)](WebCore::PolicyAction policyAction) {
