Skip to content

GitLab

T
tangled
Commit 5f4ce97e authored by Vladimir Levin's avatar Vladimir Levin Committed by Commit Bot
Browse files
Options

[DL]: Ensure to reject update/commit promises on disconnected elements. 

This patch ensures that we reject update/commit when it happens on
a disconnected element.

R=chrishtr@chromium.org

Bug: 882663
Change-Id: Iaee923a4f41714b437c0a2b85bbb175359a2f32c
Reviewed-on: https://chromium-review.googlesource.com/c/1387944Reviewed-by: default avatarChris Harrelson <chrishtr@chromium.org>
Commit-Queue: Chris Harrelson <chrishtr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#618713}
parent f48817a9
Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 12 deletions
third_party/blink/renderer/core/display_lock/display_lock_context.cc
View file @ 5f4ce97e
...@@ -139,8 +139,8 @@ ScriptPromise DisplayLockContext::acquire(ScriptState* script_state, ...@@ -139,8 +139,8 @@ ScriptPromise DisplayLockContext::acquire(ScriptState* script_state,
} }
ScriptPromise DisplayLockContext::update(ScriptState* script_state) { ScriptPromise DisplayLockContext::update(ScriptState* script_state) {
// Reject if we're unlocked. // Reject if we're unlocked or disconnected.
if (state_ == kUnlocked) if (state_ == kUnlocked || !element_->isConnected())
return GetRejectedPromise(script_state); return GetRejectedPromise(script_state);
// If we have a resolver, then we're at least updating already, just return // If we have a resolver, then we're at least updating already, just return
...@@ -151,16 +151,13 @@ ScriptPromise DisplayLockContext::update(ScriptState* script_state) { ...@@ -151,16 +151,13 @@ ScriptPromise DisplayLockContext::update(ScriptState* script_state) {
} }
update_resolver_ = ScriptPromiseResolver::Create(script_state); update_resolver_ = ScriptPromiseResolver::Create(script_state);
// We only need to kick off an Update if we're in a locked state, all other StartUpdateIfNeeded();
// states are already updating.
if (state_ == kLocked)
StartUpdate();
return update_resolver_->Promise(); return update_resolver_->Promise();
} }
ScriptPromise DisplayLockContext::commit(ScriptState* script_state) { ScriptPromise DisplayLockContext::commit(ScriptState* script_state) {
// Reject if we're unlocked. // Reject if we're unlocked or disonnected.
if (state_ == kUnlocked) if (state_ == kUnlocked || !element_->isConnected())
return GetRejectedPromise(script_state); return GetRejectedPromise(script_state);
// If we have a resolver, we must be committing already, just return the same // If we have a resolver, we must be committing already, just return the same
...@@ -391,12 +388,19 @@ void DisplayLockContext::StartCommit() { ...@@ -391,12 +388,19 @@ void DisplayLockContext::StartCommit() {
layout_invalidation_reason::kDisplayLockCommitting); layout_invalidation_reason::kDisplayLockCommitting);
} }
void DisplayLockContext::StartUpdate() { void DisplayLockContext::StartUpdateIfNeeded() {
DCHECK_EQ(state_, kLocked); // We should not be calling this if we're unlocked.
state_ = kUpdating; DCHECK_NE(state_, kUnlocked);
// Any state other than kLocked means that we are already in the process of
// updating/committing, so we can piggy back on that process without kicking
// off any new updates.
if (state_ != kLocked)
return;
// We don't need to mark anything dirty since the budget will take care of // We don't need to mark anything dirty since the budget will take care of
// that for us. // that for us.
update_budget_ = CreateNewBudget(); update_budget_ = CreateNewBudget();
state_ = kUpdating;
ScheduleAnimation(); ScheduleAnimation();
} }
...@@ -509,6 +513,8 @@ void DisplayLockContext::DidFinishLifecycleUpdate() { ...@@ -509,6 +513,8 @@ void DisplayLockContext::DidFinishLifecycleUpdate() {
} }
void DisplayLockContext::ScheduleAnimation() { void DisplayLockContext::ScheduleAnimation() {
DCHECK(element_->isConnected());
// Schedule an animation to perform the lifecycle phases. // Schedule an animation to perform the lifecycle phases.
element_->GetDocument().GetPage()->Animator().ScheduleVisualUpdate( element_->GetDocument().GetPage()->Animator().ScheduleVisualUpdate(
element_->GetDocument().GetFrame()); element_->GetDocument().GetFrame());
......
third_party/blink/renderer/core/display_lock/display_lock_context.h
View file @ 5f4ce97e
...@@ -149,7 +149,7 @@ class CORE_EXPORT DisplayLockContext final ...@@ -149,7 +149,7 @@ class CORE_EXPORT DisplayLockContext final
// Initiate a commit. // Initiate a commit.
void StartCommit(); void StartCommit();
// Initiate an update. // Initiate an update.
void StartUpdate(); void StartUpdateIfNeeded();
// The following functions propagate dirty bits from the locked element up to // The following functions propagate dirty bits from the locked element up to
// the ancestors in order to be reached. They return true if the element or // the ancestors in order to be reached. They return true if the element or
......
third_party/blink/web_tests/display-lock/lock-before-append/commit-while-disconnected.html 0 → 100644
View file @ 5f4ce97e
<!doctype HTML>
<!--
Runs an acquire(), then commits without connecting the element.
-->
<div id="log"></div>
<script>
// TODO(vmpstr): In WPT this needs to be replaced with reftest-wait.
if (window.testRunner)
window.testRunner.waitUntilDone();
function finishTest(status_string) {
if (document.getElementById("log").innerHTML === "")
document.getElementById("log").innerHTML = status_string;
if (window.testRunner)
window.testRunner.notifyDone();
}
function runTest() {
let container = document.createElement("div");
container.id = "container";
container.getDisplayLock().acquire({ timeout: Infinity }).then(() => {
container.getDisplayLock().commit().then(
() => { finishTest("FAIL"); },
() => { finishTest("PASS"); });
});
}
window.onload = runTest;
</script>
third_party/blink/web_tests/display-lock/lock-before-append/update-while-disconnected.html 0 → 100644
View file @ 5f4ce97e
<!doctype HTML>
<!--
Runs an acquire(), then updates without connecting the element.
-->
<div id="log"></div>
<script>
// TODO(vmpstr): In WPT this needs to be replaced with reftest-wait.
if (window.testRunner)
window.testRunner.waitUntilDone();
function finishTest(status_string) {
if (document.getElementById("log").innerHTML === "")
document.getElementById("log").innerHTML = status_string;
if (window.testRunner)
window.testRunner.notifyDone();
}
function runTest() {
let container = document.createElement("div");
container.id = "container";
container.getDisplayLock().acquire({ timeout: Infinity }).then(() => {
container.getDisplayLock().update().then(
() => { finishTest("FAIL"); },
() => { finishTest("PASS"); });
});
}
window.onload = runTest;
</script>
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