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

Side by Side Diff: third_party/WebKit/Source/platform/fonts/Font.cpp

Issue 2387263004: Manually remove many instances of a comma quirk arising from the reformat. (Closed)
Patch Set: merge with master; thakis nit Created 4 years, 2 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 * Copyright (C) 2003, 2006, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2006, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (c) 2007, 2008, 2010 Google Inc. All rights reserved. 6 * Copyright (c) 2007, 2008, 2010 Google Inc. All rights reserved.
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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 58
59 Font::Font() : m_canShapeWordByWord(0), m_shapeWordByWordComputed(0) {} 59 Font::Font() : m_canShapeWordByWord(0), m_shapeWordByWordComputed(0) {}
60 60
61 Font::Font(const FontDescription& fd) 61 Font::Font(const FontDescription& fd)
62 : m_fontDescription(fd), 62 : m_fontDescription(fd),
63 m_canShapeWordByWord(0), 63 m_canShapeWordByWord(0),
64 m_shapeWordByWordComputed(0) {} 64 m_shapeWordByWordComputed(0) {}
65 65
66 Font::Font(const Font& other) 66 Font::Font(const Font& other)
67 : m_fontDescription(other.m_fontDescription), 67 : m_fontDescription(other.m_fontDescription),
68 m_fontFallbackList(other.m_fontFallbackList) 68 m_fontFallbackList(other.m_fontFallbackList),
69 // TODO(yosin): We should have a comment the reason why don't we copy 69 // TODO(yosin): We should have a comment the reason why don't we copy
70 // |m_canShapeWordByWord| and |m_shapeWordByWordComputed| from |other|, 70 // |m_canShapeWordByWord| and |m_shapeWordByWordComputed| from |other|,
71 // since |operator=()| copies them from |other|. 71 // since |operator=()| copies them from |other|.
72 ,
73 m_canShapeWordByWord(0), 72 m_canShapeWordByWord(0),
74 m_shapeWordByWordComputed(0) {} 73 m_shapeWordByWordComputed(0) {}
75 74
76 Font& Font::operator=(const Font& other) { 75 Font& Font::operator=(const Font& other) {
77 m_fontDescription = other.m_fontDescription; 76 m_fontDescription = other.m_fontDescription;
78 m_fontFallbackList = other.m_fontFallbackList; 77 m_fontFallbackList = other.m_fontFallbackList;
79 m_canShapeWordByWord = other.m_canShapeWordByWord; 78 m_canShapeWordByWord = other.m_canShapeWordByWord;
80 m_shapeWordByWordComputed = other.m_shapeWordByWordComputed; 79 m_shapeWordByWordComputed = other.m_shapeWordByWordComputed;
81 return *this; 80 return *this;
82 } 81 }
(...skipping 858 matching lines...) Expand 10 before | Expand all | Expand 10 after
941 940
942 bool Font::loadingCustomFonts() const { 941 bool Font::loadingCustomFonts() const {
943 return m_fontFallbackList && m_fontFallbackList->loadingCustomFonts(); 942 return m_fontFallbackList && m_fontFallbackList->loadingCustomFonts();
944 } 943 }
945 944
946 bool Font::isFallbackValid() const { 945 bool Font::isFallbackValid() const {
947 return !m_fontFallbackList || m_fontFallbackList->isValid(); 946 return !m_fontFallbackList || m_fontFallbackList->isValid();
948 } 947 }
949 948
950 } // namespace blink 949 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698