AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove android legacy flags

Browse Source 
relies on https://googleplex-android-review.git.corp.google.com/#/c/2060523/ landing first

Bug: skia:
Change-Id: I603c8e0835235e9d81bd0a5a559cb5ab5b5cfd56
Reviewed-on: https://skia-review.googlesource.com/11350
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
This commit is contained in:
Mike Reed 2017-04-05 10:30:54 -04:00 committed by Skia Commit-Bot
parent 3251ed8405
commit 45a00cee88
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gn/android_framework_defines.gni
View File

@ -12,9 +12,6 @@ android_framework_defines = [
"SK_SUPPORT_LEGACY_GRADIENT_DITHERING", "SK_SUPPORT_LEGACY_GRADIENT_DITHERING",
"SK_SUPPORT_LEGACY_DRAWFILTER", "SK_SUPPORT_LEGACY_DRAWFILTER",
"SK_IGNORE_GPU_DITHER", "SK_IGNORE_GPU_DITHER",
"SK_SUPPORT_LEGACY_BITMAP_SETPIXELREF",
"SK_SUPPORT_LEGACY_SHADER_ISABITMAP", "SK_SUPPORT_LEGACY_SHADER_ISABITMAP",
"SK_SUPPORT_LEGACY_EMBOSSMASKFILTER", "SK_SUPPORT_LEGACY_EMBOSSMASKFILTER",
"SK_SUPPORT_LEGACY_CANVAS_VERTICES",
"SK_SUPPORT_LEGACY_PIXELREFFACTORY",
] ]

5
include/core/SkBitmap.h
View File

@ -255,11 +255,6 @@ public:
} }
} }
// TEMPORARY -- remove after updating Android BitmapTests.cpp:35
void allocPixels(const SkImageInfo& info, std::nullptr_t, SkColorTable* ctable) {
this->allocPixels(info, sk_ref_sp(ctable));
}
/** /**
* Allocate the bitmap's pixels to match the requested image info and * Allocate the bitmap's pixels to match the requested image info and
* rowBytes. If the request cannot be met (e.g. the info is invalid or * rowBytes. If the request cannot be met (e.g. the info is invalid or