Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 Loading... | |
| 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 if (element().assignedSlot()) | |
|
kochi
2016/01/07 09:54:09
I found that this now causes assertion in ElementS
| |
| 283 return false; | |
| 284 | |
| 281 return true; | 285 return true; |
| 282 } | 286 } |
| 283 | 287 |
| 284 bool SharedStyleFinder::documentContainsValidCandidate() const | 288 bool SharedStyleFinder::documentContainsValidCandidate() const |
| 285 { | 289 { |
| 286 for (Element& element : ElementTraversal::startsAt(document().documentElemen t())) { | 290 for (Element& element : ElementTraversal::startsAt(document().documentElemen t())) { |
| 287 if (element.supportsStyleSharing() && canShareStyleWithElement(element)) | 291 if (element.supportsStyleSharing() && canShareStyleWithElement(element)) |
| 288 return true; | 292 return true; |
| 289 } | 293 } |
| 290 return false; | 294 return false; |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 349 // Tracking child index requires unique style for each node. This may get se t by the sibling rule match above. | 353 // 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()) { | 354 if (!element().parentElementOrShadowRoot()->childrenSupportStyleSharing()) { |
| 351 INCREMENT_STYLE_STATS_COUNTER(*m_styleResolver, sharedStyleRejectedByPar ent, 1); | 355 INCREMENT_STYLE_STATS_COUNTER(*m_styleResolver, sharedStyleRejectedByPar ent, 1); |
| 352 return nullptr; | 356 return nullptr; |
| 353 } | 357 } |
| 354 | 358 |
| 355 return shareElement->mutableComputedStyle(); | 359 return shareElement->mutableComputedStyle(); |
| 356 } | 360 } |
| 357 | 361 |
| 358 } | 362 } |
| OLD | NEW |