WebKit Bugzilla
Attachment 356746 Details for
Bug 192474
: Content Extensions: Misc fixes to debugging / perf testing code
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-192474-20181206232844.patch (text/plain), 3.99 KB, created by
Adrian Perez
on 2018-12-06 13:28:46 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Adrian Perez
Created:
2018-12-06 13:28:46 PST
Size:
3.99 KB
patch
obsolete
>Subversion Revision: 238938 >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index ecf198d652f45c3e24562f08c6a025a49def0788..6121076d7c0d1176ecb121e8bd65969389e75041 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,29 @@ >+2018-12-06 Adrian Perez de Castro <aperez@igalia.com> >+ >+ Content Extensions: Misc fixes to debugging / perf testing code >+ https://bugs.webkit.org/show_bug.cgi?id=192474 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ This make it possible to build the content extensions support with the >+ debuggin 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 <achristensen@webkit.org> > > Remove unused LoaderStrategy::storeDerivedDataToCache and associated dead code >diff --git a/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp b/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp >index 35a72dca7750bf2bc37a5a1403a5cd124ab379e5..04e95fa92de3398ff37ee554f83fe4b012fe18f1 100644 >--- a/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp >+++ b/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp >@@ -427,9 +427,6 @@ std::error_code compileRuleList(ContentExtensionCompilationClient& client, Strin > #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(); >diff --git a/Source/WebCore/contentextensions/DFA.cpp b/Source/WebCore/contentextensions/DFA.cpp >index 40dee4a32187cbaaf4cd6eb55e3c04daf3fbd80f..925a675836e3a8a3ce88c10edf23d83fc9872e72 100644 >--- a/Source/WebCore/contentextensions/DFA.cpp >+++ b/Source/WebCore/contentextensions/DFA.cpp >@@ -152,7 +152,7 @@ void DFA::debugPrintDot() const > for (unsigned actionIndex = 0; actionIndex < actions.size(); ++actionIndex) { > if (actionIndex) > dataLogF(", "); >- dataLogF("%llu", actions[actionIndex]); >+ dataLogF("%" PRIu64, actions[actionIndex]); > } > } > dataLogF(">]"); >diff --git a/Source/WebCore/contentextensions/NFA.cpp b/Source/WebCore/contentextensions/NFA.cpp >index bc9921a79945d0d8e5749ffb859ced2b1b4b8e6a..43c37e93b7f39da6c42369404b184115d8bb2d8f 100644 >--- a/Source/WebCore/contentextensions/NFA.cpp >+++ b/Source/WebCore/contentextensions/NFA.cpp >@@ -54,7 +54,7 @@ void NFA::debugPrintDot() const > for (unsigned actionIndex = node.actionStart; actionIndex < node.actionEnd; ++actionIndex) { > if (!isFirst) > dataLogF(", "); >- dataLogF("%llu", actions[actionIndex]); >+ dataLogF("%" PRIu64, actions[actionIndex]); > isFirst = false; > } > dataLogF(")");
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 192474
:
356746
|
356751