| OLD | NEW |
|---|
| 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 "SkDebugger.h" | 9 #include "SkDebugger.h" |
| 10 #include "SkString.h" | 10 #include "SkString.h" |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 | 131 |
| 132 #include "SkImageDecoder.h" | 132 #include "SkImageDecoder.h" |
| 133 | 133 |
| 134 void forceLinking(); | 134 void forceLinking(); |
| 135 void forceLinking() { | 135 void forceLinking() { |
| 136 // This function leaks, but that is okay because it is not intended | 136 // This function leaks, but that is okay because it is not intended |
| 137 // to be called. It is only here so that the linker will include the | 137 // to be called. It is only here so that the linker will include the |
| 138 // decoders. | 138 // decoders. |
| 139 SkDEBUGCODE(SkImageDecoder *creator = ) CreateJPEGImageDecoder(); | 139 SkDEBUGCODE(SkImageDecoder *creator = ) CreateJPEGImageDecoder(); |
| 140 SkASSERT(creator); | 140 SkASSERT(creator); |
| 141 #ifdef SK_BUILD_FOR_UNIX | 141 #if defined(SK_BUILD_FOR_UNIX) && !defined(SK_BUILD_FOR_NACL) |
| 142 SkDEBUGCODE(creator = ) CreateGIFImageDecoder(); | 142 SkDEBUGCODE(creator = ) CreateGIFImageDecoder(); |
| 143 SkASSERT(creator); | 143 SkASSERT(creator); |
| 144 #endif | 144 #endif |
| 145 } | 145 } |
| OLD | NEW |
|---|
Chromium Code Reviews
