Title: [238942] trunk/Source/WebCore
- Revision
- 238942
- Author
- [email protected]
- Date
- 2018-12-06 14:34:54 -0800 (Thu, 06 Dec 2018)
Log Message
Content Extensions: Misc fixes to debugging / perf testing code
https://bugs.webkit.org/show_bug.cgi?id=192474
Reviewed by Mark Lam.
This make it possible to build the content extensions support with the
debugging features enabled. In particular, building with
CONTENT_EXTENSIONS_PERFORMANCE_REPORTING enabled was broken.
No new tests needed.
* contentextensions/ContentExtensionCompiler.cpp:
(WebCore::ContentExtensions::compileRuleList): Remove usage of removed
variables machinesWihthoutConditionsCount,
totalBytecodeSizeForMachinesWithoutConditions,
machinesWithConditionsCount, and
totalBytecodeSizeForMachinesWithConditions.
* contentextensions/DFA.cpp:
(WebCore::ContentExtensions::DFA::debugPrintDot const):
Use "%" PRIu64 instead of "%llu" to format uint64_t values.
* contentextensions/NFA.cpp:
(WebCore::ContentExtensions::NFA::debugPrintDot const):
Use "%" PRIu64 instead of "%llu" to format uint64_t values.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (238941 => 238942)
--- trunk/Source/WebCore/ChangeLog 2018-12-06 22:11:45 UTC (rev 238941)
+++ trunk/Source/WebCore/ChangeLog 2018-12-06 22:34:54 UTC (rev 238942)
@@ -1,3 +1,29 @@
+2018-12-06 Adrian Perez de Castro <[email protected]>
+
+ Content Extensions: Misc fixes to debugging / perf testing code
+ https://bugs.webkit.org/show_bug.cgi?id=192474
+
+ Reviewed by Mark Lam.
+
+ This make it possible to build the content extensions support with the
+ debugging features enabled. In particular, building with
+ CONTENT_EXTENSIONS_PERFORMANCE_REPORTING enabled was broken.
+
+ No new tests needed.
+
+ * contentextensions/ContentExtensionCompiler.cpp:
+ (WebCore::ContentExtensions::compileRuleList): Remove usage of removed
+ variables machinesWihthoutConditionsCount,
+ totalBytecodeSizeForMachinesWithoutConditions,
+ machinesWithConditionsCount, and
+ totalBytecodeSizeForMachinesWithConditions.
+ * contentextensions/DFA.cpp:
+ (WebCore::ContentExtensions::DFA::debugPrintDot const):
+ Use "%" PRIu64 instead of "%llu" to format uint64_t values.
+ * contentextensions/NFA.cpp:
+ (WebCore::ContentExtensions::NFA::debugPrintDot const):
+ Use "%" PRIu64 instead of "%llu" to format uint64_t values.
+
2018-12-06 Alex Christensen <[email protected]>
Remove unused LoaderStrategy::storeDerivedDataToCache and associated dead code
Modified: trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp (238941 => 238942)
--- trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp 2018-12-06 22:11:45 UTC (rev 238941)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp 2018-12-06 22:34:54 UTC (rev 238942)
@@ -427,9 +427,6 @@
#if CONTENT_EXTENSIONS_PERFORMANCE_REPORTING
MonotonicTime totalNFAToByteCodeBuildTimeEnd = MonotonicTime::now();
dataLogF(" Time spent building and compiling the DFAs: %f\n", (totalNFAToByteCodeBuildTimeEnd - totalNFAToByteCodeBuildTimeStart).seconds());
-
- dataLogF(" Number of machines without condition filters: %d (total bytecode size = %d)\n", machinesWithoutConditionsCount, totalBytecodeSizeForMachinesWithoutConditions);
- dataLogF(" Number of machines with condition filters: %d (total bytecode size = %d)\n", machinesWithConditionsCount, totalBytecodeSizeForMachinesWithConditions);
#endif
client.finalize();
Modified: trunk/Source/WebCore/contentextensions/DFA.cpp (238941 => 238942)
--- trunk/Source/WebCore/contentextensions/DFA.cpp 2018-12-06 22:11:45 UTC (rev 238941)
+++ trunk/Source/WebCore/contentextensions/DFA.cpp 2018-12-06 22:34:54 UTC (rev 238942)
@@ -152,7 +152,7 @@
for (unsigned actionIndex = 0; actionIndex < actions.size(); ++actionIndex) {
if (actionIndex)
dataLogF(", ");
- dataLogF("%llu", actions[actionIndex]);
+ dataLogF("%" PRIu64, actions[actionIndex]);
}
}
dataLogF(">]");
Modified: trunk/Source/WebCore/contentextensions/NFA.cpp (238941 => 238942)
--- trunk/Source/WebCore/contentextensions/NFA.cpp 2018-12-06 22:11:45 UTC (rev 238941)
+++ trunk/Source/WebCore/contentextensions/NFA.cpp 2018-12-06 22:34:54 UTC (rev 238942)
@@ -54,7 +54,7 @@
for (unsigned actionIndex = node.actionStart; actionIndex < node.actionEnd; ++actionIndex) {
if (!isFirst)
dataLogF(", ");
- dataLogF("%llu", actions[actionIndex]);
+ dataLogF("%" PRIu64, actions[actionIndex]);
isFirst = false;
}
dataLogF(")");
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
