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

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

Issue 2622043003: Replaced RefPtr::release with std::move in Source/core. (Closed)
Patch Set: Created 3 years, 11 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 * (C) 1999 Lars Knoll (knoll@kde.org) 2 * (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Dirk Mueller (mueller@kde.org) 3 * (C) 2000 Dirk Mueller (mueller@kde.org)
4 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 1540 matching lines...) Expand 10 before | Expand all | Expand 10 after
1551 parent()->dirtyLinesFromChangedChild(this); 1551 parent()->dirtyLinesFromChangedChild(this);
1552 dirtiedLines = true; 1552 dirtiedLines = true;
1553 } 1553 }
1554 1554
1555 m_linesDirty = dirtiedLines; 1555 m_linesDirty = dirtiedLines;
1556 setText(std::move(text), force || dirtiedLines); 1556 setText(std::move(text), force || dirtiedLines);
1557 } 1557 }
1558 1558
1559 void LayoutText::transformText() { 1559 void LayoutText::transformText() {
1560 if (RefPtr<StringImpl> textToTransform = originalText()) 1560 if (RefPtr<StringImpl> textToTransform = originalText())
1561 setText(textToTransform.release(), true); 1561 setText(std::move(textToTransform), true);
1562 } 1562 }
1563 1563
1564 static inline bool isInlineFlowOrEmptyText(const LayoutObject* o) { 1564 static inline bool isInlineFlowOrEmptyText(const LayoutObject* o) {
1565 if (o->isLayoutInline()) 1565 if (o->isLayoutInline())
1566 return true; 1566 return true;
1567 if (!o->isText()) 1567 if (!o->isText())
1568 return false; 1568 return false;
1569 return toLayoutText(o)->text().isEmpty(); 1569 return toLayoutText(o)->text().isEmpty();
1570 } 1570 }
1571 1571
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
1993 LayoutRect rect = LayoutRect( 1993 LayoutRect rect = LayoutRect(
1994 IntRect(firstRunX(), firstRunY(), linesBox.width(), linesBox.height())); 1994 IntRect(firstRunX(), firstRunY(), linesBox.width(), linesBox.height()));
1995 LayoutBlock* block = containingBlock(); 1995 LayoutBlock* block = containingBlock();
1996 if (block && hasTextBoxes()) 1996 if (block && hasTextBoxes())
1997 block->adjustChildDebugRect(rect); 1997 block->adjustChildDebugRect(rect);
1998 1998
1999 return rect; 1999 return rect;
2000 } 2000 }
2001 2001
2002 } // namespace blink 2002 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698