summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-17 22:18:07 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-17 22:18:07 +0000
commit6008c18597d8005b02912c76ad55cd596f101408 (patch)
tree240d21b106f2116a0f366562962a638e0ad779d2
parentb24d9460276c978ae9e2394f4532398ba5da5edc (diff)
downloadchromium_src-6008c18597d8005b02912c76ad55cd596f101408.zip
chromium_src-6008c18597d8005b02912c76ad55cd596f101408.tar.gz
chromium_src-6008c18597d8005b02912c76ad55cd596f101408.tar.bz2
Roll skia r690:r699.
r692 fixes a valgrind error. r691 brings in optional gradient dithering code for 32bit pixels. Disable this in chrome for now. BUG=41756,69531,69452 TEST=none TBR=reed git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71607 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--skia/config/SkUserConfig.h7
2 files changed, 8 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index f61794f..ba73abd 100644
--- a/DEPS
+++ b/DEPS
@@ -11,7 +11,7 @@ vars = {
"libjingle_revision": "50",
"libvpx_revision": "65287",
"ffmpeg_revision": "70984",
- "skia_revision": "690",
+ "skia_revision": "699",
}
deps = {
diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h
index 9e5c364b..ae8015d 100644
--- a/skia/config/SkUserConfig.h
+++ b/skia/config/SkUserConfig.h
@@ -129,6 +129,13 @@
#define SK_SUPPORT_UNITTEST
#endif
+/* If this is not defined, skia dithers gradients. Turning this on will make
+ gradients look better, but might have a performance impact. When it's turned
+ on, several webkit pixel tests will need to be rebaselined, too.
+ http://crbug.com/41756
+ */
+#define SK_DISABLE_DITHER_32BIT_GRADIENT
+
// ===== Begin Chrome-specific definitions =====
#define SK_SCALAR_IS_FLOAT