| OLD | NEW | 
|    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  |    8  | 
|    9 #include "SkDevice.h" |    9 #include "SkDevice.h" | 
|   10 #include "SkMetaData.h" |   10 #include "SkMetaData.h" | 
|   11  |   11  | 
|   12 SK_DEFINE_INST_COUNT(SkBaseDevice) |  | 
|   13  |  | 
|   14 #if SK_PMCOLOR_BYTE_ORDER(B,G,R,A) |   12 #if SK_PMCOLOR_BYTE_ORDER(B,G,R,A) | 
|   15     const SkCanvas::Config8888 SkBaseDevice::kPMColorAlias = SkCanvas::kBGRA_Pre
     mul_Config8888; |   13     const SkCanvas::Config8888 SkBaseDevice::kPMColorAlias = SkCanvas::kBGRA_Pre
     mul_Config8888; | 
|   16 #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A) |   14 #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A) | 
|   17     const SkCanvas::Config8888 SkBaseDevice::kPMColorAlias = SkCanvas::kRGBA_Pre
     mul_Config8888; |   15     const SkCanvas::Config8888 SkBaseDevice::kPMColorAlias = SkCanvas::kRGBA_Pre
     mul_Config8888; | 
|   18 #else |   16 #else | 
|   19     const SkCanvas::Config8888 SkBaseDevice::kPMColorAlias = (SkCanvas::Config88
     88) -1; |   17     const SkCanvas::Config8888 SkBaseDevice::kPMColorAlias = (SkCanvas::Config88
     88) -1; | 
|   20 #endif |   18 #endif | 
|   21  |   19  | 
|   22 /////////////////////////////////////////////////////////////////////////////// |   20 /////////////////////////////////////////////////////////////////////////////// | 
|   23 SkBaseDevice::SkBaseDevice() |   21 SkBaseDevice::SkBaseDevice() | 
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  111  |  109  | 
|  112     bool result = this->onReadPixels(bmpSubset, |  110     bool result = this->onReadPixels(bmpSubset, | 
|  113                                      srcRect.fLeft, |  111                                      srcRect.fLeft, | 
|  114                                      srcRect.fTop, |  112                                      srcRect.fTop, | 
|  115                                      config8888); |  113                                      config8888); | 
|  116     if (result && bmp == &tmp) { |  114     if (result && bmp == &tmp) { | 
|  117         tmp.swap(*bitmap); |  115         tmp.swap(*bitmap); | 
|  118     } |  116     } | 
|  119     return result; |  117     return result; | 
|  120 } |  118 } | 
| OLD | NEW |