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

Side by Side Diff: Source/platform/text/LineEnding.cpp

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/text/DateTimeFormatTest.cpp ('k') | Source/platform/text/LocaleICU.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) 2005, 2006, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2005, 2006, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2010 Google Inc. All rights reserved. 3 * Copyright (C) 2010 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 }; 45 };
46 46
47 class CStringBuffer FINAL : public OutputBuffer { 47 class CStringBuffer FINAL : public OutputBuffer {
48 public: 48 public:
49 CStringBuffer(CString& buffer) 49 CStringBuffer(CString& buffer)
50 : m_buffer(buffer) 50 : m_buffer(buffer)
51 { 51 {
52 } 52 }
53 virtual ~CStringBuffer() { } 53 virtual ~CStringBuffer() { }
54 54
55 virtual char* allocate(size_t size) OVERRIDE 55 virtual char* allocate(size_t size) override
56 { 56 {
57 char* ptr; 57 char* ptr;
58 m_buffer = CString::newUninitialized(size, ptr); 58 m_buffer = CString::newUninitialized(size, ptr);
59 return ptr; 59 return ptr;
60 } 60 }
61 61
62 virtual void copy(const CString& source) OVERRIDE 62 virtual void copy(const CString& source) override
63 { 63 {
64 m_buffer = source; 64 m_buffer = source;
65 } 65 }
66 66
67 const CString& buffer() const { return m_buffer; } 67 const CString& buffer() const { return m_buffer; }
68 68
69 private: 69 private:
70 CString m_buffer; 70 CString m_buffer;
71 }; 71 };
72 72
73 class VectorCharAppendBuffer FINAL : public OutputBuffer { 73 class VectorCharAppendBuffer FINAL : public OutputBuffer {
74 public: 74 public:
75 VectorCharAppendBuffer(Vector<char>& buffer) 75 VectorCharAppendBuffer(Vector<char>& buffer)
76 : m_buffer(buffer) 76 : m_buffer(buffer)
77 { 77 {
78 } 78 }
79 virtual ~VectorCharAppendBuffer() { } 79 virtual ~VectorCharAppendBuffer() { }
80 80
81 virtual char* allocate(size_t size) OVERRIDE 81 virtual char* allocate(size_t size) override
82 { 82 {
83 size_t oldSize = m_buffer.size(); 83 size_t oldSize = m_buffer.size();
84 m_buffer.grow(oldSize + size); 84 m_buffer.grow(oldSize + size);
85 return m_buffer.data() + oldSize; 85 return m_buffer.data() + oldSize;
86 } 86 }
87 87
88 virtual void copy(const CString& source) OVERRIDE 88 virtual void copy(const CString& source) override
89 { 89 {
90 m_buffer.append(source.data(), source.length()); 90 m_buffer.append(source.data(), source.length());
91 } 91 }
92 92
93 private: 93 private:
94 Vector<char>& m_buffer; 94 Vector<char>& m_buffer;
95 }; 95 };
96 96
97 void internalNormalizeLineEndingsToCRLF(const CString& from, OutputBuffer& buffe r) 97 void internalNormalizeLineEndingsToCRLF(const CString& from, OutputBuffer& buffe r)
98 { 98 {
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 { 228 {
229 #if OS(WIN) 229 #if OS(WIN)
230 VectorCharAppendBuffer buffer(result); 230 VectorCharAppendBuffer buffer(result);
231 internalNormalizeLineEndingsToCRLF(from, buffer); 231 internalNormalizeLineEndingsToCRLF(from, buffer);
232 #else 232 #else
233 normalizeLineEndingsToLF(from, result); 233 normalizeLineEndingsToLF(from, result);
234 #endif 234 #endif
235 } 235 }
236 236
237 } // namespace blink 237 } // namespace blink
OLDNEW
« no previous file with comments | « Source/platform/text/DateTimeFormatTest.cpp ('k') | Source/platform/text/LocaleICU.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698