diff options
| author | bensong@google.com <bensong@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-11 16:55:41 +0000 |
|---|---|---|
| committer | bensong@google.com <bensong@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-11 16:55:41 +0000 |
| commit | 7ac206ca48124ffe0e9cd0ea2b1836e569f80063 (patch) | |
| tree | 5bd26fb08b2346a566a1933779d9c3187582f7df /skia | |
| parent | a04c722d10ee36cbab119c8a8435856a84559e76 (diff) | |
| download | chromium_src-7ac206ca48124ffe0e9cd0ea2b1836e569f80063.zip chromium_src-7ac206ca48124ffe0e9cd0ea2b1836e569f80063.tar.gz chromium_src-7ac206ca48124ffe0e9cd0ea2b1836e569f80063.tar.bz2 | |
roll skia DEPS to 14149
Chromium base revision: 263235
Old Skia revision: 14102
New Skia revision: 14149
Control CL: https://codereview.chromium.org/234743005/
Bypassing commit queue trybots:
NOTRY=true
Review URL: https://codereview.chromium.org/235243002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263263 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/BUILD.gn | 2 | ||||
| -rw-r--r-- | skia/skia_library_opts.gyp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/skia/BUILD.gn b/skia/BUILD.gn index 7dc5f22..7e1d5a7 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -341,7 +341,7 @@ source_set("skia_opts") { "//third_party/skia/src/opts/SkBlurImage_opts_SSE2.cpp", "//third_party/skia/src/opts/SkMorphology_opts_SSE2.cpp", "//third_party/skia/src/opts/SkUtils_opts_SSE2.cpp", - "//third_party/skia/src/opts/SkXfermode_opts_none.cpp", + "//third_party/skia/src/opts/SkXfermode_opts_SSE2.cpp", # SSE 3 "//third_party/skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp", diff --git a/skia/skia_library_opts.gyp b/skia/skia_library_opts.gyp index f719075..b4dd835 100644 --- a/skia/skia_library_opts.gyp +++ b/skia/skia_library_opts.gyp @@ -51,7 +51,7 @@ '../third_party/skia/src/opts/SkBlitRect_opts_SSE2.cpp', '../third_party/skia/src/opts/SkBlitRow_opts_SSE2.cpp', '../third_party/skia/src/opts/SkUtils_opts_SSE2.cpp', - '../third_party/skia/src/opts/SkXfermode_opts_none.cpp', + '../third_party/skia/src/opts/SkXfermode_opts_SSE2.cpp', '../third_party/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp', '../third_party/skia/src/opts/SkMorphology_opts_SSE2.cpp', '../third_party/skia/src/opts/SkBlurImage_opts_SSE2.cpp', |