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

Side by Side Diff: src/views/animated/SkWidgetViews.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 | « src/views/SkView.cpp ('k') | tests/GrMemoryPoolTest.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 /* 2 /*
3 * Copyright 2011 Google Inc. 3 * Copyright 2011 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 #include "SkWidgetViews.h" 8 #include "SkWidgetViews.h"
9 #include "SkAnimator.h" 9 #include "SkAnimator.h"
10 #include "SkCanvas.h" 10 #include "SkCanvas.h"
11 #include "SkPaint.h" 11 #include "SkPaint.h"
12 #include "SkStream.h" 12 #include "SkStream.h"
13 #include "SkSystemEventTypes.h" 13 #include "SkSystemEventTypes.h"
14 14
15 /* 15 /*
16 I have moved this to SkWidgetViews.h 16 I have moved this to SkWidgetViews.h
17 enum SkinEnum { 17 enum SkinEnum {
18 kButton_SkinEnum, 18 kButton_SkinEnum,
19 kProgress_SkinEnum, 19 kProgress_SkinEnum,
20 kScroll_SkinEnum, 20 kScroll_SkinEnum,
21 kStaticText_SkinEnum, 21 kStaticText_SkinEnum,
22 22
23 kSkinEnumCount 23 kSkinEnumCount
24 }; 24 };
25 */ 25 */
26 26
27 SK_DEFINE_INST_COUNT(SkListSource)
28
29 const char* get_skin_enum_path(SkinEnum se) 27 const char* get_skin_enum_path(SkinEnum se)
30 { 28 {
31 SkASSERT((unsigned)se < kSkinEnumCount); 29 SkASSERT((unsigned)se < kSkinEnumCount);
32 30
33 static const char* gSkinPaths[] = { 31 static const char* gSkinPaths[] = {
34 "common/default/default/skins/border3.xml", 32 "common/default/default/skins/border3.xml",
35 "common/default/default/skins/button.xml", 33 "common/default/default/skins/button.xml",
36 "common/default/default/skins/progressBar.xml", 34 "common/default/default/skins/progressBar.xml",
37 "common/default/default/skins/scrollBar.xml", 35 "common/default/default/skins/scrollBar.xml",
38 "common/default/default/skins/statictextpaint.xml" 36 "common/default/default/skins/statictextpaint.xml"
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 case kScroll_WidgetEnum: 389 case kScroll_WidgetEnum:
392 return new SkScrollBarView; 390 return new SkScrollBarView;
393 case kText_WidgetEnum: 391 case kText_WidgetEnum:
394 return new SkStaticTextView; 392 return new SkStaticTextView;
395 default: 393 default:
396 SkDEBUGFAIL("unknown enum passed to SkWidgetFactory"); 394 SkDEBUGFAIL("unknown enum passed to SkWidgetFactory");
397 break; 395 break;
398 } 396 }
399 return NULL; 397 return NULL;
400 } 398 }
OLDNEW
« no previous file with comments | « src/views/SkView.cpp ('k') | tests/GrMemoryPoolTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698