summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--skia/ext/SkThread_chrome.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index ad8f8ae..83f1c66 100644
--- a/DEPS
+++ b/DEPS
@@ -36,7 +36,7 @@ vars = {
"lss_revision": "9",
"ffmpeg_revision": "112050",
"sfntly_revision": "118",
- "skia_revision": "3023",
+ "skia_revision": "3035",
# 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/ext/SkThread_chrome.cc b/skia/ext/SkThread_chrome.cc
index 948cf1f..8ea584a 100644
--- a/skia/ext/SkThread_chrome.cc
+++ b/skia/ext/SkThread_chrome.cc
@@ -23,7 +23,7 @@ int32_t sk_atomic_dec(int32_t* addr) {
return base::subtle::Barrier_AtomicIncrement(addr, -1) + 1;
}
-SkMutex::SkMutex(bool isGlobal) : fIsGlobal(isGlobal) {
+SkMutex::SkMutex() {
COMPILE_ASSERT(sizeof(base::Lock) <= sizeof(fStorage), Lock_is_too_big_for_SkMutex);
base::Lock* lock = reinterpret_cast<base::Lock*>(fStorage);
new(lock) base::Lock();