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. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. |
7 * All rights reserved. | 7 * All rights reserved. |
8 * Copyright (C) 2009 Google Inc. All rights reserved. | 8 * Copyright (C) 2009 Google Inc. All rights reserved. |
9 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. | 9 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. |
10 * (http://www.torchmobile.com/) | 10 * (http://www.torchmobile.com/) |
(...skipping 1435 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1446 Color LayoutObject::SelectionForegroundColor( | 1446 Color LayoutObject::SelectionForegroundColor( |
1447 const GlobalPaintFlags global_paint_flags) const { | 1447 const GlobalPaintFlags global_paint_flags) const { |
1448 return SelectionColor(CSSPropertyWebkitTextFillColor, global_paint_flags); | 1448 return SelectionColor(CSSPropertyWebkitTextFillColor, global_paint_flags); |
1449 } | 1449 } |
1450 | 1450 |
1451 Color LayoutObject::SelectionEmphasisMarkColor( | 1451 Color LayoutObject::SelectionEmphasisMarkColor( |
1452 const GlobalPaintFlags global_paint_flags) const { | 1452 const GlobalPaintFlags global_paint_flags) const { |
1453 return SelectionColor(CSSPropertyWebkitTextEmphasisColor, global_paint_flags); | 1453 return SelectionColor(CSSPropertyWebkitTextEmphasisColor, global_paint_flags); |
1454 } | 1454 } |
1455 | 1455 |
1456 void LayoutObject::SelectionStartEnd(int& spos, int& epos) const { | 1456 void LayoutObject::SelectionStartEnd(int& start_pos, int& end_pos) const { |
1457 View()->SelectionStartEnd(spos, epos); | 1457 GetFrame()->Selection().LayoutSelectionStartEnd(start_pos, end_pos); |
1458 } | 1458 } |
1459 | 1459 |
1460 // Called when an object that was floating or positioned becomes a normal flow | 1460 // Called when an object that was floating or positioned becomes a normal flow |
1461 // object again. We have to make sure the layout tree updates as needed to | 1461 // object again. We have to make sure the layout tree updates as needed to |
1462 // accommodate the new normal flow object. | 1462 // accommodate the new normal flow object. |
1463 static inline void HandleDynamicFloatPositionChange(LayoutObject* object) { | 1463 static inline void HandleDynamicFloatPositionChange(LayoutObject* object) { |
1464 // We have gone from not affecting the inline status of the parent flow to | 1464 // We have gone from not affecting the inline status of the parent flow to |
1465 // suddenly having an impact. See if there is a mismatch between the parent | 1465 // suddenly having an impact. See if there is a mismatch between the parent |
1466 // flow's childrenInline() state and our state. | 1466 // flow's childrenInline() state and our state. |
1467 object->SetInline(object->Style()->IsDisplayInlineType()); | 1467 object->SetInline(object->Style()->IsDisplayInlineType()); |
(...skipping 2184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3652 const blink::LayoutObject* root = object1; | 3652 const blink::LayoutObject* root = object1; |
3653 while (root->Parent()) | 3653 while (root->Parent()) |
3654 root = root->Parent(); | 3654 root = root->Parent(); |
3655 root->ShowLayoutTreeAndMark(object1, "*", object2, "-", 0); | 3655 root->ShowLayoutTreeAndMark(object1, "*", object2, "-", 0); |
3656 } else { | 3656 } else { |
3657 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); | 3657 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); |
3658 } | 3658 } |
3659 } | 3659 } |
3660 | 3660 |
3661 #endif | 3661 #endif |
OLD | NEW |