OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
4 * (C) 2001 Peter Kelly (pmk@post.com) | 4 * (C) 2001 Peter Kelly (pmk@post.com) |
5 * (C) 2001 Dirk Mueller (mueller@kde.org) | 5 * (C) 2001 Dirk Mueller (mueller@kde.org) |
6 * (C) 2007 David Smith (catfish.man@gmail.com) | 6 * (C) 2007 David Smith (catfish.man@gmail.com) |
7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved. | 7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved. |
8 * (C) 2007 Eric Seidel (eric@webkit.org) | 8 * (C) 2007 Eric Seidel (eric@webkit.org) |
9 * | 9 * |
10 * This library is free software; you can redistribute it and/or | 10 * This library is free software; you can redistribute it and/or |
(...skipping 1710 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1721 if (ElementShadow* elementShadow = shadow()) { | 1721 if (ElementShadow* elementShadow = shadow()) { |
1722 if (ShadowRoot* shadowRoot = elementShadow->oldestShadowRoot()) { | 1722 if (ShadowRoot* shadowRoot = elementShadow->oldestShadowRoot()) { |
1723 ASSERT(shadowRoot->type() == ShadowRoot::UserAgentShadowRoot); | 1723 ASSERT(shadowRoot->type() == ShadowRoot::UserAgentShadowRoot); |
1724 return shadowRoot; | 1724 return shadowRoot; |
1725 } | 1725 } |
1726 } | 1726 } |
1727 | 1727 |
1728 return 0; | 1728 return 0; |
1729 } | 1729 } |
1730 | 1730 |
1731 ShadowRoot* Element::ensureUserAgentShadowRoot() | 1731 ShadowRoot& Element::ensureUserAgentShadowRoot() |
1732 { | 1732 { |
1733 if (ShadowRoot* shadowRoot = userAgentShadowRoot()) | 1733 if (ShadowRoot* shadowRoot = userAgentShadowRoot()) |
1734 return shadowRoot; | 1734 return *shadowRoot; |
1735 ShadowRoot* shadowRoot = ensureShadow().addShadowRoot(*this, ShadowRoot::Use rAgentShadowRoot); | 1735 RefPtr<ShadowRoot> shadowRoot = ensureShadow().addShadowRoot(*this, ShadowRo ot::UserAgentShadowRoot); |
1736 didAddUserAgentShadowRoot(shadowRoot); | 1736 didAddUserAgentShadowRoot(*shadowRoot); |
1737 return shadowRoot; | 1737 return *shadowRoot; |
eseidel
2013/11/06 01:11:17
Who's holding onto this root... Lets hope didAddUs
adamk
2013/11/06 02:01:39
addShadowRoot does (ShadowRoot is TreeShared). Wha
| |
1738 } | 1738 } |
1739 | 1739 |
1740 bool Element::childTypeAllowed(NodeType type) const | 1740 bool Element::childTypeAllowed(NodeType type) const |
1741 { | 1741 { |
1742 switch (type) { | 1742 switch (type) { |
1743 case ELEMENT_NODE: | 1743 case ELEMENT_NODE: |
1744 case TEXT_NODE: | 1744 case TEXT_NODE: |
1745 case COMMENT_NODE: | 1745 case COMMENT_NODE: |
1746 case PROCESSING_INSTRUCTION_NODE: | 1746 case PROCESSING_INSTRUCTION_NODE: |
1747 case CDATA_SECTION_NODE: | 1747 case CDATA_SECTION_NODE: |
(...skipping 1735 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3483 // Before doing so, we need to resolve issues in HTMLSelectElement::recalcLi stItems | 3483 // Before doing so, we need to resolve issues in HTMLSelectElement::recalcLi stItems |
3484 // and RenderMenuList::setText. See also https://bugs.webkit.org/show_bug.cg i?id=88405 | 3484 // and RenderMenuList::setText. See also https://bugs.webkit.org/show_bug.cg i?id=88405 |
3485 if (hasTagName(optionTag) || hasTagName(optgroupTag)) | 3485 if (hasTagName(optionTag) || hasTagName(optgroupTag)) |
3486 return false; | 3486 return false; |
3487 if (FullscreenElementStack::isActiveFullScreenElement(this)) | 3487 if (FullscreenElementStack::isActiveFullScreenElement(this)) |
3488 return false; | 3488 return false; |
3489 return true; | 3489 return true; |
3490 } | 3490 } |
3491 | 3491 |
3492 } // namespace WebCore | 3492 } // namespace WebCore |
OLD | NEW |