commit 45d86e7072cda3b3108a84a033fba98072b12f85
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Apr 16 20:48:10 2014 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Apr 16 20:48:10 2014 +0000
tree 04bfa9acbbcfa6cdeb7973a9678ce98591d38334
parent fa443be95b7e08cd98cf9897b028c9e0a4ddde3b

always store bitfields along with dirty in FlatteningTraits

This allows us to simplify lots of setters in SkPaint, which in the non-android case, could now be just assignments (and therefore inlineable).

R=mtklein@google.com, robertphillips@google.com, tomhudson@google.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/240273004

git-svn-id: http://skia.googlecode.com/svn/trunk@14229 2bbb7eff-a529-9590-31e7-b0007b416f81

tests/PaintTest.cpp

diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp
index f6aede1..aba6d69 100644
--- a/tests/PaintTest.cpp
+++ b/tests/PaintTest.cpp
@@ -325,12 +325,12 @@
 
     SkWriteBuffer writer;
     SkPaint::FlatteningTraits::Flatten(writer, paint);
-    const size_t expectedBytesWritten = sizeof(void*) == 8 ? 40 : 32;
+    const size_t expectedBytesWritten = sizeof(void*) == 8 ? 44 : 36;
     ASSERT(expectedBytesWritten == writer.bytesWritten());
 
     const uint32_t* written = writer.getWriter32()->contiguousArray();
     SkASSERT(written != NULL);
-    ASSERT(*written == ((1<<0) | (1<<2) | (1<<3) | (1<<9)));  // Dirty bits for our 4.
+    ASSERT(*written == ((1<<0) | (1<<1) | (1<<2) | (1<<8)));  // Dirty bits for our 4.
 
     SkReadBuffer reader(written, writer.bytesWritten());
     SkPaint other;