| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) |
| 3 * (C) 2000 Antti Koivisto (koivisto@kde.org) | 3 * (C) 2000 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) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All r
ights reserved. | 6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All r
ights reserved. |
| 7 * Copyright (C) 2009 Google Inc. All rights reserved. | 7 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 8 * | 8 * |
| 9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
| 10 * modify it under the terms of the GNU Library General Public | 10 * modify it under the terms of the GNU Library General Public |
| (...skipping 661 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 672 virtual LayoutUnit maxPreferredLogicalWidth() const { return 0; } | 672 virtual LayoutUnit maxPreferredLogicalWidth() const { return 0; } |
| 673 | 673 |
| 674 RenderStyle* style() const { return m_style.get(); } | 674 RenderStyle* style() const { return m_style.get(); } |
| 675 | 675 |
| 676 /* The two following methods are inlined in RenderObjectInlines.h */ | 676 /* The two following methods are inlined in RenderObjectInlines.h */ |
| 677 RenderStyle* firstLineStyle() const; | 677 RenderStyle* firstLineStyle() const; |
| 678 RenderStyle* style(bool firstLine) const; | 678 RenderStyle* style(bool firstLine) const; |
| 679 | 679 |
| 680 inline Color resolveColor(const RenderStyle* styleToUse, int colorProperty)
const | 680 inline Color resolveColor(const RenderStyle* styleToUse, int colorProperty)
const |
| 681 { | 681 { |
| 682 return styleToUse->visitedDependentColor(colorProperty); | 682 return styleToUse->colorIncludingFallback(colorProperty); |
| 683 } | 683 } |
| 684 | 684 |
| 685 inline Color resolveColor(int colorProperty) const | 685 inline Color resolveColor(int colorProperty) const |
| 686 { | 686 { |
| 687 return style()->visitedDependentColor(colorProperty); | 687 return style()->colorIncludingFallback(colorProperty); |
| 688 } | 688 } |
| 689 | 689 |
| 690 virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const; | 690 virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const; |
| 691 | 691 |
| 692 struct AppliedTextDecoration { | 692 struct AppliedTextDecoration { |
| 693 Color color; | 693 Color color; |
| 694 TextDecorationStyle style; | 694 TextDecorationStyle style; |
| 695 AppliedTextDecoration() : color(Color::transparent), style(TextDecoratio
nStyleSolid) { } | 695 AppliedTextDecoration() : color(Color::transparent), style(TextDecoratio
nStyleSolid) { } |
| 696 }; | 696 }; |
| 697 | 697 |
| (...skipping 646 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1344 void showTree(const blink::RenderObject*); | 1344 void showTree(const blink::RenderObject*); |
| 1345 void showLineTree(const blink::RenderObject*); | 1345 void showLineTree(const blink::RenderObject*); |
| 1346 void showRenderTree(const blink::RenderObject* object1); | 1346 void showRenderTree(const blink::RenderObject* object1); |
| 1347 // We don't make object2 an optional parameter so that showRenderTree | 1347 // We don't make object2 an optional parameter so that showRenderTree |
| 1348 // can be called from gdb easily. | 1348 // can be called from gdb easily. |
| 1349 void showRenderTree(const blink::RenderObject* object1, const blink::RenderObjec
t* object2); | 1349 void showRenderTree(const blink::RenderObject* object1, const blink::RenderObjec
t* object2); |
| 1350 | 1350 |
| 1351 #endif | 1351 #endif |
| 1352 | 1352 |
| 1353 #endif // RenderObject_h | 1353 #endif // RenderObject_h |
| OLD | NEW |