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

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

Issue 2748103015: Replace ASSERT with DCHECK in core/layout/<sub dirs> (Closed)
Patch Set: Rebase with latest Created 3 years, 9 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) Research In Motion Limited 2010. All rights reserved. 2 * Copyright (C) Research In Motion Limited 2010. 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 #include "core/layout/svg/SVGTextLayoutEngineSpacing.h" 20 #include "core/layout/svg/SVGTextLayoutEngineSpacing.h"
21 21
22 #include "platform/fonts/Font.h" 22 #include "platform/fonts/Font.h"
23 #include "platform/text/Character.h" 23 #include "platform/text/Character.h"
24 24
25 namespace blink { 25 namespace blink {
26 26
27 SVGTextLayoutEngineSpacing::SVGTextLayoutEngineSpacing(const Font& font, 27 SVGTextLayoutEngineSpacing::SVGTextLayoutEngineSpacing(const Font& font,
28 float effectiveZoom) 28 float effectiveZoom)
29 : m_font(font), m_lastCharacter(0), m_effectiveZoom(effectiveZoom) { 29 : m_font(font), m_lastCharacter(0), m_effectiveZoom(effectiveZoom) {
30 ASSERT(m_effectiveZoom); 30 DCHECK(m_effectiveZoom);
31 } 31 }
32 32
33 float SVGTextLayoutEngineSpacing::calculateCSSSpacing(UChar currentCharacter) { 33 float SVGTextLayoutEngineSpacing::calculateCSSSpacing(UChar currentCharacter) {
34 UChar lastCharacter = m_lastCharacter; 34 UChar lastCharacter = m_lastCharacter;
35 m_lastCharacter = currentCharacter; 35 m_lastCharacter = currentCharacter;
36 36
37 if (!m_font.getFontDescription().letterSpacing() && 37 if (!m_font.getFontDescription().letterSpacing() &&
38 !m_font.getFontDescription().wordSpacing()) 38 !m_font.getFontDescription().wordSpacing())
39 return 0; 39 return 0;
40 40
41 float spacing = m_font.getFontDescription().letterSpacing(); 41 float spacing = m_font.getFontDescription().letterSpacing();
42 if (currentCharacter && lastCharacter && 42 if (currentCharacter && lastCharacter &&
43 m_font.getFontDescription().wordSpacing()) { 43 m_font.getFontDescription().wordSpacing()) {
44 if (Character::treatAsSpace(currentCharacter) && 44 if (Character::treatAsSpace(currentCharacter) &&
45 !Character::treatAsSpace(lastCharacter)) 45 !Character::treatAsSpace(lastCharacter))
46 spacing += m_font.getFontDescription().wordSpacing(); 46 spacing += m_font.getFontDescription().wordSpacing();
47 } 47 }
48 48
49 if (m_effectiveZoom != 1) 49 if (m_effectiveZoom != 1)
50 spacing = spacing / m_effectiveZoom; 50 spacing = spacing / m_effectiveZoom;
51 51
52 return spacing; 52 return spacing;
53 } 53 }
54 54
55 } // namespace blink 55 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698