| 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) 2000 Dirk Mueller (mueller@kde.org) | 4 * (C) 2000 Dirk Mueller (mueller@kde.org) |
| 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) | 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) |
| 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv
ed. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv
ed. |
| 7 * Copyright (C) 2009 Google Inc. All rights reserved. | 7 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) | 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) |
| 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 1605 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1616 markContainingBlocksForOverflowRecalc(); | 1616 markContainingBlocksForOverflowRecalc(); |
| 1617 } | 1617 } |
| 1618 | 1618 |
| 1619 void LayoutObject::setStyle(PassRefPtr<LayoutStyle> style) | 1619 void LayoutObject::setStyle(PassRefPtr<LayoutStyle> style) |
| 1620 { | 1620 { |
| 1621 ASSERT(style); | 1621 ASSERT(style); |
| 1622 | 1622 |
| 1623 if (m_style == style) { | 1623 if (m_style == style) { |
| 1624 // We need to run through adjustStyleDifference() for iframes, plugins,
and canvas so | 1624 // We need to run through adjustStyleDifference() for iframes, plugins,
and canvas so |
| 1625 // style sharing is disabled for them. That should ensure that we never
hit this code path. | 1625 // style sharing is disabled for them. That should ensure that we never
hit this code path. |
| 1626 ASSERT(!isRenderIFrame() && !isEmbeddedObject() && !isCanvas()); | 1626 ASSERT(!isLayoutIFrame() && !isEmbeddedObject() && !isCanvas()); |
| 1627 return; | 1627 return; |
| 1628 } | 1628 } |
| 1629 | 1629 |
| 1630 StyleDifference diff; | 1630 StyleDifference diff; |
| 1631 if (m_style) | 1631 if (m_style) |
| 1632 diff = m_style->visualInvalidationDiff(*style); | 1632 diff = m_style->visualInvalidationDiff(*style); |
| 1633 | 1633 |
| 1634 diff = adjustStyleDifference(diff); | 1634 diff = adjustStyleDifference(diff); |
| 1635 | 1635 |
| 1636 styleWillChange(diff, *style); | 1636 styleWillChange(diff, *style); |
| (...skipping 1547 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3184 { | 3184 { |
| 3185 if (object1) { | 3185 if (object1) { |
| 3186 const blink::LayoutObject* root = object1; | 3186 const blink::LayoutObject* root = object1; |
| 3187 while (root->parent()) | 3187 while (root->parent()) |
| 3188 root = root->parent(); | 3188 root = root->parent(); |
| 3189 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 3189 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
| 3190 } | 3190 } |
| 3191 } | 3191 } |
| 3192 | 3192 |
| 3193 #endif | 3193 #endif |
| OLD | NEW |