Skip to content

GitLab

T
tangled
Commit a434069c authored by timloh@chromium.org's avatar timloh@chromium.org
Browse files
Options

Fix usage of pseudo style cache 

This patch fixes our usage of the pseudo style cache so that we will
use a cached pseudo style when creating pseudo-elements if possible
and so that we cache pseudo styles even if they don't get a renderer.
We also move the logic for having styles with animations or transitions
be non-sharable from RenderStyle::isSharable to the StyleAdjuster, so
that animated pseudo-elements will have their parent's style correctly
marked as non-sharable.

As a result, a pseudo-element without a renderer (e.g. display:none
or content:none) to will correctly return its computed style to
getComputedStyle. This also fixes a regression where the pseudo style
cache can end up very large when its parent style is shared.

BUG=345653

Review URL: https://codereview.chromium.org/196143004

git-svn-id: svn://svn.chromium.org/blink/trunk@169619 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent e3c3ef65
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 28 deletions
third_party/WebKit/LayoutTests/fast/css-generated-content/pseudo-animation-before-onload-expected.txt
View file @ a434069c
...@@ -10,4 +10,4 @@ PASS div.offsetWidth is within 1 of 20 ...@@ -10,4 +10,4 @@ PASS div.offsetWidth is within 1 of 20
PASS div.offsetWidth is within 1 of 20 PASS div.offsetWidth is within 1 of 20
PASS div.offsetWidth is within 1 of 12 PASS div.offsetWidth is within 1 of 12
PASS div.offsetWidth is within 1 of 12 PASS div.offsetWidth is within 1 of 12
third_party/WebKit/LayoutTests/fast/css-generated-content/pseudo-animation-before-onload.html
View file @ a434069c
...@@ -4,29 +4,17 @@ ...@@ -4,29 +4,17 @@
<style> <style>
@-webkit-keyframes example { @-webkit-keyframes example {
from { from { width: 50px; height: 50px; }
width: 50px; to { width: 10px; height: 10px; }
height: 50px;
}
to {
width: 10px;
height: 10px;
}
} }
@keyframes example { @keyframes example {
from { from { width: 50px; height: 50px; }
width: 50px; to { width: 10px; height: 10px; }
height: 50px;
}
to {
width: 10px;
height: 10px;
}
} }
#after:after, .after:after,
#before:before { .before:before {
content: ""; content: "";
display: block; display: block;
position: relative; position: relative;
...@@ -38,8 +26,8 @@ ...@@ -38,8 +26,8 @@
animation: example 2s; animation: example 2s;
} }
#before, .before,
#after { .after {
display: inline-block; display: inline-block;
border: 1px solid black; border: 1px solid black;
background: red; background: red;
...@@ -47,8 +35,12 @@ ...@@ -47,8 +35,12 @@
</style> </style>
<div id="before"></div> <div class="before"></div>
<div id="after"></div> <div class="before" id="before"></div>
<div class="before"></div>
<div class="after"></div>
<div class="after" id="after"></div>
<div class="after"></div>
<script> <script>
description('Animations on :before and :after pseudo elements should run when applied before onload.'); description('Animations on :before and :after pseudo elements should run when applied before onload.');
......
third_party/WebKit/LayoutTests/fast/css/getComputedStyle/getComputedStyle-with-pseudo-element-without-renderer.html 0 → 100644
View file @ a434069c
<!DOCTYPE html>
<script src="../../../resources/testharness.js"></script>
<script src="../../../resources/testharnessreport.js"></script>
<style>
#element:after { display: none; color: green; }
</style>
<div id="element"></div>
<script>
test(function() {
var computedStyle = getComputedStyle(document.getElementById('element'), ":after");
assert_equals(computedStyle.color, 'rgb(0, 128, 0)');
assert_equals(computedStyle.display, 'none');
}, 'getComputedStyle works on pseudo-element without renderer');
</script>
third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp
View file @ a434069c
...@@ -280,8 +280,8 @@ void StyleAdjuster::adjustRenderStyle(RenderStyle* style, RenderStyle* parentSty ...@@ -280,8 +280,8 @@ void StyleAdjuster::adjustRenderStyle(RenderStyle* style, RenderStyle* parentSty
if (style->hasAppearance()) if (style->hasAppearance())
RenderTheme::theme().adjustStyle(style, e, m_cachedUAStyle); RenderTheme::theme().adjustStyle(style, e, m_cachedUAStyle);
// If we have first-letter pseudo style, do not share this style. // If we have first-letter pseudo style, transitions, or animations, do not share this style.
if (style->hasPseudoStyle(FIRST_LETTER)) if (style->hasPseudoStyle(FIRST_LETTER) || style->transitions() || style->animations())
style->setUnique(); style->setUnique();
// FIXME: when dropping the -webkit prefix on transform-style, we should also have opacity < 1 cause flattening. // FIXME: when dropping the -webkit prefix on transform-style, we should also have opacity < 1 cause flattening.
......
third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
View file @ a434069c
...@@ -834,16 +834,22 @@ PassRefPtr<PseudoElement> StyleResolver::createPseudoElementIfNeeded(Element& pa ...@@ -834,16 +834,22 @@ PassRefPtr<PseudoElement> StyleResolver::createPseudoElementIfNeeded(Element& pa
return nullptr; return nullptr;
RenderStyle* parentStyle = parentRenderer->style(); RenderStyle* parentStyle = parentRenderer->style();
if (RenderStyle* cachedStyle = parentStyle->getCachedPseudoStyle(pseudoId)) {
if (!pseudoElementRendererIsNeeded(cachedStyle))
return nullptr;
return PseudoElement::create(&parent, pseudoId);
}
StyleResolverState state(document(), &parent, parentStyle); StyleResolverState state(document(), &parent, parentStyle);
if (!pseudoStyleForElementInternal(parent, pseudoId, parentStyle, state)) if (!pseudoStyleForElementInternal(parent, pseudoId, parentStyle, state))
return nullptr; return nullptr;
RefPtr<RenderStyle> style = state.takeStyle(); RefPtr<RenderStyle> style = state.takeStyle();
ASSERT(style); ASSERT(style);
parentStyle->addCachedPseudoStyle(style);
if (!pseudoElementRendererIsNeeded(style.get())) if (!pseudoElementRendererIsNeeded(style.get()))
return nullptr; return nullptr;
parentStyle->addCachedPseudoStyle(style.release());
RefPtr<PseudoElement> pseudo = PseudoElement::create(&parent, pseudoId); RefPtr<PseudoElement> pseudo = PseudoElement::create(&parent, pseudoId);
setAnimationUpdateIfNeeded(state, *pseudo); setAnimationUpdateIfNeeded(state, *pseudo);
......
third_party/WebKit/Source/core/rendering/style/RenderStyle.h
View file @ a434069c
...@@ -1849,8 +1849,6 @@ inline bool RenderStyle::isSharable() const ...@@ -1849,8 +1849,6 @@ inline bool RenderStyle::isSharable() const
return false; return false;
if (hasUniquePseudoStyle()) if (hasUniquePseudoStyle())
return false; return false;
if (transitions() || animations())
return false;
return true; return true;
} }
......
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