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

Side by Side Diff: Source/core/layout/LayoutText.h

Issue 1196213002: Remove duplicate measure hyphen string method (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 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
« no previous file with comments | « Source/core/layout/LayoutBlockFlowLine.cpp ('k') | Source/core/layout/LayoutText.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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-2009, 2013 Apple Inc. All rights reserved. 4 * Copyright (C) 2004-2009, 2013 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 void momentarilyRevealLastTypedCharacter(unsigned lastTypedCharacterOffset); 134 void momentarilyRevealLastTypedCharacter(unsigned lastTypedCharacterOffset);
135 135
136 bool isAllCollapsibleWhitespace() const; 136 bool isAllCollapsibleWhitespace() const;
137 137
138 bool canUseSimpleFontCodePath() const { return m_canUseSimpleFontCodePath; } 138 bool canUseSimpleFontCodePath() const { return m_canUseSimpleFontCodePath; }
139 139
140 void removeAndDestroyTextBoxes(); 140 void removeAndDestroyTextBoxes();
141 141
142 PassRefPtr<AbstractInlineTextBox> firstAbstractInlineTextBox(); 142 PassRefPtr<AbstractInlineTextBox> firstAbstractInlineTextBox();
143 143
144 static float hyphenWidth(LayoutText*, const Font&, TextDirection);
rwlbuis 2015/06/22 17:23:12 The duplication is a nice find. But I am quite sur
h.joshi 2015/06/23 04:30:12 Done, made method inline and removed static natue.
145
144 protected: 146 protected:
145 virtual void willBeDestroyed() override; 147 virtual void willBeDestroyed() override;
146 148
147 virtual void styleWillChange(StyleDifference, const ComputedStyle&) override final { } 149 virtual void styleWillChange(StyleDifference, const ComputedStyle&) override final { }
148 virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override; 150 virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
149 151
150 virtual void setTextInternal(PassRefPtr<StringImpl>); 152 virtual void setTextInternal(PassRefPtr<StringImpl>);
151 virtual UChar previousCharacter() const; 153 virtual UChar previousCharacter() const;
152 154
153 virtual void addLayerHitTestRects(LayerHitTestRects&, const DeprecatedPaintL ayer* currentLayer, const LayoutPoint& layerOffset, const LayoutRect& containerR ect) const override; 155 virtual void addLayerHitTestRects(LayerHitTestRects&, const DeprecatedPaintL ayer* currentLayer, const LayoutPoint& layerOffset, const LayoutRect& containerR ect) const override;
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 inline LayoutText* Text::layoutObject() const 237 inline LayoutText* Text::layoutObject() const
236 { 238 {
237 return toLayoutText(CharacterData::layoutObject()); 239 return toLayoutText(CharacterData::layoutObject());
238 } 240 }
239 241
240 void applyTextTransform(const ComputedStyle*, String&, UChar); 242 void applyTextTransform(const ComputedStyle*, String&, UChar);
241 243
242 } // namespace blink 244 } // namespace blink
243 245
244 #endif // LayoutText_h 246 #endif // LayoutText_h
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutBlockFlowLine.cpp ('k') | Source/core/layout/LayoutText.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698