Title: [101011] trunk/Source/WebKit/chromium
- Revision
- 101011
- Author
- dpra...@chromium.org
- Date
- 2011-11-22 10:30:20 -0800 (Tue, 22 Nov 2011)
Log Message
Roll Chromium DEPS to r110960 and set the disable_nacl flag.
https://bugs.webkit.org/show_bug.cgi?id=72911
Unreviewed, build fix.
ppapi starts to depend on the NaCl gyp files as of r109739, so
we need to pass disable_nacl when running gyp to avoid pulling
in too much of NaCl.
* DEPS:
* gyp_webkit:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (101010 => 101011)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-11-22 18:10:47 UTC (rev 101010)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-11-22 18:30:20 UTC (rev 101011)
@@ -1,3 +1,17 @@
+2011-11-22 Dirk Pranke <dpra...@chromium.org>
+
+ Roll Chromium DEPS to r110960 and set the disable_nacl flag.
+ https://bugs.webkit.org/show_bug.cgi?id=72911
+
+ Unreviewed, build fix.
+
+ ppapi starts to depend on the NaCl gyp files as of r109739, so
+ we need to pass disable_nacl when running gyp to avoid pulling
+ in too much of NaCl.
+
+ * DEPS:
+ * gyp_webkit:
+
2011-11-22 Pavel Feldman <pfeld...@google.com>
Web Inspector: [chromium] fix internactive ui test for scripts panel.
Modified: trunk/Source/WebKit/chromium/DEPS (101010 => 101011)
--- trunk/Source/WebKit/chromium/DEPS 2011-11-22 18:10:47 UTC (rev 101010)
+++ trunk/Source/WebKit/chromium/DEPS 2011-11-22 18:30:20 UTC (rev 101011)
@@ -32,7 +32,9 @@
vars = {
'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
- 'chromium_rev': '109696'
+ 'chromium_rev': '110359',
+ 'nacl_svn': 'http://src.chromium.org/native_client/trunk',
+ 'nacl_rev': '7169',
}
deps = {
@@ -93,6 +95,8 @@
Var('chromium_svn')+'/ipc@'+Var('chromium_rev'),
'media':
Var('chromium_svn')+'/media@'+Var('chromium_rev'),
+ 'native_client/build':
+ Var('nacl_svn')+'/src/native_client/build@'+Var('nacl_rev'),
'printing':
Var('chromium_svn')+'/printing@'+Var('chromium_rev'),
'ppapi':
Modified: trunk/Source/WebKit/chromium/gyp_webkit (101010 => 101011)
--- trunk/Source/WebKit/chromium/gyp_webkit 2011-11-22 18:10:47 UTC (rev 101010)
+++ trunk/Source/WebKit/chromium/gyp_webkit 2011-11-22 18:30:20 UTC (rev 101011)
@@ -119,6 +119,7 @@
'-Dinside_chromium_build=0',
'-Dv8_use_snapshot=false',
'-Dmsvs_use_common_release=0',
+ '-Ddisable_nacl=1',
# WebKit doesn't use the chromium style checker.
'-Dmake_clang_dir=Source/WebKit/chromium/third_party/llvm-build/Release+Asserts',
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
