skia/config/SkUserConfig.h - Issue 10806077: Upstream the rest of skia diff

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: skia/config/SkUserConfig.h

Issue 10806077: Upstream the rest of skia diff (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Init Created 8 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: skia/config/SkUserConfig.h

diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h

index fb80b3c97e54acf6028ea51a96e91ff7123af1fb..d9e6b1ffec116f0ce1db7b7f7d0cd09095720585 100644

--- a/skia/config/SkUserConfig.h

+++ b/skia/config/SkUserConfig.h

@@ -186,11 +186,13 @@ SK_API void SkDebugf_FileLine(const char* file, int line, bool fatal,

"%s:%d: failed assertion \"%s\"\n", \

__FILE__, __LINE__, #cond); } } while (false)

+#if !defined(ANDROID) // On Android, we use the skia default settings

Nico 2012/07/24 01:20:27 Nit: trailing .

michaelbai 2012/07/24 01:37:47 Done.

// All little-endian Chrome platforms agree: BGRA is the optimal pixel layout.

Nico 2012/07/24 01:20:27 remove this comment

michaelbai 2012/07/24 01:37:47 Done.

#define SK_A32_SHIFT 24

#define SK_R32_SHIFT 16

#define SK_G32_SHIFT 8

#define SK_B32_SHIFT 0

+#endif

#if defined(SK_BUILD_FOR_WIN32)

« no previous file with comments | « no previous file | skia/ext/image_operations.cc » ('j') | skia/ext/platform_device.h » ('J')