summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--skia/skia.gyp4
2 files changed, 4 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 41312c1..9706479 100644
--- a/DEPS
+++ b/DEPS
@@ -29,7 +29,7 @@ vars = {
"ffmpeg_hash": "077e57825aec6da2fb11d85484ac3132d164aa34",
"sfntly_revision": "134",
- "skia_revision": "9306",
+ "skia_revision": "9331",
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Skia
# and V8 without interference from each other.
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 4b79090..288b7081 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -110,7 +110,9 @@
#'../third_party/skia/src/ports/SkImageRef_ashmem.h',
#'../third_party/skia/src/ports/SkOSEvent_android.cpp',
#'../third_party/skia/src/ports/SkOSEvent_dummy.cpp',
+ '../third_party/skia/src/ports/SkOSFile_posix.cpp',
'../third_party/skia/src/ports/SkOSFile_stdio.cpp',
+ '../third_party/skia/src/ports/SkOSFile_win.cpp',
#'../third_party/skia/src/ports/SkThread_none.cpp',
'../third_party/skia/src/ports/SkThread_pthread.cpp',
'../third_party/skia/src/ports/SkThread_win.cpp',
@@ -500,7 +502,7 @@
}],
[ 'OS == "win"', {
'sources!': [
- '../third_party/skia/src/core/SkMMapStream.cpp',
+ '../third_party/skia/src/ports/SkOSFile_posix.cpp',
'../third_party/skia/src/ports/SkThread_pthread.cpp',
'../third_party/skia/src/ports/SkTime_Unix.cpp',
'ext/SkThread_chrome.cc',