| 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 1436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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& start_pos, int& end_pos) const { | 1456 void LayoutObject::SelectionStartEnd(int& start_pos, int& end_pos) const { |
| 1457 DCHECK(!View()->NeedsLayout()); |
| 1457 GetFrame()->Selection().LayoutSelectionStartEnd(start_pos, end_pos); | 1458 GetFrame()->Selection().LayoutSelectionStartEnd(start_pos, end_pos); |
| 1458 } | 1459 } |
| 1459 | 1460 |
| 1460 // Called when an object that was floating or positioned becomes a normal flow | 1461 // 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 | 1462 // object again. We have to make sure the layout tree updates as needed to |
| 1462 // accommodate the new normal flow object. | 1463 // accommodate the new normal flow object. |
| 1463 static inline void HandleDynamicFloatPositionChange(LayoutObject* object) { | 1464 static inline void HandleDynamicFloatPositionChange(LayoutObject* object) { |
| 1464 // We have gone from not affecting the inline status of the parent flow to | 1465 // 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 | 1466 // suddenly having an impact. See if there is a mismatch between the parent |
| 1466 // flow's childrenInline() state and our state. | 1467 // flow's childrenInline() state and our state. |
| (...skipping 2185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3652 const blink::LayoutObject* root = object1; | 3653 const blink::LayoutObject* root = object1; |
| 3653 while (root->Parent()) | 3654 while (root->Parent()) |
| 3654 root = root->Parent(); | 3655 root = root->Parent(); |
| 3655 root->ShowLayoutTreeAndMark(object1, "*", object2, "-", 0); | 3656 root->ShowLayoutTreeAndMark(object1, "*", object2, "-", 0); |
| 3656 } else { | 3657 } else { |
| 3657 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); | 3658 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); |
| 3658 } | 3659 } |
| 3659 } | 3660 } |
| 3660 | 3661 |
| 3661 #endif | 3662 #endif |
| OLD | NEW |