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 1873 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1884 style->inheritFrom(pseudoStyle.get()); | 1884 style->inheritFrom(pseudoStyle.get()); |
1885 setStyle(style.release()); | 1885 setStyle(style.release()); |
1886 return; | 1886 return; |
1887 } | 1887 } |
1888 | 1888 |
1889 setStyle(pseudoStyle); | 1889 setStyle(pseudoStyle); |
1890 } | 1890 } |
1891 | 1891 |
1892 inline bool RenderObject::hasImmediateNonWhitespaceTextChildOrPropertiesDependen
tOnColor() const | 1892 inline bool RenderObject::hasImmediateNonWhitespaceTextChildOrPropertiesDependen
tOnColor() const |
1893 { | 1893 { |
| 1894 if (style()->hasBorder() || style()->hasOutline()) |
| 1895 return true; |
1894 for (const RenderObject* r = firstChild(); r; r = r->nextSibling()) { | 1896 for (const RenderObject* r = firstChild(); r; r = r->nextSibling()) { |
1895 if (r->isText() && !toRenderText(r)->isAllCollapsibleWhitespace()) | 1897 if (r->isText() && !toRenderText(r)->isAllCollapsibleWhitespace()) |
1896 return true; | 1898 return true; |
1897 if (r->style()->hasOutline() || r->style()->hasBorder()) | 1899 if (r->style()->hasOutline() || r->style()->hasBorder()) |
1898 return true; | 1900 return true; |
1899 } | 1901 } |
1900 return false; | 1902 return false; |
1901 } | 1903 } |
1902 | 1904 |
1903 inline bool RenderObject::shouldRepaintForStyleDifference(StyleDifference diff)
const | 1905 inline bool RenderObject::shouldRepaintForStyleDifference(StyleDifference diff)
const |
(...skipping 1483 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3387 { | 3389 { |
3388 if (object1) { | 3390 if (object1) { |
3389 const WebCore::RenderObject* root = object1; | 3391 const WebCore::RenderObject* root = object1; |
3390 while (root->parent()) | 3392 while (root->parent()) |
3391 root = root->parent(); | 3393 root = root->parent(); |
3392 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 3394 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
3393 } | 3395 } |
3394 } | 3396 } |
3395 | 3397 |
3396 #endif | 3398 #endif |
OLD | NEW |