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

Side by Side Diff: src/utils/debugger/SkObjectParser.cpp

Issue 51033004: add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warning (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 1 month 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/utils/debugger/SkDebugCanvas.h ('k') | src/views/SkWindow.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 2012 Google Inc. 3 * Copyright 2012 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 8
9 #include "SkObjectParser.h" 9 #include "SkObjectParser.h"
10 #include "SkData.h" 10 #include "SkData.h"
(...skipping 13 matching lines...) Expand all
24 mBitmap->appendS32(bitmap.width()); 24 mBitmap->appendS32(bitmap.width());
25 mBitmap->append(" H: "); 25 mBitmap->append(" H: ");
26 mBitmap->appendS32(bitmap.height()); 26 mBitmap->appendS32(bitmap.height());
27 27
28 const char* gConfigStrings[] = { 28 const char* gConfigStrings[] = {
29 "None", "A1", "A8", "Index8", "RGB565", "ARGB4444", "ARGB8888" 29 "None", "A1", "A8", "Index8", "RGB565", "ARGB4444", "ARGB8888"
30 }; 30 };
31 SkASSERT(SkBitmap::kConfigCount == 7); 31 SkASSERT(SkBitmap::kConfigCount == 7);
32 32
33 mBitmap->append(" Config: "); 33 mBitmap->append(" Config: ");
34 mBitmap->append(gConfigStrings[bitmap.getConfig()]); 34 mBitmap->append(gConfigStrings[bitmap.config()]);
35 35
36 if (bitmap.isOpaque()) { 36 if (bitmap.isOpaque()) {
37 mBitmap->append(" opaque"); 37 mBitmap->append(" opaque");
38 } else { 38 } else {
39 mBitmap->append(" not-opaque"); 39 mBitmap->append(" not-opaque");
40 } 40 }
41 41
42 if (bitmap.isImmutable()) { 42 if (bitmap.isImmutable()) {
43 mBitmap->append(" immutable"); 43 mBitmap->append(" immutable");
44 } else { 44 } else {
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 } 361 }
362 break; 362 break;
363 } 363 }
364 default: 364 default:
365 decodedText->append("Unknown text encoding."); 365 decodedText->append("Unknown text encoding.");
366 break; 366 break;
367 } 367 }
368 368
369 return decodedText; 369 return decodedText;
370 } 370 }
OLDNEW
« no previous file with comments | « src/utils/debugger/SkDebugCanvas.h ('k') | src/views/SkWindow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698