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

Side by Side Diff: Source/platform/fonts/SegmentedFontData.h

Issue 630853002: Replacing the OVERRIDE with override in third_party/WebKit/Source/platform (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase build fix Created 6 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
« no previous file with comments | « Source/platform/fonts/GlyphPageTreeNodeTest.cpp ('k') | Source/platform/fonts/SimpleFontData.h » ('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 * Copyright (C) 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 virtual ~SegmentedFontData(); 60 virtual ~SegmentedFontData();
61 61
62 void appendRange(const FontDataRange& range) { m_ranges.append(range); } 62 void appendRange(const FontDataRange& range) { m_ranges.append(range); }
63 unsigned numRanges() const { return m_ranges.size(); } 63 unsigned numRanges() const { return m_ranges.size(); }
64 const FontDataRange& rangeAt(unsigned i) const { return m_ranges[i]; } 64 const FontDataRange& rangeAt(unsigned i) const { return m_ranges[i]; }
65 bool containsCharacter(UChar32) const; 65 bool containsCharacter(UChar32) const;
66 66
67 private: 67 private:
68 SegmentedFontData() { } 68 SegmentedFontData() { }
69 69
70 virtual const SimpleFontData* fontDataForCharacter(UChar32) const OVERRIDE; 70 virtual const SimpleFontData* fontDataForCharacter(UChar32) const override;
71 71
72 virtual bool isCustomFont() const OVERRIDE; 72 virtual bool isCustomFont() const override;
73 virtual bool isLoading() const OVERRIDE; 73 virtual bool isLoading() const override;
74 virtual bool isLoadingFallback() const OVERRIDE; 74 virtual bool isLoadingFallback() const override;
75 virtual bool isSegmented() const OVERRIDE; 75 virtual bool isSegmented() const override;
76 virtual bool shouldSkipDrawing() const OVERRIDE; 76 virtual bool shouldSkipDrawing() const override;
77 77
78 Vector<FontDataRange, 1> m_ranges; 78 Vector<FontDataRange, 1> m_ranges;
79 }; 79 };
80 80
81 DEFINE_FONT_DATA_TYPE_CASTS(SegmentedFontData, true); 81 DEFINE_FONT_DATA_TYPE_CASTS(SegmentedFontData, true);
82 82
83 } // namespace blink 83 } // namespace blink
84 84
85 #endif // SegmentedFontData_h 85 #endif // SegmentedFontData_h
OLDNEW
« no previous file with comments | « Source/platform/fonts/GlyphPageTreeNodeTest.cpp ('k') | Source/platform/fonts/SimpleFontData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698