| Summary: | www-client/chromium-70.0.3538.67 - redefinition of kForcedInvocationDeadline | ||
|---|---|---|---|
| Product: | Gentoo Linux | Reporter: | Oliver Schwabedissen <Oliver> |
| Component: | Current packages | Assignee: | Chromium Project <chromium> |
| Status: | RESOLVED FIXED | ||
| Severity: | normal | CC: | Oliver |
| Priority: | Normal | ||
| Version: | unspecified | ||
| Hardware: | AMD64 | ||
| OS: | Linux | ||
| Whiteboard: | |||
| Package list: | Runtime testing required: | --- | |
| Attachments: |
Compressed build.log
Patch #1 Patch #2 |
||
|
Description
Oliver Schwabedissen
2018-10-25 15:32:37 UTC
Created attachment 552868 [details, diff]
Patch #1
Created attachment 552870 [details, diff]
Patch #2
The same error occurred when compiling chromium-70.0.3538.110.
I had to modify patch #1 as the line numbers changed. With these patches chromium-70.0.3538.110 compiled without problems.
Modified patch #1
diff --git a/third_party/blink/renderer/core/editing/finder/text_finder.cc b/third_party/blink/renderer/core/editing/finder/text_finder.cc
index 3c0dcd3..4326d20 100644
--- a/third_party/blink/renderer/core/editing/finder/text_finder.cc
+++ b/third_party/blink/renderer/core/editing/finder/text_finder.cc
@@ -68,7 +68,7 @@
namespace blink {
namespace {
-constexpr TimeDelta kForcedInvocationDeadline = TimeDelta::FromSeconds(10);
+constexpr TimeDelta kTextFinderTestTimeout = TimeDelta::FromSeconds(10);
}
TextFinder::FindMatch::FindMatch(Range* range, int ordinal)
@@ -894,7 +894,7 @@ void TextFinder::ScopeStringMatchesSoon(int identifier,
// https://crbug.com/875203
if (options.run_synchronously_for_testing) {
ScopeStringMatches(
- IdleDeadline::Create(CurrentTimeTicks() + kForcedInvocationDeadline,
+ IdleDeadline::Create(CurrentTimeTicks() + kTextFinderTestTimeout,
IdleDeadline::CallbackType::kCalledWhenIdle),
identifier, search_text, options);
} else {
I had the same problem again when emerging chromium-70.0.3538.110. Luckily I only had to modify patch #1 slightly as one line number changed.
Modified patch #1 (chromium-70.0.3538.110-text_finder.patch):
diff --git a/third_party/blink/renderer/core/editing/finder/text_finder.cc b/third_party/blink/renderer/core/editing/finder/text_finder.cc
index 3c0dcd3..4326d20 100644
--- a/third_party/blink/renderer/core/editing/finder/text_finder.cc
+++ b/third_party/blink/renderer/core/editing/finder/text_finder.cc
@@ -68,7 +68,7 @@
namespace blink {
namespace {
-constexpr TimeDelta kForcedInvocationDeadline = TimeDelta::FromSeconds(10);
+constexpr TimeDelta kTextFinderTestTimeout = TimeDelta::FromSeconds(10);
}
TextFinder::FindMatch::FindMatch(Range* range, int ordinal)
@@ -894,7 +894,7 @@ void TextFinder::ScopeStringMatchesSoon(int identifier,
// https://crbug.com/875203
if (options.run_synchronously_for_testing) {
ScopeStringMatches(
- IdleDeadline::Create(CurrentTimeTicks() + kForcedInvocationDeadline,
+ IdleDeadline::Create(CurrentTimeTicks() + kTextFinderTestTimeout,
IdleDeadline::CallbackType::kCalledWhenIdle),
identifier, search_text, options);
} else {
Patch #2 (chromium-70.0.3538.110-idle_spell_check_controller.patch) didn't change from v70.0.3538.67.
After applying these two patches chromium-70.0.3538.110 compiled without errors.
Sorry for the double post. My system froze yesterday while I was commenting this bug and I didn't see comment #3 today so I wrote it again. Fixed in www-client/chromium-71.0.3578.80. |