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

Side by Side Diff: Source/core/dom/Element.cpp

Issue 177063004: Move custom element definitions into ElementRareData (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Add ASSERT Created 6 years, 9 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/dom/Element.h ('k') | Source/core/dom/ElementRareData.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) 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 1747 matching lines...) Expand 10 before | Expand all | Expand 10 after
1758 1758
1759 void Element::setNeedsAnimationStyleRecalc() 1759 void Element::setNeedsAnimationStyleRecalc()
1760 { 1760 {
1761 if (styleChangeType() != NoStyleChange) 1761 if (styleChangeType() != NoStyleChange)
1762 return; 1762 return;
1763 1763
1764 setNeedsStyleRecalc(LocalStyleChange); 1764 setNeedsStyleRecalc(LocalStyleChange);
1765 setAnimationStyleChange(true); 1765 setAnimationStyleChange(true);
1766 } 1766 }
1767 1767
1768 void Element::setCustomElementDefinition(PassRefPtr<CustomElementDefinition> def inition)
1769 {
1770 if (!hasRareData() && !definition)
1771 return;
1772 ASSERT(!customElementDefinition());
1773 ensureElementRareData().setCustomElementDefinition(definition);
1774 }
1775
1776 CustomElementDefinition* Element::customElementDefinition() const
1777 {
1778 if (hasRareData())
1779 return elementRareData()->customElementDefinition();
1780 return 0;
1781 }
1782
1768 PassRefPtr<ShadowRoot> Element::createShadowRoot(ExceptionState& exceptionState) 1783 PassRefPtr<ShadowRoot> Element::createShadowRoot(ExceptionState& exceptionState)
1769 { 1784 {
1770 if (alwaysCreateUserAgentShadowRoot()) 1785 if (alwaysCreateUserAgentShadowRoot())
1771 ensureUserAgentShadowRoot(); 1786 ensureUserAgentShadowRoot();
1772 1787
1773 // Some elements make assumptions about what kind of renderers they allow 1788 // Some elements make assumptions about what kind of renderers they allow
1774 // as children so we can't allow author shadows on them for now. An override 1789 // as children so we can't allow author shadows on them for now. An override
1775 // flag is provided for testing how author shadows interact on these element s. 1790 // flag is provided for testing how author shadows interact on these element s.
1776 if (!areAuthorShadowsAllowed() && !RuntimeEnabledFeatures::authorShadowDOMFo rAnyElementEnabled()) { 1791 if (!areAuthorShadowsAllowed() && !RuntimeEnabledFeatures::authorShadowDOMFo rAnyElementEnabled()) {
1777 exceptionState.throwDOMException(HierarchyRequestError, "Author-created shadow roots are disabled for this element."); 1792 exceptionState.throwDOMException(HierarchyRequestError, "Author-created shadow roots are disabled for this element.");
(...skipping 1628 matching lines...) Expand 10 before | Expand all | Expand 10 after
3406 // Before doing so, we need to resolve issues in HTMLSelectElement::recalcLi stItems 3421 // Before doing so, we need to resolve issues in HTMLSelectElement::recalcLi stItems
3407 // and RenderMenuList::setText. See also https://bugs.webkit.org/show_bug.cg i?id=88405 3422 // and RenderMenuList::setText. See also https://bugs.webkit.org/show_bug.cg i?id=88405
3408 if (isHTMLOptionElement(*this) || isHTMLOptGroupElement(*this)) 3423 if (isHTMLOptionElement(*this) || isHTMLOptGroupElement(*this))
3409 return false; 3424 return false;
3410 if (FullscreenElementStack::isActiveFullScreenElement(this)) 3425 if (FullscreenElementStack::isActiveFullScreenElement(this))
3411 return false; 3426 return false;
3412 return true; 3427 return true;
3413 } 3428 }
3414 3429
3415 } // namespace WebCore 3430 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/dom/Element.h ('k') | Source/core/dom/ElementRareData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698