Commit c41d3c78 authored by delphick's avatar delphick Committed by Commit bot

Restore one millisecond minimum timeout for setTimeout.

This reverts the non-test part of https://codereview.chromium.org/2738773004/
but leaves most of the test changes in place since they should now work
regardless of the setTimeout behaviour.

BUG=711044

Review-Url: https://codereview.chromium.org/2853493002
Cr-Commit-Position: refs/heads/master@{#467962}
parent d7182375
CONSOLE WARNING: line 5: Mixed Content: The page at 'https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-plugin.html' was loaded over HTTPS, but requested an insecure plugin resource 'http://example.test:8000/security/mixedContent/resources/dummy.swf'. This content should also be served over HTTPS.
CONSOLE WARNING: Mixed Content: The page at 'https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-plugin.html' was loaded over HTTPS, but requested an insecure plugin resource 'http://example.test:8000/security/mixedContent/resources/dummy.swf'. This content should also be served over HTTPS.
CONSOLE MESSAGE: Blink Test Plugin: initializing
This test loads a secure iframe that loads an insecure plugin. We should get a mixed content callback because the insecure plugin can script the secure origin.
......
......@@ -88,10 +88,8 @@ DOMTimer::DOMTimer(ExecutionContext* context,
user_gesture_token_ = UserGestureIndicator::CurrentToken();
}
// TODO(delphick): Remove the single shot guard here so that this affects
// setInterval as well.
double interval_milliseconds =
std::max(single_shot ? 0.0 : kOneMillisecond, interval * kOneMillisecond);
std::max(kOneMillisecond, interval * kOneMillisecond);
if (interval_milliseconds < kMinimumInterval &&
nesting_level_ >= kMaxTimerNestingLevel)
interval_milliseconds = kMinimumInterval;
......
......@@ -87,7 +87,7 @@ const char* const kSetTimeout0ScriptText =
"}"
"setTimeout(setTimeoutCallback, 0);";
TEST_F(DOMTimerTest, setTimeout_ZeroIsNotClampedToOne) {
TEST_F(DOMTimerTest, DISABLED_setTimeout_ZeroIsNotClampedToOne) {
v8::HandleScope scope(v8::Isolate::GetCurrent());
ExecuteScriptAndWaitUntilIdle(kSetTimeout0ScriptText);
......
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