summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorulan@chromium.org <ulan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-21 15:16:52 +0000
committerulan@chromium.org <ulan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-21 15:16:52 +0000
commit1134be71d0a763e1314196b50c4c61d38d971d37 (patch)
tree85a4f9379ca5694d2d07859d171380461e4ee99c
parent58059242a50b96a7dd21cc20c01826d2e60b69d8 (diff)
downloadchromium_src-1134be71d0a763e1314196b50c4c61d38d971d37.zip
chromium_src-1134be71d0a763e1314196b50c4c61d38d971d37.tar.gz
chromium_src-1134be71d0a763e1314196b50c4c61d38d971d37.tar.bz2
Reland: Update V8 to version 3.14.0.1 and adjust test expectations.
Small chrome size regression is expected since we optimize WebUI javascript by precompiling it into v8 snapshot. R=jkummerow@chromium.org Review URL: https://chromiumcodereview.appspot.com/10959041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157982 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--tools/heapcheck/suppressions.txt16
-rw-r--r--tools/perf_expectations/perf_expectations.json4
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt4
4 files changed, 23 insertions, 3 deletions
diff --git a/DEPS b/DEPS
index 1124841..bc76edd 100644
--- a/DEPS
+++ b/DEPS
@@ -33,7 +33,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Skia
# and V8 without interference from each other.
- "v8_revision": "12514",
+ "v8_revision": "12570",
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling WebRTC
# and V8 without interference from each other.
diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt
index 56ae025..d2925e8 100644
--- a/tools/heapcheck/suppressions.txt
+++ b/tools/heapcheck/suppressions.txt
@@ -1530,3 +1530,19 @@
fun:WebCore::FrameLoader::dispatchDidClearWindowObjectInWorld
fun:WebCore::V8DOMWindowShell::initializeIfNeeded
}
+
+{
+ bug_v8_2345
+ Heapcheck:Leak
+ fun:v8::internal::SkipList::Update
+ fun:v8::internal::PagedSpace::AllocateRaw
+ fun:v8::internal::Heap::ReserveSpace
+ fun:v8::internal::Deserializer::Deserialize
+ fun:v8::internal::Isolate::Init
+ fun:v8::internal::V8::Initialize
+ fun:v8::internal::Snapshot::Initialize
+ fun:v8::InitializeHelper
+ fun:v8::V8::Initialize
+ fun:WebKit::initialize
+ fun:content::UnitTestTestSuite::UnitTestTestSuite
+}
diff --git a/tools/perf_expectations/perf_expectations.json b/tools/perf_expectations/perf_expectations.json
index 1959f46..6b7507a 100644
--- a/tools/perf_expectations/perf_expectations.json
+++ b/tools/perf_expectations/perf_expectations.json
@@ -3,7 +3,7 @@
"linux-release-64/sizes/chrome-si/initializers": {"reva": 151177, "revb": 151177, "type": "absolute", "better": "lower", "improve": 40, "regress": 40, "tolerance": 0, "sha1": "09c3012f"},
"linux-release-64/sizes/chrome-text/text": {"reva": 150665, "revb": 150665, "type": "absolute", "better": "lower", "improve": 76345499, "regress": 84381869, "sha1": "3470d257"},
"linux-release-64/sizes/chrome.pak/chrome.pak": {"reva": 144090, "revb": 146227, "type": "absolute", "better": "lower", "improve": 3707774, "regress": 4832382, "sha1": "d7e07c9a"},
- "linux-release-64/sizes/chrome/chrome": {"reva": 157772, "revb": 157774, "type": "absolute", "better": "lower", "improve": 104409104, "regress": 115399536, "sha1": "cd95d429"},
+ "linux-release-64/sizes/chrome/chrome": {"reva": 157820, "revb": 157822, "type": "absolute", "improve": 104431037, "regress": 115468862, "sha1": "3fc90508"},
"linux-release-64/sizes/nacl_helper-bss/bss": {"reva": 150377, "revb": 150377, "type": "absolute", "better": "lower", "improve": 287694, "regress": 317978, "sha1": "fd06a1cd"},
"linux-release-64/sizes/nacl_helper-data/data": {"reva": 151971, "revb": 152008, "type": "absolute", "better": "lower", "improve": 33789, "regress": 38699, "sha1": "858c7a43"},
"linux-release-64/sizes/nacl_helper-si/initializers": {"reva": 120278, "revb": 120278, "type": "absolute", "better": "lower", "improve": 17, "regress": 19, "sha1": "77a7c319"},
@@ -390,7 +390,7 @@
"linux-release/sizes/chrome-text/text": {"reva": 153631, "revb": 153982, "type": "absolute", "better": "lower", "improve": 68395357, "regress": 75652884, "sha1": "d8e702a0"},
"linux-release/sizes/chrome-textrel/textrel": {"reva": 135570, "revb": 135664, "type": "absolute", "better": "lower", "improve": 0, "regress": 0, "sha1": "832078e7"},
"linux-release/sizes/chrome.pak/chrome.pak": {"reva": 144090, "revb": 146227, "type": "absolute", "better": "lower", "improve": 3707774, "regress": 4832382, "sha1": "a6f80432"},
- "linux-release/sizes/chrome/chrome": {"reva": 151835, "revb": 151900, "type": "absolute", "improve": 89113845, "regress": 98495301, "sha1": "a8ec7ade"},
+ "linux-release/sizes/chrome/chrome": {"reva": 157820, "revb": 157822, "type": "absolute", "improve": 91516673, "regress": 101182179, "sha1": "bb7aa06b"},
"linux-release/sizes/libffmpegsumo.so-textrel/textrel": {"reva": 140550, "revb": 140550, "type": "absolute", "better": "lower", "improve": 5669, "regress": 6267, "sha1": "83c981dc"},
"linux-release/sizes/nacl_helper-bss/bss": {"reva": 150377, "revb": 150377, "type": "absolute", "better": "lower", "improve": 159645, "regress": 176451, "sha1": "e353aa88"},
"linux-release/sizes/nacl_helper-data/data": {"reva": 152010, "revb": 152028, "type": "absolute", "better": "lower", "improve": 12597, "regress": 13923, "sha1": "4029de7a"},
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 737e105..4af37cb 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -31,3 +31,7 @@
// Right?)
//
// EVERYTHING BELOW THIS LINE WILL BE DELETED AT EVERY WEBKIT DEPS ROLL
+
+webkit.org/b/97206 http/tests/security/contentSecurityPolicy/eval-blocked-in-about-blank-iframe.html [ Failure Skip ]
+webkit.org/b/97206 http/tests/security/contentSecurityPolicy/function-constructor-blocked.html [ Failure Skip ]
+webkit.org/b/97206 http/tests/security/contentSecurityPolicy/eval-blocked.html [ Failure Skip ]