Title: [225029] trunk/Source/WebKit
- Revision
- 225029
- Author
- timothy_hor...@apple.com
- Date
- 2017-11-18 21:05:59 -0800 (Sat, 18 Nov 2017)
Log Message
Rename some Network Capture debugging defines
https://bugs.webkit.org/show_bug.cgi?id=179870
Reviewed by Darin Adler.
* NetworkProcess/capture/NetworkCaptureLogging.h:
* NetworkProcess/capture/NetworkCaptureManager.cpp:
(WebKit::NetworkCapture::Manager::findMatch):
(WebKit::NetworkCapture::Manager::fuzzyMatchURLs):
These shouldn't have WTF in their name - they have nothing to do with WTF.
These shouldn't use ENABLE(), since they're not features, just debugging macros.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (225028 => 225029)
--- trunk/Source/WebKit/ChangeLog 2017-11-19 03:48:23 UTC (rev 225028)
+++ trunk/Source/WebKit/ChangeLog 2017-11-19 05:05:59 UTC (rev 225029)
@@ -1,3 +1,17 @@
+2017-11-18 Tim Horton <timothy_hor...@apple.com>
+
+ Rename some Network Capture debugging defines
+ https://bugs.webkit.org/show_bug.cgi?id=179870
+
+ Reviewed by Darin Adler.
+
+ * NetworkProcess/capture/NetworkCaptureLogging.h:
+ * NetworkProcess/capture/NetworkCaptureManager.cpp:
+ (WebKit::NetworkCapture::Manager::findMatch):
+ (WebKit::NetworkCapture::Manager::fuzzyMatchURLs):
+ These shouldn't have WTF in their name - they have nothing to do with WTF.
+ These shouldn't use ENABLE(), since they're not features, just debugging macros.
+
2017-11-17 Chris Dumez <cdu...@apple.com>
[Service Workers] Implement "Notify Controller Change" algorithm
Modified: trunk/Source/WebKit/NetworkProcess/capture/NetworkCaptureLogging.h (225028 => 225029)
--- trunk/Source/WebKit/NetworkProcess/capture/NetworkCaptureLogging.h 2017-11-19 03:48:23 UTC (rev 225028)
+++ trunk/Source/WebKit/NetworkProcess/capture/NetworkCaptureLogging.h 2017-11-19 05:05:59 UTC (rev 225029)
@@ -29,8 +29,8 @@
#include "Logging.h"
-#define ENABLE_WTF_CAPTURE_INTERNAL_DEBUGGING 0
-#define ENABLE_WTF_VERBOSE_CAPTURE_INTERNAL_DEBUGGING 0
+#define CAPTURE_INTERNAL_DEBUGGING 0
+#define VERBOSE_CAPTURE_INTERNAL_DEBUGGING 0
#define DEBUG_STR(s) (s).ascii().data()
@@ -40,12 +40,12 @@
#define STRING_SPECIFIER "%{public}s"
#endif
-#if ENABLE(WTF_CAPTURE_INTERNAL_DEBUGGING)
+#if 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 - " 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)
+#if VERBOSE_CAPTURE_INTERNAL_DEBUGGING
#define DEBUG_LOG_VERBOSE(format, ...) DEBUG_LOG(format, ##__VA_ARGS__)
#else
#define DEBUG_LOG_VERBOSE(...) ((void)0)
Modified: trunk/Source/WebKit/NetworkProcess/capture/NetworkCaptureManager.cpp (225028 => 225029)
--- trunk/Source/WebKit/NetworkProcess/capture/NetworkCaptureManager.cpp 2017-11-19 03:48:23 UTC (rev 225028)
+++ trunk/Source/WebKit/NetworkProcess/capture/NetworkCaptureManager.cpp 2017-11-19 05:05:59 UTC (rev 225029)
@@ -103,7 +103,7 @@
if (!bestMatch)
bestMatch = findBestFuzzyMatch(request);
-#if ENABLE(WTF_CAPTURE_INTERNAL_DEBUGGING)
+#if CAPTURE_INTERNAL_DEBUGGING
if (!bestMatch)
DEBUG_LOG("Could not find match for: " STRING_SPECIFIER, DEBUG_STR(request.url().string()));
else if (request.url() == bestMatch->url())
@@ -289,7 +289,7 @@
for (; requestParameter != std::end(requestParameters) && resourceParameter != std::end(resourceParameters); ++requestParameter, ++resourceParameter) {
if (requestParameter->key == resourceParameter->key) {
-#if ENABLE(WTF_CAPTURE_INTERNAL_DEBUGGING)
+#if CAPTURE_INTERNAL_DEBUGGING
if (requestParameter->value == resourceParameter->value)
DEBUG_LOG("Matching parameter names and values: \"" STRING_SPECIFIER "\" = \"" STRING_SPECIFIER "\"", DEBUG_STR(requestParameter->first), DEBUG_STR(requestParameter->second));
else
@@ -309,7 +309,7 @@
DEBUG_LOG("Skipping past %d non-matching parameter names", static_cast<int>(std::distance(scanningIter, scanner)));
score += kParameterMissingScore * std::distance(scanningIter, scanner);
DEBUG_LOG("Score = %d", score);
-#if ENABLE(WTF_CAPTURE_INTERNAL_DEBUGGING)
+#if CAPTURE_INTERNAL_DEBUGGING
if (fixedIter->second == scanner->second)
DEBUG_LOG("Matching parameter names and values: \"" STRING_SPECIFIER "\" = \"" STRING_SPECIFIER "\"", DEBUG_STR(fixedIter->first), DEBUG_STR(fixedIter->second));
else
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
