Skip to content

GitLab

T
tangled
Commit 25013557 authored by Becca Hughes's avatar Becca Hughes Committed by Commit Bot
Browse files
Options

Reland "[CSS Env Vars] Add some WPT tests" 

This is a reland of 981a543f

This adds a bugfix that adds a DetachFromParent method that
we call in StyleEngine. This stops the global environment
variables instance holding a reference to the document
one after the document has been disposed.

Original change's description:
> [CSS Env Vars] Add some WPT tests
>
> Adds some WPT tests to test env() with @supports as well
> as fallback values.
>
> BUG=825890
>
> Change-Id: I071f5c2582f8056fe39b4a50ab62140d579c577d
> Reviewed-on: https://chromium-review.googlesource.com/1111023
> Reviewed-by: Rune Lillesveen <futhark@chromium.org>
> Reviewed-by: Mounir Lamouri <mlamouri@chromium.org>
> Commit-Queue: Becca Hughes <beccahughes@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#569852}

Bug: 825890
Change-Id: If828b977d62145fb1ea9bb710a48d76307a054d5
Reviewed-on: https://chromium-review.googlesource.com/1113877Reviewed-by: default avatarEmil A Eklund <eae@chromium.org>
Commit-Queue: Becca Hughes <beccahughes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#570117}
parent 2673cbdb
Hide whitespace changes
Inline Side-by-side
Showing with 199 additions and 0 deletions
third_party/WebKit/LayoutTests/external/wpt/css/css-env/at-supports.tentative.html 0 → 100644
View file @ 25013557
<!DOCTYPE html>
<html>
<head>
<link rel="help" href="https://drafts.csswg.org/css-env-1/">
<title>Test that CSS env vars work with @support</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<style>
@supports (background-color: env(test)) {
body { background-color: rgb(0, 128, 0); }
}
</style>
</head>
<body>
<script>
test(() => {
const style = window.getComputedStyle(document.body);
assert_equals(style.getPropertyValue("background-color"), "rgb(0, 128, 0)");
});
</script>
</body>
</html>
third_party/WebKit/LayoutTests/external/wpt/css/css-env/env-in-custom-properties.tentative.html 0 → 100644
View file @ 25013557
<!DOCTYPE html>
<html>
<head>
<link rel="help" href="https://drafts.csswg.org/css-env-1/">
<title>Test env() will work in custom properties</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<style>
body {
--my-width: env(test, 100px);
width: var(--my-width);
}
</style>
</head>
<body>
<script>
test(() => {
const style = window.getComputedStyle(document.body);
assert_equals(style.getPropertyValue("width"), "100px");
});
</script>
</body>
</html>
third_party/WebKit/LayoutTests/external/wpt/css/css-env/fallback-nested-var.tentative.html 0 → 100644
View file @ 25013557
<!DOCTYPE html>
<html>
<head>
<link rel="help" href="https://drafts.csswg.org/css-env-1/">
<title>Test that nested var() fallback values work with CSS env vars</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<style>
body {
--main-bg-color: rgb(0, 128, 0);
background-color: env(test, var(--main-bg-color));
}
</style>
</head>
<body>
<script>
test(() => {
const style = window.getComputedStyle(document.body);
assert_equals(style.getPropertyValue("background-color"), "rgb(0, 128, 0)");
});
</script>
</body>
</html>
third_party/WebKit/LayoutTests/external/wpt/css/css-env/seralization-round-tripping.tentative.html 0 → 100644
View file @ 25013557
<!DOCTYPE html>
<html>
<head>
<link rel="help" href="https://drafts.csswg.org/css-env-1/">
<title>Test style seralization round tripping with CSS env vars</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
</head>
<body>
<script>
test(() => {
document.body.style.top = "env(test)";
assert_equals(document.body.style.getPropertyValue("top"), "env(test)");
document.body.style.setProperty("top", "env()");
assert_equals(document.body.style.getPropertyValue("top"), "env(test)");
});
</script>
</body>
</html>
third_party/WebKit/LayoutTests/external/wpt/css/css-env/supports-script.tentative.html 0 → 100644
View file @ 25013557
<!DOCTYPE html>
<html>
<head>
<link rel="help" href="https://drafts.csswg.org/css-env-1/">
<title>Test that CSS env vars work with CSS.supports</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
</head>
<body>
<script>
test(() => {
assert_true(CSS.supports("background: env(test)"));
assert_true(CSS.supports("background", "env(test)"));
assert_false(CSS.supports("background", "env()"));
assert_false(CSS.supports("background", "env(test,)"));
});
</script>
</body>
</html>
third_party/WebKit/LayoutTests/external/wpt/css/css-env/syntax.tentative.html 0 → 100644
View file @ 25013557
<!DOCTYPE html>
<html>
<head>
<link rel="help" href="https://drafts.csswg.org/css-env-1/">
<title>Test env() syntax</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<style>
div { background-color: rgb(0, 128, 0); }
</style>
</head>
<body>
<script>
// This value is expected if the syntax is valid.
const envWorkingValue = "rgba(0, 0, 0, 0)";
// This value is expected if the syntax is invalid.
const pageDefaultValue = "rgb(0, 128, 0)";
// This value is used to test fallback values.
const blueValue = "rgb(0, 0, 255)";
const testCases = [
{ style: "", expectedPropertyValue: pageDefaultValue },
{ style: "background-color: env(test)", expectedPropertyValue: envWorkingValue },
{ style: "background-color: ENV(test)", expectedPropertyValue: envWorkingValue },
{ style: "background-color: env(test) !important", expectedPropertyValue: envWorkingValue },
{ style: "background-color: env(test, 10px)", expectedPropertyValue: envWorkingValue },
{ style: "background-color: env(test, blue)", expectedPropertyValue: blueValue },
{ style: "background-color: env(test, env(another))", expectedPropertyValue: envWorkingValue },
{ style: "background-color: env(test, env(another, blue))", expectedPropertyValue: blueValue },
{ style: "background-color: env(-test)", expectedPropertyValue: envWorkingValue },
{ style: "background-color: env(--test)", expectedPropertyValue: envWorkingValue },
{ style: "background-color: env(10px)", expectedPropertyValue: pageDefaultValue },
{ style: "background-color: env(env(test))", expectedPropertyValue: pageDefaultValue },
{ style: "background-color: env( test)", expectedPropertyValue: envWorkingValue },
{ style: "background-color: env(test )", expectedPropertyValue: envWorkingValue },
{ style: "background-color: env( test )", expectedPropertyValue: envWorkingValue },
{ style: "background-color: env(test /**/, blue)", expectedPropertyValue: blueValue },
{ style: "background-color: env(test, {})", expectedPropertyValue: envWorkingValue },
{ style: "background-color: env(test, {)", expectedPropertyValue: pageDefaultValue },
];
testCases.forEach((testcase) => {
test(() => {
const elem = document.createElement("div");
const style = window.getComputedStyle(elem);
document.body.appendChild(elem);
elem.style.cssText = testcase.style;
assert_equals(style.getPropertyValue("background-color"), testcase.expectedPropertyValue);
}, testcase.style + " " + testcase.expectedPropertyValue);
});
</script>
</body>
</html>
third_party/WebKit/LayoutTests/external/wpt/css/css-env/unknown-env-names-override-previous.tentative.html 0 → 100644
View file @ 25013557
<!DOCTYPE html>
<html>
<head>
<link rel="help" href="https://drafts.csswg.org/css-env-1/">
<title>Test unknown env() names will override previous values</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
</head>
<body style="background-color: green; background-color: env(unknown);">
<script>
test(() => {
const style = window.getComputedStyle(document.body);
assert_equals(style.getPropertyValue("background-color"), "rgba(0, 0, 0, 0)");
});
</script>
</body>
</html>
third_party/blink/renderer/core/css/document_style_environment_variables.cc
View file @ 25013557
...@@ -31,6 +31,8 @@ CSSVariableData* DocumentStyleEnvironmentVariables::ResolveVariable( ...@@ -31,6 +31,8 @@ CSSVariableData* DocumentStyleEnvironmentVariables::ResolveVariable(
void DocumentStyleEnvironmentVariables::InvalidateVariable( void DocumentStyleEnvironmentVariables::InvalidateVariable(
const AtomicString& name) { const AtomicString& name) {
DCHECK(document_);
// Invalidate the document if we have seen this variable on this document. // Invalidate the document if we have seen this variable on this document.
if (seen_variables_.Contains(name)) if (seen_variables_.Contains(name))
document_->GetStyleEngine().EnvironmentVariableChanged(); document_->GetStyleEngine().EnvironmentVariableChanged();
......
third_party/blink/renderer/core/css/style_engine.cc
View file @ 25013557
...@@ -573,6 +573,9 @@ void StyleEngine::DidDetach() { ...@@ -573,6 +573,9 @@ void StyleEngine::DidDetach() {
if (font_selector_) if (font_selector_)
font_selector_->GetFontFaceCache()->ClearAll(); font_selector_->GetFontFaceCache()->ClearAll();
font_selector_ = nullptr; font_selector_ = nullptr;
if (environment_variables_)
environment_variables_->DetachFromParent();
environment_variables_ = nullptr;
} }
void StyleEngine::ClearFontCache() { void StyleEngine::ClearFontCache() {
......
third_party/blink/renderer/core/css/style_environment_variables.cc
View file @ 25013557
...@@ -83,6 +83,17 @@ CSSVariableData* StyleEnvironmentVariables::ResolveVariable( ...@@ -83,6 +83,17 @@ CSSVariableData* StyleEnvironmentVariables::ResolveVariable(
return result->value.get(); return result->value.get();
} }
void StyleEnvironmentVariables::DetachFromParent() {
DCHECK(parent_);
// Remove any reference the |parent| has to |this|.
auto it = parent_->children_.Find(this);
if (it != kNotFound)
parent_->children_.EraseAt(it);
parent_ = nullptr;
}
void StyleEnvironmentVariables::BindToParent( void StyleEnvironmentVariables::BindToParent(
StyleEnvironmentVariables& parent) { StyleEnvironmentVariables& parent) {
DCHECK_EQ(nullptr, parent_); DCHECK_EQ(nullptr, parent_);
......
third_party/blink/renderer/core/css/style_environment_variables.h
View file @ 25013557
...@@ -42,6 +42,9 @@ class CORE_EXPORT StyleEnvironmentVariables ...@@ -42,6 +42,9 @@ class CORE_EXPORT StyleEnvironmentVariables
// |StyleEnvironmentVariables|. // |StyleEnvironmentVariables|.
virtual CSSVariableData* ResolveVariable(const AtomicString& name); virtual CSSVariableData* ResolveVariable(const AtomicString& name);
// Detach |this| from |parent|.
void DetachFromParent();
protected: protected:
friend class StyleEnvironmentVariablesTest; friend class StyleEnvironmentVariablesTest;
......
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