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

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

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/css/resolver/SharedStyleFinder.h ('k') | Source/core/css/resolver/StyleAdjuster.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 19 matching lines...) Expand all
30 #include "core/css/resolver/SharedStyleFinder.h" 30 #include "core/css/resolver/SharedStyleFinder.h"
31 31
32 #include "core/HTMLNames.h" 32 #include "core/HTMLNames.h"
33 #include "core/XMLNames.h" 33 #include "core/XMLNames.h"
34 #include "core/css/resolver/StyleResolver.h" 34 #include "core/css/resolver/StyleResolver.h"
35 #include "core/css/resolver/StyleResolverStats.h" 35 #include "core/css/resolver/StyleResolverStats.h"
36 #include "core/dom/ContainerNode.h" 36 #include "core/dom/ContainerNode.h"
37 #include "core/dom/Document.h" 37 #include "core/dom/Document.h"
38 #include "core/dom/ElementTraversal.h" 38 #include "core/dom/ElementTraversal.h"
39 #include "core/dom/Node.h" 39 #include "core/dom/Node.h"
40 #include "core/dom/NodeLayoutStyle.h" 40 #include "core/dom/NodeComputedStyle.h"
41 #include "core/dom/QualifiedName.h" 41 #include "core/dom/QualifiedName.h"
42 #include "core/dom/SpaceSplitString.h" 42 #include "core/dom/SpaceSplitString.h"
43 #include "core/dom/shadow/ElementShadow.h" 43 #include "core/dom/shadow/ElementShadow.h"
44 #include "core/dom/shadow/InsertionPoint.h" 44 #include "core/dom/shadow/InsertionPoint.h"
45 #include "core/html/HTMLElement.h" 45 #include "core/html/HTMLElement.h"
46 #include "core/html/HTMLInputElement.h" 46 #include "core/html/HTMLInputElement.h"
47 #include "core/html/HTMLOptGroupElement.h" 47 #include "core/html/HTMLOptGroupElement.h"
48 #include "core/html/HTMLOptionElement.h" 48 #include "core/html/HTMLOptionElement.h"
49 #include "core/layout/style/LayoutStyle.h" 49 #include "core/layout/style/ComputedStyle.h"
50 #include "core/svg/SVGElement.h" 50 #include "core/svg/SVGElement.h"
51 #include "wtf/HashSet.h" 51 #include "wtf/HashSet.h"
52 #include "wtf/text/AtomicString.h" 52 #include "wtf/text/AtomicString.h"
53 53
54 namespace blink { 54 namespace blink {
55 55
56 using namespace HTMLNames; 56 using namespace HTMLNames;
57 57
58 bool SharedStyleFinder::canShareStyleWithControl(Element& candidate) const 58 bool SharedStyleFinder::canShareStyleWithControl(Element& candidate) const
59 { 59 {
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 return false; 191 return false;
192 } 192 }
193 return true; 193 return true;
194 } 194 }
195 195
196 bool SharedStyleFinder::canShareStyleWithElement(Element& candidate) const 196 bool SharedStyleFinder::canShareStyleWithElement(Element& candidate) const
197 { 197 {
198 if (element() == candidate) 198 if (element() == candidate)
199 return false; 199 return false;
200 Element* parent = candidate.parentOrShadowHostElement(); 200 Element* parent = candidate.parentOrShadowHostElement();
201 const LayoutStyle* style = candidate.layoutStyle(); 201 const ComputedStyle* style = candidate.computedStyle();
202 if (!style) 202 if (!style)
203 return false; 203 return false;
204 if (!style->isSharable()) 204 if (!style->isSharable())
205 return false; 205 return false;
206 if (!parent) 206 if (!parent)
207 return false; 207 return false;
208 if (element().parentOrShadowHostElement()->layoutStyle() != parent->layoutSt yle()) 208 if (element().parentOrShadowHostElement()->computedStyle() != parent->comput edStyle())
209 return false; 209 return false;
210 if (candidate.tagQName() != element().tagQName()) 210 if (candidate.tagQName() != element().tagQName())
211 return false; 211 return false;
212 if (candidate.inlineStyle()) 212 if (candidate.inlineStyle())
213 return false; 213 return false;
214 if (candidate.needsStyleRecalc()) 214 if (candidate.needsStyleRecalc())
215 return false; 215 return false;
216 if (candidate.isSVGElement() && toSVGElement(candidate).animatedSMILStylePro perties()) 216 if (candidate.isSVGElement() && toSVGElement(candidate).animatedSMILStylePro perties())
217 return false; 217 return false;
218 if (candidate.isLink() != element().isLink()) 218 if (candidate.isLink() != element().isLink())
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 } 301 }
302 302
303 bool SharedStyleFinder::matchesRuleSet(RuleSet* ruleSet) 303 bool SharedStyleFinder::matchesRuleSet(RuleSet* ruleSet)
304 { 304 {
305 if (!ruleSet) 305 if (!ruleSet)
306 return false; 306 return false;
307 ElementRuleCollector collector(m_context, m_styleResolver.selectorFilter()); 307 ElementRuleCollector collector(m_context, m_styleResolver.selectorFilter());
308 return collector.hasAnyMatchingRules(ruleSet); 308 return collector.hasAnyMatchingRules(ruleSet);
309 } 309 }
310 310
311 LayoutStyle* SharedStyleFinder::findSharedStyle() 311 ComputedStyle* SharedStyleFinder::findSharedStyle()
312 { 312 {
313 INCREMENT_STYLE_STATS_COUNTER(m_styleResolver, sharedStyleLookups); 313 INCREMENT_STYLE_STATS_COUNTER(m_styleResolver, sharedStyleLookups);
314 314
315 if (!element().supportsStyleSharing()) 315 if (!element().supportsStyleSharing())
316 return 0; 316 return 0;
317 317
318 // Cache whether context.element() is affected by any known class selectors. 318 // Cache whether context.element() is affected by any known class selectors.
319 m_elementAffectedByClassRules = element().hasClass() && classNamesAffectedBy Rules(element().classNames()); 319 m_elementAffectedByClassRules = element().hasClass() && classNamesAffectedBy Rules(element().classNames());
320 320
321 Element* shareElement = findElementForStyleSharing(); 321 Element* shareElement = findElementForStyleSharing();
(...skipping 15 matching lines...) Expand all
337 INCREMENT_STYLE_STATS_COUNTER(m_styleResolver, sharedStyleRejectedByUnco mmonAttributeRules); 337 INCREMENT_STYLE_STATS_COUNTER(m_styleResolver, sharedStyleRejectedByUnco mmonAttributeRules);
338 return 0; 338 return 0;
339 } 339 }
340 340
341 // Tracking child index requires unique style for each node. This may get se t by the sibling rule match above. 341 // Tracking child index requires unique style for each node. This may get se t by the sibling rule match above.
342 if (!element().parentElementOrShadowRoot()->childrenSupportStyleSharing()) { 342 if (!element().parentElementOrShadowRoot()->childrenSupportStyleSharing()) {
343 INCREMENT_STYLE_STATS_COUNTER(m_styleResolver, sharedStyleRejectedByPare nt); 343 INCREMENT_STYLE_STATS_COUNTER(m_styleResolver, sharedStyleRejectedByPare nt);
344 return 0; 344 return 0;
345 } 345 }
346 346
347 return shareElement->mutableLayoutStyle(); 347 return shareElement->mutableComputedStyle();
348 } 348 }
349 349
350 } 350 }
OLDNEW
« no previous file with comments | « Source/core/css/resolver/SharedStyleFinder.h ('k') | Source/core/css/resolver/StyleAdjuster.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698