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

Side by Side Diff: src/views/SkWindow.cpp

Issue 234833003: Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 8 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 | « src/utils/mac/SkCreateCGImageRef.cpp ('k') | src/views/mac/SkNSView.mm » ('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 "SkWindow.h" 8 #include "SkWindow.h"
9 #include "SkCanvas.h" 9 #include "SkCanvas.h"
10 #include "SkDevice.h" 10 #include "SkDevice.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 SkCanvas fCanvas; 46 SkCanvas fCanvas;
47 }; 47 };
48 48
49 SkWindow::SkWindow() : fFocusView(NULL) { 49 SkWindow::SkWindow() : fFocusView(NULL) {
50 fClicks.reset(); 50 fClicks.reset();
51 fWaitingOnInval = false; 51 fWaitingOnInval = false;
52 52
53 #ifdef SK_BUILD_FOR_WINCE 53 #ifdef SK_BUILD_FOR_WINCE
54 fColorType = kRGB_565_SkColorType; 54 fColorType = kRGB_565_SkColorType;
55 #else 55 #else
56 fColorType = kN32_SkColorType; 56 fColorType = kPMColor_SkColorType;
57 #endif 57 #endif
58 58
59 fMatrix.reset(); 59 fMatrix.reset();
60 } 60 }
61 61
62 SkWindow::~SkWindow() { 62 SkWindow::~SkWindow() {
63 fClicks.deleteAll(); 63 fClicks.deleteAll();
64 fMenus.deleteAll(); 64 fMenus.deleteAll();
65 } 65 }
66 66
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 fClicks.remove(index); 368 fClicks.remove(index);
369 handled = true; 369 handled = true;
370 } 370 }
371 break; 371 break;
372 default: 372 default:
373 // Do nothing 373 // Do nothing
374 break; 374 break;
375 } 375 }
376 return handled; 376 return handled;
377 } 377 }
OLDNEW
« no previous file with comments | « src/utils/mac/SkCreateCGImageRef.cpp ('k') | src/views/mac/SkNSView.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698