Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(463)

Side by Side Diff: Source/core/css/resolver/StyleAdjuster.cpp

Issue 196143004: Fix usage of pseudo style cache (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: check for cached pseudo style and mark pseudo styles with animations as unique Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 } 273 }
274 274
275 // Cull out any useless layers and also repeat patterns into additional laye rs. 275 // Cull out any useless layers and also repeat patterns into additional laye rs.
276 style->adjustBackgroundLayers(); 276 style->adjustBackgroundLayers();
277 style->adjustMaskLayers(); 277 style->adjustMaskLayers();
278 278
279 // Let the theme also have a crack at adjusting the style. 279 // Let the theme also have a crack at adjusting the style.
280 if (style->hasAppearance()) 280 if (style->hasAppearance())
281 RenderTheme::theme().adjustStyle(style, e, m_cachedUAStyle); 281 RenderTheme::theme().adjustStyle(style, e, m_cachedUAStyle);
282 282
283 // If we have first-letter pseudo style, do not share this style. 283 // If we have first-letter pseudo style, transitions, or animations, do not share this style.
284 if (style->hasPseudoStyle(FIRST_LETTER)) 284 if (style->hasPseudoStyle(FIRST_LETTER) || style->transitions() || style->an imations())
285 style->setUnique(); 285 style->setUnique();
286 286
287 // FIXME: when dropping the -webkit prefix on transform-style, we should als o have opacity < 1 cause flattening. 287 // FIXME: when dropping the -webkit prefix on transform-style, we should als o have opacity < 1 cause flattening.
288 if (style->preserves3D() && (style->overflowX() != OVISIBLE 288 if (style->preserves3D() && (style->overflowX() != OVISIBLE
289 || style->overflowY() != OVISIBLE 289 || style->overflowY() != OVISIBLE
290 || style->hasFilter())) 290 || style->hasFilter()))
291 style->setTransformStyle3D(TransformStyle3DFlat); 291 style->setTransformStyle3D(TransformStyle3DFlat);
292 292
293 if (e && e->isSVGElement()) { 293 if (e && e->isSVGElement()) {
294 // Spec: http://www.w3.org/TR/SVG/masking.html#OverflowProperty 294 // Spec: http://www.w3.org/TR/SVG/masking.html#OverflowProperty
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 if (style->writingMode() != TopToBottomWritingMode && (style->display() == B OX || style->display() == INLINE_BOX)) 439 if (style->writingMode() != TopToBottomWritingMode && (style->display() == B OX || style->display() == INLINE_BOX))
440 style->setWritingMode(TopToBottomWritingMode); 440 style->setWritingMode(TopToBottomWritingMode);
441 441
442 if (isDisplayFlexibleBox(parentStyle->display()) || isDisplayGridBox(parentS tyle->display())) { 442 if (isDisplayFlexibleBox(parentStyle->display()) || isDisplayGridBox(parentS tyle->display())) {
443 style->setFloating(NoFloat); 443 style->setFloating(NoFloat);
444 style->setDisplay(equivalentBlockDisplay(style->display(), style->isFloa ting(), !m_useQuirksModeStyles)); 444 style->setDisplay(equivalentBlockDisplay(style->display(), style->isFloa ting(), !m_useQuirksModeStyles));
445 } 445 }
446 } 446 }
447 447
448 } 448 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698