| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006 The Android Open Source Project | 2 * Copyright (C) 2006 The Android Open Source Project |
| 3 * | 3 * |
| 4 * Licensed under the Apache License, Version 2.0 (the "License"); | 4 * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 * you may not use this file except in compliance with the License. | 5 * you may not use this file except in compliance with the License. |
| 6 * You may obtain a copy of the License at | 6 * You may obtain a copy of the License at |
| 7 * | 7 * |
| 8 * http://www.apache.org/licenses/LICENSE-2.0 | 8 * http://www.apache.org/licenses/LICENSE-2.0 |
| 9 * | 9 * |
| 10 * Unless required by applicable law or agreed to in writing, software | 10 * Unless required by applicable law or agreed to in writing, software |
| (...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 238 | 238 |
| 239 // These flags are no longer defined in Skia, but we have them (temporarily) | 239 // These flags are no longer defined in Skia, but we have them (temporarily) |
| 240 // until we update our call-sites (typically these are for API changes). | 240 // until we update our call-sites (typically these are for API changes). |
| 241 // | 241 // |
| 242 // Remove these as we update our sites. | 242 // Remove these as we update our sites. |
| 243 // | 243 // |
| 244 #ifndef SK_SUPPORT_LEGACY_GETTOPDEVICE | 244 #ifndef SK_SUPPORT_LEGACY_GETTOPDEVICE |
| 245 # define SK_SUPPORT_LEGACY_GETTOPDEVICE | 245 # define SK_SUPPORT_LEGACY_GETTOPDEVICE |
| 246 #endif | 246 #endif |
| 247 | 247 |
| 248 #ifndef SK_LEGACY_DRAWPICTURECALLBACK |
| 249 # define SK_LEGACY_DRAWPICTURECALLBACK |
| 250 #endif |
| 251 |
| 248 #ifndef SK_SUPPORT_LEGACY_GETDEVICE | 252 #ifndef SK_SUPPORT_LEGACY_GETDEVICE |
| 249 # define SK_SUPPORT_LEGACY_GETDEVICE | 253 # define SK_SUPPORT_LEGACY_GETDEVICE |
| 250 #endif | 254 #endif |
| 251 | 255 |
| 252 #ifndef SK_SUPPORT_LEGACY_PUBLIC_IMAGEINFO_FIELDS | 256 #ifndef SK_SUPPORT_LEGACY_PUBLIC_IMAGEINFO_FIELDS |
| 253 # define SK_SUPPORT_LEGACY_PUBLIC_IMAGEINFO_FIELDS | 257 # define SK_SUPPORT_LEGACY_PUBLIC_IMAGEINFO_FIELDS |
| 254 #endif | 258 #endif |
| 255 | 259 |
| 256 #ifndef SK_IGNORE_ETC1_SUPPORT | 260 #ifndef SK_IGNORE_ETC1_SUPPORT |
| 257 # define SK_IGNORE_ETC1_SUPPORT | 261 # define SK_IGNORE_ETC1_SUPPORT |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 290 #define SK_USE_DISCARDABLE_SCALEDIMAGECACHE | 294 #define SK_USE_DISCARDABLE_SCALEDIMAGECACHE |
| 291 #define SK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT | 295 #define SK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT |
| 292 | 296 |
| 293 #define SK_ATTR_DEPRECATED SK_NOTHING_ARG1 | 297 #define SK_ATTR_DEPRECATED SK_NOTHING_ARG1 |
| 294 #define SK_ENABLE_INST_COUNT 0 | 298 #define SK_ENABLE_INST_COUNT 0 |
| 295 #define GR_GL_CUSTOM_SETUP_HEADER "GrGLConfig_chrome.h" | 299 #define GR_GL_CUSTOM_SETUP_HEADER "GrGLConfig_chrome.h" |
| 296 | 300 |
| 297 // ===== End Chrome-specific definitions ===== | 301 // ===== End Chrome-specific definitions ===== |
| 298 | 302 |
| 299 #endif | 303 #endif |
| OLD | NEW |