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 1598 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1609 | 1609 |
1610 StyleRecalcChange Element::recalcOwnStyle(StyleRecalcChange change) | 1610 StyleRecalcChange Element::recalcOwnStyle(StyleRecalcChange change) |
1611 { | 1611 { |
1612 ASSERT(document().inStyleRecalc()); | 1612 ASSERT(document().inStyleRecalc()); |
1613 ASSERT(!parentOrShadowHostNode()->needsStyleRecalc()); | 1613 ASSERT(!parentOrShadowHostNode()->needsStyleRecalc()); |
1614 ASSERT(change >= Inherit || needsStyleRecalc()); | 1614 ASSERT(change >= Inherit || needsStyleRecalc()); |
1615 ASSERT(parentRenderStyle()); | 1615 ASSERT(parentRenderStyle()); |
1616 | 1616 |
1617 RefPtr<RenderStyle> oldStyle = renderStyle(); | 1617 RefPtr<RenderStyle> oldStyle = renderStyle(); |
1618 RefPtr<RenderStyle> newStyle = styleForRenderer(); | 1618 RefPtr<RenderStyle> newStyle = styleForRenderer(); |
1619 StyleRecalcChange localChange = RenderStyle::compare(oldStyle.get(), newStyl
e.get()); | 1619 StyleRecalcChange localChange = RenderStyle::stylePropagationDiff(oldStyle.g
et(), newStyle.get()); |
1620 | 1620 |
1621 ASSERT(newStyle); | 1621 ASSERT(newStyle); |
1622 | 1622 |
1623 if (localChange == Reattach) { | 1623 if (localChange == Reattach) { |
1624 AttachContext reattachContext; | 1624 AttachContext reattachContext; |
1625 reattachContext.resolvedStyle = newStyle.get(); | 1625 reattachContext.resolvedStyle = newStyle.get(); |
1626 bool rendererWillChange = needsAttach() || renderer(); | 1626 bool rendererWillChange = needsAttach() || renderer(); |
1627 reattach(reattachContext); | 1627 reattach(reattachContext); |
1628 if (rendererWillChange || renderer()) | 1628 if (rendererWillChange || renderer()) |
1629 return Reattach; | 1629 return Reattach; |
(...skipping 1776 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3406 // Before doing so, we need to resolve issues in HTMLSelectElement::recalcLi
stItems | 3406 // 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 | 3407 // and RenderMenuList::setText. See also https://bugs.webkit.org/show_bug.cg
i?id=88405 |
3408 if (isHTMLOptionElement(*this) || isHTMLOptGroupElement(*this)) | 3408 if (isHTMLOptionElement(*this) || isHTMLOptGroupElement(*this)) |
3409 return false; | 3409 return false; |
3410 if (FullscreenElementStack::isActiveFullScreenElement(this)) | 3410 if (FullscreenElementStack::isActiveFullScreenElement(this)) |
3411 return false; | 3411 return false; |
3412 return true; | 3412 return true; |
3413 } | 3413 } |
3414 | 3414 |
3415 } // namespace WebCore | 3415 } // namespace WebCore |
OLD | NEW |