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

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

Issue 1523843004: Add support for new CSS ::slotted() pseudo element (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tentative fix for crash / querySelector test Created 4 years, 11 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 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 ShadowRoot* root1 = element().containingShadowRoot(); 271 ShadowRoot* root1 = element().containingShadowRoot();
272 ShadowRoot* root2 = candidate.containingShadowRoot(); 272 ShadowRoot* root2 = candidate.containingShadowRoot();
273 if (root1 && root2 && root1->type() != root2->type()) 273 if (root1 && root2 && root1->type() != root2->type())
274 return false; 274 return false;
275 275
276 if (document().containsValidityStyleRules()) { 276 if (document().containsValidityStyleRules()) {
277 if (candidate.isValidElement() != element().isValidElement()) 277 if (candidate.isValidElement() != element().isValidElement())
278 return false; 278 return false;
279 } 279 }
280 280
281 // TODO(kochi): Investigate cases when assigned slots can share styles.
282 // TODO(kochi): Figure out better way to check if an element is slotted.
283 if (element().assignedSlotForBinding())
284 return false;
285
281 return true; 286 return true;
282 } 287 }
283 288
284 bool SharedStyleFinder::documentContainsValidCandidate() const 289 bool SharedStyleFinder::documentContainsValidCandidate() const
285 { 290 {
286 for (Element& element : ElementTraversal::startsAt(document().documentElemen t())) { 291 for (Element& element : ElementTraversal::startsAt(document().documentElemen t())) {
287 if (element.supportsStyleSharing() && canShareStyleWithElement(element)) 292 if (element.supportsStyleSharing() && canShareStyleWithElement(element))
288 return true; 293 return true;
289 } 294 }
290 return false; 295 return false;
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 // Tracking child index requires unique style for each node. This may get se t by the sibling rule match above. 354 // Tracking child index requires unique style for each node. This may get se t by the sibling rule match above.
350 if (!element().parentElementOrShadowRoot()->childrenSupportStyleSharing()) { 355 if (!element().parentElementOrShadowRoot()->childrenSupportStyleSharing()) {
351 INCREMENT_STYLE_STATS_COUNTER(*m_styleResolver, sharedStyleRejectedByPar ent, 1); 356 INCREMENT_STYLE_STATS_COUNTER(*m_styleResolver, sharedStyleRejectedByPar ent, 1);
352 return nullptr; 357 return nullptr;
353 } 358 }
354 359
355 return shareElement->mutableComputedStyle(); 360 return shareElement->mutableComputedStyle();
356 } 361 }
357 362
358 } 363 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698