| 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 826 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 837 } | 837 } |
| 838 | 838 |
| 839 if (!o || !o->isRenderBlock()) | 839 if (!o || !o->isRenderBlock()) |
| 840 return 0; // This can still happen in case of an orphaned tree | 840 return 0; // This can still happen in case of an orphaned tree |
| 841 | 841 |
| 842 return toRenderBlock(o); | 842 return toRenderBlock(o); |
| 843 } | 843 } |
| 844 | 844 |
| 845 bool RenderObject::canRenderBorderImage() const | 845 bool RenderObject::canRenderBorderImage() const |
| 846 { | 846 { |
| 847 ASSERT(style()->hasBorder()); | 847 if (!style()->hasBorder()) |
| 848 return false; |
| 848 | 849 |
| 849 StyleImage* borderImage = style()->borderImage().image(); | 850 StyleImage* borderImage = style()->borderImage().image(); |
| 850 return borderImage && borderImage->canRender(*this, style()->effectiveZoom()
) && borderImage->isLoaded(); | 851 return borderImage && borderImage->canRender(*this, style()->effectiveZoom()
) && borderImage->isLoaded(); |
| 851 } | 852 } |
| 852 | 853 |
| 853 bool RenderObject::mustInvalidateFillLayersPaintOnWidthChange(const FillLayer& l
ayer) const | 854 bool RenderObject::mustInvalidateFillLayersPaintOnWidthChange(const FillLayer& l
ayer) const |
| 854 { | 855 { |
| 855 // Nobody will use multiple layers without wanting fancy positioning. | 856 // Nobody will use multiple layers without wanting fancy positioning. |
| 856 if (layer.next()) | 857 if (layer.next()) |
| 857 return true; | 858 return true; |
| (...skipping 2597 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3455 { | 3456 { |
| 3456 if (object1) { | 3457 if (object1) { |
| 3457 const blink::RenderObject* root = object1; | 3458 const blink::RenderObject* root = object1; |
| 3458 while (root->parent()) | 3459 while (root->parent()) |
| 3459 root = root->parent(); | 3460 root = root->parent(); |
| 3460 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 3461 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
| 3461 } | 3462 } |
| 3462 } | 3463 } |
| 3463 | 3464 |
| 3464 #endif | 3465 #endif |
| OLD | NEW |