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

Side by Side Diff: gm/factory.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 unified diff | Download patch
« no previous file with comments | « gm/extractbitmap.cpp ('k') | gm/filltypes.cpp » ('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 2012 Google Inc. 2 * Copyright 2012 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "gm.h" 8 #include "gm.h"
9 9
10 #include "Resources.h" 10 #include "Resources.h"
11 #include "SkCanvas.h" 11 #include "SkCanvas.h"
12 #include "SkData.h" 12 #include "SkData.h"
13 #include "SkDiscardableMemoryPool.h" 13 #include "SkDiscardableMemoryPool.h"
14 #include "SkDiscardablePixelRef.h" 14 #include "SkDiscardablePixelRef.h"
15 #include "SkImageDecoder.h" 15 #include "SkImageDecoder.h"
16 #include "SkImageGeneratorPriv.h" 16 #include "SkImageGeneratorPriv.h"
17 #include "SkOSFile.h" 17 #include "SkOSFile.h"
18 #include "SkStream.h" 18 #include "SkStream.h"
19 19
20 namespace skiagm { 20 namespace skiagm {
21 21
22 /** 22 /**
23 * Draw a PNG created by SkBitmapFactory. 23 * Draw a PNG created by SkBitmapFactory.
24 */ 24 */
25 class FactoryGM : public GM { 25 class FactoryGM : public GM {
26 public: 26 public:
27 FactoryGM() {} 27 FactoryGM() {}
28 28
29 protected: 29 protected:
30 void onOnceBeforeDraw() SK_OVERRIDE { 30 void onOnceBeforeDraw() override {
31 // Copyright-free file from http://openclipart.org/detail/29213/paper-pl ane-by-ddoo 31 // Copyright-free file from http://openclipart.org/detail/29213/paper-pl ane-by-ddoo
32 SkString pngFilename = GetResourcePath("plane.png"); 32 SkString pngFilename = GetResourcePath("plane.png");
33 SkAutoDataUnref data(SkData::NewFromFileName(pngFilename.c_str())); 33 SkAutoDataUnref data(SkData::NewFromFileName(pngFilename.c_str()));
34 if (data.get()) { 34 if (data.get()) {
35 // Create a cache which will boot the pixels out anytime the 35 // Create a cache which will boot the pixels out anytime the
36 // bitmap is unlocked. 36 // bitmap is unlocked.
37 SkAutoTUnref<SkDiscardableMemoryPool> pool( 37 SkAutoTUnref<SkDiscardableMemoryPool> pool(
38 SkDiscardableMemoryPool::Create(1)); 38 SkDiscardableMemoryPool::Create(1));
39 SkAssertResult(SkInstallDiscardablePixelRef(SkImageGenerator::NewFro mData(data), 39 SkAssertResult(SkInstallDiscardablePixelRef(SkImageGenerator::NewFro mData(data),
40 &fBitmap, pool)); 40 &fBitmap, pool));
41 } 41 }
42 } 42 }
43 43
44 virtual SkString onShortName() SK_OVERRIDE { 44 virtual SkString onShortName() override {
45 return SkString("factory"); 45 return SkString("factory");
46 } 46 }
47 47
48 virtual SkISize onISize() SK_OVERRIDE { 48 virtual SkISize onISize() override {
49 return SkISize::Make(640, 480); 49 return SkISize::Make(640, 480);
50 } 50 }
51 51
52 virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { 52 virtual void onDraw(SkCanvas* canvas) override {
53 canvas->drawBitmap(fBitmap, 0, 0); 53 canvas->drawBitmap(fBitmap, 0, 0);
54 } 54 }
55 55
56 private: 56 private:
57 SkBitmap fBitmap; 57 SkBitmap fBitmap;
58 58
59 typedef GM INHERITED; 59 typedef GM INHERITED;
60 }; 60 };
61 61
62 ////////////////////////////////////////////////////////////////////////////// 62 //////////////////////////////////////////////////////////////////////////////
63 63
64 static GM* MyFactory(void*) { return new FactoryGM; } 64 static GM* MyFactory(void*) { return new FactoryGM; }
65 static GMRegistry reg(MyFactory); 65 static GMRegistry reg(MyFactory);
66 66
67 } // namespace skiagm 67 } // namespace skiagm
OLDNEW
« no previous file with comments | « gm/extractbitmap.cpp ('k') | gm/filltypes.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698