Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(803)

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutObject.cpp

Issue 2833343002: Change SelectionStartEnd() returning values instead of assigning into ref args. (Closed)
Patch Set: rebase Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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& start_pos, int& end_pos) const { 1456 std::pair<int, int> LayoutObject::SelectionStartEnd() const {
1457 DCHECK(!View()->NeedsLayout()); 1457 DCHECK(!View()->NeedsLayout());
1458 GetFrame()->Selection().LayoutSelectionStartEnd(start_pos, end_pos); 1458 return GetFrame()->Selection().LayoutSelectionStartEnd();
1459 } 1459 }
1460 1460
1461 // 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
1462 // 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
1463 // accommodate the new normal flow object. 1463 // accommodate the new normal flow object.
1464 static inline void HandleDynamicFloatPositionChange(LayoutObject* object) { 1464 static inline void HandleDynamicFloatPositionChange(LayoutObject* object) {
1465 // 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
1466 // 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
1467 // flow's childrenInline() state and our state. 1467 // flow's childrenInline() state and our state.
1468 object->SetInline(object->Style()->IsDisplayInlineType()); 1468 object->SetInline(object->Style()->IsDisplayInlineType());
(...skipping 2184 matching lines...) Expand 10 before | Expand all | Expand 10 after
3653 const blink::LayoutObject* root = object1; 3653 const blink::LayoutObject* root = object1;
3654 while (root->Parent()) 3654 while (root->Parent())
3655 root = root->Parent(); 3655 root = root->Parent();
3656 root->ShowLayoutTreeAndMark(object1, "*", object2, "-", 0); 3656 root->ShowLayoutTreeAndMark(object1, "*", object2, "-", 0);
3657 } else { 3657 } else {
3658 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); 3658 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)");
3659 } 3659 }
3660 } 3660 }
3661 3661
3662 #endif 3662 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutObject.h ('k') | third_party/WebKit/Source/core/layout/LayoutText.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698