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

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

Issue 1490063002: Implement Paint Containment (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix merge Created 5 years 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 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 || style.hasOpacity() 196 || style.hasOpacity()
197 || style.hasTransformRelatedProperty() 197 || style.hasTransformRelatedProperty()
198 || style.hasMask() 198 || style.hasMask()
199 || style.clipPath() 199 || style.clipPath()
200 || style.boxReflect() 200 || style.boxReflect()
201 || style.hasFilter() 201 || style.hasFilter()
202 || style.hasBlendMode() 202 || style.hasBlendMode()
203 || style.hasIsolation() 203 || style.hasIsolation()
204 || style.position() == FixedPosition 204 || style.position() == FixedPosition
205 || isInTopLayer(element, style) 205 || isInTopLayer(element, style)
206 || hasWillChangeThatCreatesStackingContext(style))) 206 || hasWillChangeThatCreatesStackingContext(style)
207 || style.containsPaint()))
207 style.setZIndex(0); 208 style.setZIndex(0);
208 209
209 if (doesNotInheritTextDecoration(style, element)) 210 if (doesNotInheritTextDecoration(style, element))
210 style.clearAppliedTextDecorations(); 211 style.clearAppliedTextDecorations();
211 212
212 style.applyTextDecorations(); 213 style.applyTextDecorations();
213 214
214 if (style.overflowX() != OVISIBLE || style.overflowY() != OVISIBLE) 215 if (style.overflowX() != OVISIBLE || style.overflowY() != OVISIBLE)
215 adjustOverflow(style); 216 adjustOverflow(style);
216 217
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 // We want to count vertical percentage paddings/margins on flex items b ecause our current 489 // We want to count vertical percentage paddings/margins on flex items b ecause our current
489 // behavior is different from the spec and we want to gather compatibili ty data. 490 // behavior is different from the spec and we want to gather compatibili ty data.
490 if (style.paddingBefore().hasPercent() || style.paddingAfter().hasPercen t()) 491 if (style.paddingBefore().hasPercent() || style.paddingAfter().hasPercen t())
491 UseCounter::count(document, UseCounter::FlexboxPercentagePaddingVert ical); 492 UseCounter::count(document, UseCounter::FlexboxPercentagePaddingVert ical);
492 if (style.marginBefore().hasPercent() || style.marginAfter().hasPercent( )) 493 if (style.marginBefore().hasPercent() || style.marginAfter().hasPercent( ))
493 UseCounter::count(document, UseCounter::FlexboxPercentageMarginVerti cal); 494 UseCounter::count(document, UseCounter::FlexboxPercentageMarginVerti cal);
494 } 495 }
495 } 496 }
496 497
497 } 498 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698