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

Unified Diff: src/core/SkStream.cpp

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkSpriteBlitter_RGB16.cpp ('k') | src/core/SkTypeface.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkStream.cpp
diff --git a/src/core/SkStream.cpp b/src/core/SkStream.cpp
index 65e1bee1a08f1f97dfccabcc1e8b0ce129b2b01c..426f5569e887fe83e4aee8b38c412587abfa1fe2 100644
--- a/src/core/SkStream.cpp
+++ b/src/core/SkStream.cpp
@@ -680,7 +680,7 @@ public:
: fBlockMemory(SkRef(headRef)), fCurrent(fBlockMemory->fHead)
, fSize(size) , fOffset(0), fCurrentOffset(0) { }
- size_t read(void* buffer, size_t rawCount) SK_OVERRIDE {
+ size_t read(void* buffer, size_t rawCount) override {
size_t count = rawCount;
if (fOffset + count > fSize) {
count = fSize - fOffset;
@@ -706,26 +706,26 @@ public:
return 0;
}
- bool isAtEnd() const SK_OVERRIDE {
+ bool isAtEnd() const override {
return fOffset == fSize;
}
- bool rewind() SK_OVERRIDE {
+ bool rewind() override {
fCurrent = fBlockMemory->fHead;
fOffset = 0;
fCurrentOffset = 0;
return true;
}
- SkBlockMemoryStream* duplicate() const SK_OVERRIDE {
+ SkBlockMemoryStream* duplicate() const override {
return SkNEW_ARGS(SkBlockMemoryStream, (fBlockMemory.get(), fSize));
}
- size_t getPosition() const SK_OVERRIDE {
+ size_t getPosition() const override {
return fOffset;
}
- bool seek(size_t position) SK_OVERRIDE {
+ bool seek(size_t position) override {
// If possible, skip forward.
if (position >= fOffset) {
size_t skipAmount = position - fOffset;
@@ -742,11 +742,11 @@ public:
return this->rewind() && this->skip(position) == position;
}
- bool move(long offset) SK_OVERRIDE {
+ bool move(long offset) override {
return seek(fOffset + offset);
}
- SkBlockMemoryStream* fork() const SK_OVERRIDE {
+ SkBlockMemoryStream* fork() const override {
SkAutoTDelete<SkBlockMemoryStream> that(this->duplicate());
that->fCurrent = this->fCurrent;
that->fOffset = this->fOffset;
@@ -754,11 +754,11 @@ public:
return that.detach();
}
- size_t getLength() const SK_OVERRIDE {
+ size_t getLength() const override {
return fSize;
}
- const void* getMemoryBase() SK_OVERRIDE {
+ const void* getMemoryBase() override {
if (NULL == fBlockMemory->fHead->fNext) {
return fBlockMemory->fHead->start();
}
« no previous file with comments | « src/core/SkSpriteBlitter_RGB16.cpp ('k') | src/core/SkTypeface.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698