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

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

Issue 2282413002: Replaced PassRefPtr copies with moves in Source/core. (Closed)
Patch Set: rebased Created 4 years, 3 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) 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Library General Public License for more details. 12 * Library General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU Library General Public License 14 * You should have received a copy of the GNU Library General Public License
15 * along with this library; see the file COPYING.LIB. If not, write to 15 * along with this library; see the file COPYING.LIB. If not, write to
16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
17 * Boston, MA 02110-1301, USA. 17 * Boston, MA 02110-1301, USA.
18 * 18 *
19 */ 19 */
20 20
21 #include "core/layout/LayoutTextCombine.h" 21 #include "core/layout/LayoutTextCombine.h"
22 22
23 #include "platform/graphics/GraphicsContext.h" 23 #include "platform/graphics/GraphicsContext.h"
24 24
25 namespace blink { 25 namespace blink {
26 26
27 const float textCombineMargin = 1.1f; // Allow em + 10% margin 27 const float textCombineMargin = 1.1f; // Allow em + 10% margin
28 28
29 LayoutTextCombine::LayoutTextCombine(Node* node, PassRefPtr<StringImpl> string) 29 LayoutTextCombine::LayoutTextCombine(Node* node, PassRefPtr<StringImpl> string)
30 : LayoutText(node, string) 30 : LayoutText(node, std::move(string))
31 , m_combinedTextWidth(0) 31 , m_combinedTextWidth(0)
32 , m_scaleX(1.0f) 32 , m_scaleX(1.0f)
33 , m_isCombined(false) 33 , m_isCombined(false)
34 , m_needsFontUpdate(false) 34 , m_needsFontUpdate(false)
35 { 35 {
36 } 36 }
37 37
38 void LayoutTextCombine::styleDidChange(StyleDifference diff, const ComputedStyle * oldStyle) 38 void LayoutTextCombine::styleDidChange(StyleDifference diff, const ComputedStyle * oldStyle)
39 { 39 {
40 setStyleInternal(ComputedStyle::clone(styleRef())); 40 setStyleInternal(ComputedStyle::clone(styleRef()));
41 LayoutText::styleDidChange(diff, oldStyle); 41 LayoutText::styleDidChange(diff, oldStyle);
42 42
43 updateIsCombined(); 43 updateIsCombined();
44 } 44 }
45 45
46 void LayoutTextCombine::setTextInternal(PassRefPtr<StringImpl> text) 46 void LayoutTextCombine::setTextInternal(PassRefPtr<StringImpl> text)
47 { 47 {
48 LayoutText::setTextInternal(text); 48 LayoutText::setTextInternal(std::move(text));
49 49
50 updateIsCombined(); 50 updateIsCombined();
51 } 51 }
52 52
53 float LayoutTextCombine::width(unsigned from, unsigned length, const Font& font, LayoutUnit xPosition, TextDirection direction, HashSet<const SimpleFontData*>* fallbackFonts, FloatRect* glyphBounds) const 53 float LayoutTextCombine::width(unsigned from, unsigned length, const Font& font, LayoutUnit xPosition, TextDirection direction, HashSet<const SimpleFontData*>* fallbackFonts, FloatRect* glyphBounds) const
54 { 54 {
55 if (!length) 55 if (!length)
56 return 0; 56 return 0;
57 57
58 if (hasEmptyText()) 58 if (hasEmptyText())
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 } else { 170 } else {
171 m_scaleX = 1.0f; 171 m_scaleX = 1.0f;
172 } 172 }
173 } 173 }
174 174
175 if (shouldUpdateFont) 175 if (shouldUpdateFont)
176 style()->font().update(fontSelector); 176 style()->font().update(fontSelector);
177 } 177 }
178 178
179 } // namespace blink 179 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutText.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutTextFragment.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698