summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsenorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-01 22:21:07 +0000
committersenorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-01 22:21:07 +0000
commit8453db9e1637694473174cb22beebd766bd448bf (patch)
tree475ebcadd26b32972fc10909629ab236c33f971e
parenta59da9da39e721731e558e39b6fca64330431c8c (diff)
downloadchromium_src-8453db9e1637694473174cb22beebd766bd448bf.zip
chromium_src-8453db9e1637694473174cb22beebd766bd448bf.tar.gz
chromium_src-8453db9e1637694473174cb22beebd766bd448bf.tar.bz2
Roll DEPS for Skia 447:449.
BUG=none TEST=none Review URL: http://codereview.chromium.org/457026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33488 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS4
-rw-r--r--skia/skia.gyp2
2 files changed, 3 insertions, 3 deletions
diff --git a/DEPS b/DEPS
index e501459..26ffeb3 100644
--- a/DEPS
+++ b/DEPS
@@ -44,10 +44,10 @@ deps = {
"http://nativeclient.googlecode.com/svn/trunk/src/native_client@1052",
"src/third_party/skia/src":
- "http://skia.googlecode.com/svn/trunk/src@447",
+ "http://skia.googlecode.com/svn/trunk/src@449",
"src/third_party/skia/include":
- "http://skia.googlecode.com/svn/trunk/include@447",
+ "http://skia.googlecode.com/svn/trunk/include@449",
"src/third_party/WebKit/LayoutTests":
Var("webkit_trunk") + "/LayoutTests@" + Var("webkit_revision"),
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 7927aba..97dcd35 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -700,7 +700,7 @@
}],
[ 'target_arch != "arm"', {
'sources': [
- '../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp',
+ '../third_party/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp',
'../third_party/skia/src/opts/SkBlitRow_opts_SSE2.cpp',
'../third_party/skia/src/opts/SkUtils_opts_SSE2.cpp',
],