Commit 07077354 authored by Xiaocheng Hu's avatar Xiaocheng Hu Committed by Commit Bot

Remove cold mode idle time spellchecker flag

As cold mode idle time spellchecker is shipped into M69 Stable
and no regression is obversed, this patch removes the flag as
cleanup.

Bug: 716642
Change-Id: I0b75e7592be063cb53ee9eb68dbf3f0c1af48dd4
Reviewed-on: https://chromium-review.googlesource.com/c/1351869
Commit-Queue: Xiaocheng Hu <xiaochengh@chromium.org>
Reviewed-by: default avatarKent Tamura <tkent@chromium.org>
Reviewed-by: default avatarYoshifumi Inoue <yosin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611335}
parent 8984b234
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include "third_party/blink/renderer/core/editing/visible_units.h" #include "third_party/blink/renderer/core/editing/visible_units.h"
#include "third_party/blink/renderer/core/frame/local_frame.h" #include "third_party/blink/renderer/core/frame/local_frame.h"
#include "third_party/blink/renderer/platform/instrumentation/tracing/trace_event.h" #include "third_party/blink/renderer/platform/instrumentation/tracing/trace_event.h"
#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
#include "third_party/blink/renderer/platform/wtf/time.h" #include "third_party/blink/renderer/platform/wtf/time.h"
namespace blink { namespace blink {
...@@ -133,8 +132,7 @@ void IdleSpellCheckController::SetNeedsInvocation() { ...@@ -133,8 +132,7 @@ void IdleSpellCheckController::SetNeedsInvocation() {
} }
void IdleSpellCheckController::SetNeedsColdModeInvocation() { void IdleSpellCheckController::SetNeedsColdModeInvocation() {
if (!RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled() || if (!IsSpellCheckingEnabled()) {
!IsSpellCheckingEnabled()) {
Deactivate(); Deactivate();
return; return;
} }
...@@ -152,7 +150,6 @@ void IdleSpellCheckController::SetNeedsColdModeInvocation() { ...@@ -152,7 +150,6 @@ void IdleSpellCheckController::SetNeedsColdModeInvocation() {
} }
void IdleSpellCheckController::ColdModeTimerFired(TimerBase*) { void IdleSpellCheckController::ColdModeTimerFired(TimerBase*) {
DCHECK(RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled());
DCHECK_EQ(State::kColdModeTimerStarted, state_); DCHECK_EQ(State::kColdModeTimerStarted, state_);
if (!IsSpellCheckingEnabled() || !IsAvailable()) { if (!IsSpellCheckingEnabled() || !IsAvailable()) {
...@@ -208,7 +205,6 @@ void IdleSpellCheckController::Invoke(IdleDeadline* deadline) { ...@@ -208,7 +205,6 @@ void IdleSpellCheckController::Invoke(IdleDeadline* deadline) {
HotModeInvocation(deadline); HotModeInvocation(deadline);
SetNeedsColdModeInvocation(); SetNeedsColdModeInvocation();
} else if (state_ == State::kColdModeRequested) { } else if (state_ == State::kColdModeRequested) {
DCHECK(RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled());
state_ = State::kInColdModeInvocation; state_ = State::kInColdModeInvocation;
cold_mode_requester_->Invoke(deadline); cold_mode_requester_->Invoke(deadline);
if (cold_mode_requester_->FullyChecked()) if (cold_mode_requester_->FullyChecked())
......
...@@ -9,8 +9,6 @@ ...@@ -9,8 +9,6 @@
#include "third_party/blink/renderer/core/editing/spellcheck/spell_checker.h" #include "third_party/blink/renderer/core/editing/spellcheck/spell_checker.h"
#include "third_party/blink/renderer/core/frame/local_frame.h" #include "third_party/blink/renderer/core/frame/local_frame.h"
#include "third_party/blink/renderer/core/html/html_object_element.h" #include "third_party/blink/renderer/core/html/html_object_element.h"
#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
#include "third_party/blink/renderer/platform/testing/runtime_enabled_features_test_helpers.h"
namespace blink { namespace blink {
...@@ -40,10 +38,8 @@ class IdleSpellCheckControllerTest : public SpellCheckTestBase { ...@@ -40,10 +38,8 @@ class IdleSpellCheckControllerTest : public SpellCheckTestBase {
IdleChecker().SetNeedsInvocation(); IdleChecker().SetNeedsInvocation();
break; break;
case State::kColdModeTimerStarted: case State::kColdModeTimerStarted:
DCHECK(RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled());
break; break;
case State::kColdModeRequested: case State::kColdModeRequested:
DCHECK(RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled());
IdleChecker().SkipColdModeTimerForTesting(); IdleChecker().SkipColdModeTimerForTesting();
break; break;
case State::kInHotModeInvocation: case State::kInHotModeInvocation:
...@@ -56,19 +52,9 @@ class IdleSpellCheckControllerTest : public SpellCheckTestBase { ...@@ -56,19 +52,9 @@ class IdleSpellCheckControllerTest : public SpellCheckTestBase {
// Test cases for lifecycle state transitions. // Test cases for lifecycle state transitions.
TEST_F(IdleSpellCheckControllerTest, InitializationWithColdMode) { TEST_F(IdleSpellCheckControllerTest, InitializationWithColdMode) {
if (!RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled())
return;
EXPECT_EQ(State::kColdModeTimerStarted, IdleChecker().GetState()); EXPECT_EQ(State::kColdModeTimerStarted, IdleChecker().GetState());
} }
TEST_F(IdleSpellCheckControllerTest, InitializationWithoutColdMode) {
if (RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled())
return;
EXPECT_EQ(State::kInactive, IdleChecker().GetState());
}
TEST_F(IdleSpellCheckControllerTest, RequestWhenInactive) { TEST_F(IdleSpellCheckControllerTest, RequestWhenInactive) {
TransitTo(State::kInactive); TransitTo(State::kInactive);
IdleChecker().SetNeedsInvocation(); IdleChecker().SetNeedsInvocation();
...@@ -86,9 +72,6 @@ TEST_F(IdleSpellCheckControllerTest, RequestWhenHotModeRequested) { ...@@ -86,9 +72,6 @@ TEST_F(IdleSpellCheckControllerTest, RequestWhenHotModeRequested) {
} }
TEST_F(IdleSpellCheckControllerTest, RequestWhenColdModeTimerStarted) { TEST_F(IdleSpellCheckControllerTest, RequestWhenColdModeTimerStarted) {
if (!RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled())
return;
TransitTo(State::kColdModeTimerStarted); TransitTo(State::kColdModeTimerStarted);
IdleChecker().SetNeedsInvocation(); IdleChecker().SetNeedsInvocation();
EXPECT_EQ(State::kHotModeRequested, IdleChecker().GetState()); EXPECT_EQ(State::kHotModeRequested, IdleChecker().GetState());
...@@ -96,9 +79,6 @@ TEST_F(IdleSpellCheckControllerTest, RequestWhenColdModeTimerStarted) { ...@@ -96,9 +79,6 @@ TEST_F(IdleSpellCheckControllerTest, RequestWhenColdModeTimerStarted) {
} }
TEST_F(IdleSpellCheckControllerTest, RequestWhenColdModeRequested) { TEST_F(IdleSpellCheckControllerTest, RequestWhenColdModeRequested) {
if (!RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled())
return;
TransitTo(State::kColdModeRequested); TransitTo(State::kColdModeRequested);
int handle = IdleChecker().IdleCallbackHandle(); int handle = IdleChecker().IdleCallbackHandle();
IdleChecker().SetNeedsInvocation(); IdleChecker().SetNeedsInvocation();
...@@ -107,28 +87,13 @@ TEST_F(IdleSpellCheckControllerTest, RequestWhenColdModeRequested) { ...@@ -107,28 +87,13 @@ TEST_F(IdleSpellCheckControllerTest, RequestWhenColdModeRequested) {
EXPECT_NE(-1, IdleChecker().IdleCallbackHandle()); EXPECT_NE(-1, IdleChecker().IdleCallbackHandle());
} }
TEST_F(IdleSpellCheckControllerTest, HotModeTransitToInactive) {
if (RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled())
return;
TransitTo(State::kHotModeRequested);
IdleChecker().ForceInvocationForTesting();
EXPECT_EQ(State::kInactive, IdleChecker().GetState());
}
TEST_F(IdleSpellCheckControllerTest, HotModeTransitToColdMode) { TEST_F(IdleSpellCheckControllerTest, HotModeTransitToColdMode) {
if (!RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled())
return;
TransitTo(State::kHotModeRequested); TransitTo(State::kHotModeRequested);
IdleChecker().ForceInvocationForTesting(); IdleChecker().ForceInvocationForTesting();
EXPECT_EQ(State::kColdModeTimerStarted, IdleChecker().GetState()); EXPECT_EQ(State::kColdModeTimerStarted, IdleChecker().GetState());
} }
TEST_F(IdleSpellCheckControllerTest, ColdModeTimerStartedToRequested) { TEST_F(IdleSpellCheckControllerTest, ColdModeTimerStartedToRequested) {
if (!RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled())
return;
TransitTo(State::kColdModeTimerStarted); TransitTo(State::kColdModeTimerStarted);
IdleChecker().SkipColdModeTimerForTesting(); IdleChecker().SkipColdModeTimerForTesting();
EXPECT_EQ(State::kColdModeRequested, IdleChecker().GetState()); EXPECT_EQ(State::kColdModeRequested, IdleChecker().GetState());
...@@ -136,9 +101,6 @@ TEST_F(IdleSpellCheckControllerTest, ColdModeTimerStartedToRequested) { ...@@ -136,9 +101,6 @@ TEST_F(IdleSpellCheckControllerTest, ColdModeTimerStartedToRequested) {
} }
TEST_F(IdleSpellCheckControllerTest, ColdModeStayAtColdMode) { TEST_F(IdleSpellCheckControllerTest, ColdModeStayAtColdMode) {
if (!RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled())
return;
TransitTo(State::kColdModeRequested); TransitTo(State::kColdModeRequested);
IdleChecker().SetNeedsMoreColdModeInvocationForTesting(); IdleChecker().SetNeedsMoreColdModeInvocationForTesting();
IdleChecker().ForceInvocationForTesting(); IdleChecker().ForceInvocationForTesting();
...@@ -146,9 +108,6 @@ TEST_F(IdleSpellCheckControllerTest, ColdModeStayAtColdMode) { ...@@ -146,9 +108,6 @@ TEST_F(IdleSpellCheckControllerTest, ColdModeStayAtColdMode) {
} }
TEST_F(IdleSpellCheckControllerTest, ColdModeToInactive) { TEST_F(IdleSpellCheckControllerTest, ColdModeToInactive) {
if (!RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled())
return;
TransitTo(State::kColdModeRequested); TransitTo(State::kColdModeRequested);
IdleChecker().ForceInvocationForTesting(); IdleChecker().ForceInvocationForTesting();
EXPECT_EQ(State::kInactive, IdleChecker().GetState()); EXPECT_EQ(State::kInactive, IdleChecker().GetState());
...@@ -167,18 +126,12 @@ TEST_F(IdleSpellCheckControllerTest, DetachWhenHotModeRequested) { ...@@ -167,18 +126,12 @@ TEST_F(IdleSpellCheckControllerTest, DetachWhenHotModeRequested) {
} }
TEST_F(IdleSpellCheckControllerTest, DetachWhenColdModeTimerStarted) { TEST_F(IdleSpellCheckControllerTest, DetachWhenColdModeTimerStarted) {
if (!RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled())
return;
TransitTo(State::kColdModeTimerStarted); TransitTo(State::kColdModeTimerStarted);
GetDocument().Shutdown(); GetDocument().Shutdown();
EXPECT_EQ(State::kInactive, IdleChecker().GetState()); EXPECT_EQ(State::kInactive, IdleChecker().GetState());
} }
TEST_F(IdleSpellCheckControllerTest, DetachWhenColdModeRequested) { TEST_F(IdleSpellCheckControllerTest, DetachWhenColdModeRequested) {
if (!RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled())
return;
TransitTo(State::kColdModeRequested); TransitTo(State::kColdModeRequested);
GetDocument().Shutdown(); GetDocument().Shutdown();
EXPECT_EQ(State::kInactive, IdleChecker().GetState()); EXPECT_EQ(State::kInactive, IdleChecker().GetState());
...@@ -186,7 +139,6 @@ TEST_F(IdleSpellCheckControllerTest, DetachWhenColdModeRequested) { ...@@ -186,7 +139,6 @@ TEST_F(IdleSpellCheckControllerTest, DetachWhenColdModeRequested) {
// https://crbug.com/863784 // https://crbug.com/863784
TEST_F(IdleSpellCheckControllerTest, ColdModeRangeCrossesShadow) { TEST_F(IdleSpellCheckControllerTest, ColdModeRangeCrossesShadow) {
ScopedIdleTimeColdModeSpellCheckingForTest cold_mode_scope(true);
SetBodyContent( SetBodyContent(
"<div contenteditable style=\"width:800px\">" "<div contenteditable style=\"width:800px\">"
"foo" "foo"
......
...@@ -605,10 +605,6 @@ ...@@ -605,10 +605,6 @@
name: "IDBObserver", name: "IDBObserver",
status: "experimental", status: "experimental",
}, },
{
name: "IdleTimeColdModeSpellChecking",
status: "stable",
},
{ {
name: "IgnoreCrossOriginWindowWhenNamedAccessOnWindow", name: "IgnoreCrossOriginWindowWhenNamedAccessOnWindow",
status: "experimental", status: "experimental",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment