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

Side by Side Diff: samplecode/SampleApp.cpp

Issue 98703002: Fix compilation with SK_ENABLE_INST_COUNT=1 (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years 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 | Annotate | Revision Log
« no previous file with comments | « include/ports/SkFontConfigInterface.h ('k') | src/core/SkAdvancedTypefaceMetrics.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 2011 Google Inc. 2 * Copyright 2011 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 #include "SampleApp.h" 7 #include "SampleApp.h"
8 8
9 #include "SkData.h" 9 #include "SkData.h"
10 #include "SkCanvas.h" 10 #include "SkCanvas.h"
(...skipping 24 matching lines...) Expand all
35 #include "SkOSFile.h" 35 #include "SkOSFile.h"
36 #include "SkPDFDevice.h" 36 #include "SkPDFDevice.h"
37 #include "SkPDFDocument.h" 37 #include "SkPDFDocument.h"
38 #include "SkStream.h" 38 #include "SkStream.h"
39 39
40 #include "SkGPipe.h" 40 #include "SkGPipe.h"
41 #include "SamplePipeControllers.h" 41 #include "SamplePipeControllers.h"
42 #include "OverView.h" 42 #include "OverView.h"
43 #include "TransitionView.h" 43 #include "TransitionView.h"
44 44
45 SK_DEFINE_INST_COUNT(SampleWindow::DeviceManager)
46
47 extern SampleView* CreateSamplePictFileView(const char filename[]); 45 extern SampleView* CreateSamplePictFileView(const char filename[]);
48 46
49 class PictFileFactory : public SkViewFactory { 47 class PictFileFactory : public SkViewFactory {
50 SkString fFilename; 48 SkString fFilename;
51 public: 49 public:
52 PictFileFactory(const SkString& filename) : fFilename(filename) {} 50 PictFileFactory(const SkString& filename) : fFilename(filename) {}
53 virtual SkView* operator() () const SK_OVERRIDE { 51 virtual SkView* operator() () const SK_OVERRIDE {
54 return CreateSamplePictFileView(fFilename.c_str()); 52 return CreateSamplePictFileView(fFilename.c_str());
55 } 53 }
56 }; 54 };
(...skipping 2491 matching lines...) Expand 10 before | Expand all | Expand 10 after
2548 SkGraphics::Init(); 2546 SkGraphics::Init();
2549 SkEvent::Init(); 2547 SkEvent::Init();
2550 } 2548 }
2551 2549
2552 // FIXME: this should be in a header 2550 // FIXME: this should be in a header
2553 void application_term(); 2551 void application_term();
2554 void application_term() { 2552 void application_term() {
2555 SkEvent::Term(); 2553 SkEvent::Term();
2556 SkGraphics::Term(); 2554 SkGraphics::Term();
2557 } 2555 }
OLDNEW
« no previous file with comments | « include/ports/SkFontConfigInterface.h ('k') | src/core/SkAdvancedTypefaceMetrics.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698