From 8b21765ceba175d26921f95e5c9ee7ec6f744366 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Fri, 4 Dec 2009 21:42:45 +0000 Subject: Roll DEPS for Skia 450:451. Enable USE_NEW_BUILDER in Skia. Mark as failing the ~85 layout tests that now need rebaselining (due to slight pixel coverage change). Refactor SkUserConfig.h a tad. Rebaseline unit test VectorCanvasTest.ClippingIntersect. BUG=24646 TEST=none Review URL: http://codereview.chromium.org/464044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33863 0039d316-1c4b-4281-b951-d872f2087c98 --- skia/config/SkUserConfig.h | 31 +++++++-------------- .../clippingintersect/00_pc_intersect.png | Bin 1218 -> 1211 bytes .../clippingintersect/00_vc_intersect.png | Bin 1218 -> 1211 bytes skia/skia.gyp | 2 ++ 4 files changed, 12 insertions(+), 21 deletions(-) (limited to 'skia') diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h index a2f9e10..8696a6a 100644 --- a/skia/config/SkUserConfig.h +++ b/skia/config/SkUserConfig.h @@ -138,6 +138,12 @@ void SkDebugf_FileLine(const char* file, int line, bool fatal, "%s:%d: failed assertion \"%s\"\n", \ __FILE__, __LINE__, #cond); } } while (false) +// All little-endian Chrome platforms agree: BGRA is the optimal pixel layout. +#define SK_A32_SHIFT 24 +#define SK_R32_SHIFT 16 +#define SK_G32_SHIFT 8 +#define SK_B32_SHIFT 0 + #if defined(SK_BUILD_FOR_WIN32) #define SK_BUILD_FOR_WIN @@ -150,10 +156,6 @@ typedef short int16_t; typedef unsigned short uint16_t; typedef int int32_t; typedef unsigned uint32_t; -#define SK_A32_SHIFT 24 -#define SK_R32_SHIFT 16 -#define SK_G32_SHIFT 8 -#define SK_B32_SHIFT 0 // VC doesn't support __restrict__, so make it a NOP. #undef SK_RESTRICT @@ -166,20 +168,11 @@ typedef unsigned uint32_t; #define SK_CPU_LENDIAN #undef SK_CPU_BENDIAN -// we want (memory order) BGRA, because that's what core image uses with -// kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host, which is what -// Apple recommends for best performance (ARGB becomes BGRA in memory on -// little-endian) -- and we want skia and coregraphic to have matching memory -// layouts, so that we don't have to spend time converting between them. -#define SK_A32_SHIFT 24 -#define SK_R32_SHIFT 16 -#define SK_G32_SHIFT 8 -#define SK_B32_SHIFT 0 #elif defined(SK_BUILD_FOR_UNIX) #ifdef SK_CPU_BENDIAN -// Below we set the order for ARGB channels in registers. I suspect that, on +// Above we set the order for ARGB channels in registers. I suspect that, on // big endian machines, you can keep this the same and everything will work. // The in-memory order will be different, of course, but as long as everything // is reading memory as words rather than bytes, it will all work. However, if @@ -189,13 +182,6 @@ typedef unsigned uint32_t; #error Read the comment at this location #endif -// For Linux we want to match the most common X visual, which is -// ARGB (in registers) -#define SK_A32_SHIFT 24 -#define SK_R32_SHIFT 16 -#define SK_G32_SHIFT 8 -#define SK_B32_SHIFT 0 - #endif // The default crash macro writes to badbeef which can cause some strange @@ -203,6 +189,9 @@ typedef unsigned uint32_t; // assertion. #define SK_CRASH() SkDebugf_FileLine(__FILE__, __LINE__, true, "SK_CRASH") +// Enable the use of the SkEdgeBuilder class. +#define USE_NEW_BUILDER 1 + // ===== End Chrome-specific definitions ===== #endif diff --git a/skia/ext/data/vectorcanvastest/clippingintersect/00_pc_intersect.png b/skia/ext/data/vectorcanvastest/clippingintersect/00_pc_intersect.png index 89df4fb..1285dac 100644 Binary files a/skia/ext/data/vectorcanvastest/clippingintersect/00_pc_intersect.png and b/skia/ext/data/vectorcanvastest/clippingintersect/00_pc_intersect.png differ diff --git a/skia/ext/data/vectorcanvastest/clippingintersect/00_vc_intersect.png b/skia/ext/data/vectorcanvastest/clippingintersect/00_vc_intersect.png index 89df4fb..1285dac 100644 Binary files a/skia/ext/data/vectorcanvastest/clippingintersect/00_vc_intersect.png and b/skia/ext/data/vectorcanvastest/clippingintersect/00_vc_intersect.png differ diff --git a/skia/skia.gyp b/skia/skia.gyp index ab8d35e..69638cc 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -221,6 +221,8 @@ '../third_party/skia/src/core/SkDraw.cpp', '../third_party/skia/src/core/SkDrawProcs.h', #'../third_party/skia/src/core/SkDrawing.cpp', + '../third_party/skia/src/core/SkEdgeBuilder.cpp', + '../third_party/skia/src/core/SkEdgeClipper.cpp', '../third_party/skia/src/core/SkEdge.cpp', '../third_party/skia/src/core/SkEdge.h', '../third_party/skia/src/core/SkFP.h', -- cgit v1.1