summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS5
-rw-r--r--build/features_override.gypi1
2 files changed, 2 insertions, 4 deletions
diff --git a/DEPS b/DEPS
index 87158a8..cf825cd 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "55033",
+ "webkit_revision": "55080",
"ffmpeg_revision": "39607",
"skia_revision": "490",
"chromium_git": "http://src.chromium.org/git",
@@ -69,9 +69,6 @@ deps = {
"src/third_party/WebKit/WebKitTools/Scripts":
Var("webkit_trunk") + "/WebKitTools/Scripts@" + Var("webkit_revision"),
- "src/third_party/WebKit/WebKitTools/simplejson":
- Var("webkit_trunk") + "/WebKitTools/simplejson@" + Var("webkit_revision"),
-
"src/third_party/ots":
"http://ots.googlecode.com/svn/trunk@26",
diff --git a/build/features_override.gypi b/build/features_override.gypi
index a8bf515..851fcac 100644
--- a/build/features_override.gypi
+++ b/build/features_override.gypi
@@ -27,6 +27,7 @@
'ENABLE_OPENTYPE_SANITIZER=1',
'ENABLE_ORIENTATION_EVENTS=0',
'ENABLE_RUBY=1',
+ 'ENABLE_SANDBOX=1',
'ENABLE_XSLT=1',
'ENABLE_XPATH=1',
'ENABLE_SHARED_WORKERS=1',