remove legacy filter-flags, and store FilterLevel directly

remove legacy filter-flags, and store FilterLevel directly

BUG=skia:

Committed: http://code.google.com/p/skia/source/detail?r=14217

[reed1, 2014-04-15 16:12:46]

Turns our the distance-field flag (experimental) aliases the high-quality-filter
flag (deprecated). This CL tries to unalias the two.

[mtklein, 2014-04-15 16:40:15]

https://codereview.chromium.org/239393002/diff/1/include/core/SkPaint.h
File include/core/SkPaint.h (left):

https://codereview.chromium.org/239393002/diff/1/include/core/SkPaint.h#oldco...
include/core/SkPaint.h:57: kFilterBitmap_Flag    = 0x02, // temporary flag
OOOOOH, how terrifying.  I get why these were missing in the enum now.

https://codereview.chromium.org/239393002/diff/1/src/core/SkPaint.cpp
File src/core/SkPaint.cpp (right):

https://codereview.chromium.org/239393002/diff/1/src/core/SkPaint.cpp#newcode...
src/core/SkPaint.cpp:2013: static void ASSEERT_FITS_IN(uint32_t value, int
bitCount) {
ASSEERT?

https://codereview.chromium.org/239393002/diff/1/src/core/SkPaint.cpp#newcode...
src/core/SkPaint.cpp:2017: SkASSERT(0 == (value & ~mask));
Is there any reason to prefer this to SkASSERT(value == (value & mask)) ?

https://codereview.chromium.org/239393002/diff/1/src/core/SkPaint.cpp#newcode...
src/core/SkPaint.cpp:2042: static unsigned unpack_paint_flags(SkPaint* paint,
uint32_t packed) {
// Returns FlatFlags
?

https://codereview.chromium.org/239393002/diff/1/src/core/SkPaint.cpp#newcode...
src/core/SkPaint.cpp:2124: // previously flags:16, textAlign:8, flatFlags:8
Delete this now?

https://codereview.chromium.org/239393002/diff/1/src/core/SkPaint.cpp#newcode...
src/core/SkPaint.cpp:2182: if (picVer > 0 && picVer <= 22) {
Don't we need a version bump too?

[robertphillips, 2014-04-15 17:46:15]

https://codereview.chromium.org/239393002/diff/40001/src/core/SkPaint.cpp
File src/core/SkPaint.cpp (right):

https://codereview.chromium.org/239393002/diff/40001/src/core/SkPaint.cpp#new...
src/core/SkPaint.cpp:2012: #ifdef SK_DEBUG
ASSEERT?

https://codereview.chromium.org/239393002/diff/40001/src/core/SkPaint.cpp#new...
src/core/SkPaint.cpp:2030: unsigned filter, unsigned flatFlags) {
All this math with raw numbers makes me nervous - can we use (or compute) some
constants?

https://codereview.chromium.org/239393002/diff/40001/src/core/SkPaint.cpp#new...
src/core/SkPaint.cpp:2070: 
flags?

[reed1, 2014-04-15 18:57:46]

https://codereview.chromium.org/239393002/diff/1/src/core/SkPaint.cpp
File src/core/SkPaint.cpp (right):

https://codereview.chromium.org/239393002/diff/1/src/core/SkPaint.cpp#newcode...
src/core/SkPaint.cpp:2013: static void ASSEERT_FITS_IN(uint32_t value, int
bitCount) {
On 2014/04/15 16:40:15, mtklein wrote:
> ASSEERT?

Done.

https://codereview.chromium.org/239393002/diff/1/src/core/SkPaint.cpp#newcode...
src/core/SkPaint.cpp:2017: SkASSERT(0 == (value & ~mask));
On 2014/04/15 16:40:15, mtklein wrote:
> Is there any reason to prefer this to SkASSERT(value == (value & mask)) ?

half dozen. I can change it.

https://codereview.chromium.org/239393002/diff/1/src/core/SkPaint.cpp#newcode...
src/core/SkPaint.cpp:2042: static unsigned unpack_paint_flags(SkPaint* paint,
uint32_t packed) {
On 2014/04/15 16:40:15, mtklein wrote:
> // Returns FlatFlags
> ?

Done.

https://codereview.chromium.org/239393002/diff/1/src/core/SkPaint.cpp#newcode...
src/core/SkPaint.cpp:2124: // previously flags:16, textAlign:8, flatFlags:8
On 2014/04/15 16:40:15, mtklein wrote:
> Delete this now?

Done.

https://codereview.chromium.org/239393002/diff/1/src/core/SkPaint.cpp#newcode...
src/core/SkPaint.cpp:2182: if (picVer > 0 && picVer <= 22) {
On 2014/04/15 16:40:15, mtklein wrote:
> Don't we need a version bump too?

Indeed

https://codereview.chromium.org/239393002/diff/40001/src/core/SkPaint.cpp
File src/core/SkPaint.cpp (right):

https://codereview.chromium.org/239393002/diff/40001/src/core/SkPaint.cpp#new...
src/core/SkPaint.cpp:2012: #ifdef SK_DEBUG
On 2014/04/15 17:46:15, robertphillips wrote:
> ASSEERT?

Done.

https://codereview.chromium.org/239393002/diff/40001/src/core/SkPaint.cpp#new...
src/core/SkPaint.cpp:2030: unsigned filter, unsigned flatFlags) {
On 2014/04/15 17:46:15, robertphillips wrote:
> All this math with raw numbers makes me nervous - can we use (or compute) some
> constants?

Working on it. Hard to do everything and not make it harder to read.

https://codereview.chromium.org/239393002/diff/40001/src/core/SkPaint.cpp#new...
src/core/SkPaint.cpp:2070: 
On 2014/04/15 17:46:15, robertphillips wrote:
> flags?

Done.

[reed1, 2014-04-15 19:47:06]

all tests pass now -- PTAL

[robertphillips, 2014-04-15 19:58:09]

https://codereview.chromium.org/239393002/diff/60001/src/core/SkPaint.cpp
File src/core/SkPaint.cpp (right):

https://codereview.chromium.org/239393002/diff/60001/src/core/SkPaint.cpp#new...
src/core/SkPaint.cpp:2063: 
// V22_COMPATIBILITY_CODE ?

[reed1, 2014-04-15 20:02:31]

https://codereview.chromium.org/239393002/diff/60001/src/core/SkPaint.cpp
File src/core/SkPaint.cpp (right):

https://codereview.chromium.org/239393002/diff/60001/src/core/SkPaint.cpp#new...
src/core/SkPaint.cpp:2063: 
On 2014/04/15 19:58:09, robertphillips wrote:
> // V22_COMPATIBILITY_CODE ?

Done.

[mtklein, 2014-04-15 20:11:17]

lgtm

one test nit

https://codereview.chromium.org/239393002/diff/80001/tests/PaintTest.cpp
File tests/PaintTest.cpp (right):

https://codereview.chromium.org/239393002/diff/80001/tests/PaintTest.cpp#newc...
tests/PaintTest.cpp:231: static void test_filter_flags(skiatest::Reporter*
reporter) {
DEF_TEST(Paint_FilterFlags, reporter) {
  ...
}
?

[reed1, 2014-04-15 20:31:17]

https://codereview.chromium.org/239393002/diff/80001/tests/PaintTest.cpp
File tests/PaintTest.cpp (right):

https://codereview.chromium.org/239393002/diff/80001/tests/PaintTest.cpp#newc...
tests/PaintTest.cpp:231: static void test_filter_flags(skiatest::Reporter*
reporter) {
On 2014/04/15 20:11:18, mtklein wrote:
> DEF_TEST(Paint_FilterFlags, reporter) {
>   ...
> }
> ?

Done.

[robertphillips, 2014-04-15 20:38:04]

lgtm

[reed1, 2014-04-16 12:40:56]

The CQ bit was checked by reed@google.com

[commit-bot: I haz the power, 2014-04-16 12:41:10]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/reed@google.com/239393002/100001

[commit-bot: I haz the power, 2014-04-16 12:58:06]

Change committed as 14217