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 Apple Inc. All rights
reserved. | 7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 if (m_pushedStyleSelector) | 83 if (m_pushedStyleSelector) |
84 return; | 84 return; |
85 m_pushedStyleSelector = m_parent->document()->styleSelector(); | 85 m_pushedStyleSelector = m_parent->document()->styleSelector(); |
86 m_pushedStyleSelector->pushParent(m_parent); | 86 m_pushedStyleSelector->pushParent(m_parent); |
87 } | 87 } |
88 ~StyleSelectorParentPusher() | 88 ~StyleSelectorParentPusher() |
89 { | 89 { |
90 | 90 |
91 if (!m_pushedStyleSelector) | 91 if (!m_pushedStyleSelector) |
92 return; | 92 return; |
| 93 |
| 94 // This tells us that our pushed style selector is in a bad state, |
| 95 // so we should just bail out in that scenario. |
93 ASSERT(m_pushedStyleSelector == m_parent->document()->styleSelector()); | 96 ASSERT(m_pushedStyleSelector == m_parent->document()->styleSelector()); |
| 97 if (m_pushedStyleSelector != m_parent->document()->styleSelector()) |
| 98 return; |
| 99 |
94 m_pushedStyleSelector->popParent(m_parent); | 100 m_pushedStyleSelector->popParent(m_parent); |
95 } | 101 } |
96 | 102 |
97 private: | 103 private: |
98 Element* m_parent; | 104 Element* m_parent; |
99 CSSStyleSelector* m_pushedStyleSelector; | 105 CSSStyleSelector* m_pushedStyleSelector; |
100 }; | 106 }; |
101 | 107 |
102 PassRefPtr<Element> Element::create(const QualifiedName& tagName, Document* docu
ment) | 108 PassRefPtr<Element> Element::create(const QualifiedName& tagName, Document* docu
ment) |
103 { | 109 { |
(...skipping 1818 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1922 | 1928 |
1923 AnimationController* animController = renderer()->animation(); | 1929 AnimationController* animController = renderer()->animation(); |
1924 | 1930 |
1925 if (!animController) | 1931 if (!animController) |
1926 return 0; | 1932 return 0; |
1927 | 1933 |
1928 return animController->animationsForRenderer(renderer()); | 1934 return animController->animationsForRenderer(renderer()); |
1929 } | 1935 } |
1930 | 1936 |
1931 } // namespace WebCore | 1937 } // namespace WebCore |
OLD | NEW |