summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryutak@chromium.org <yutak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-21 04:44:58 +0000
committeryutak@chromium.org <yutak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-21 04:44:58 +0000
commit710572ce32772f31ebee4d7a1bc48734b0e69163 (patch)
tree9768759a391dd08143185111820eeb38c1c07dcc
parentb92ba4f46558e2af31faf991357a86587f6e2bbb (diff)
downloadchromium_src-710572ce32772f31ebee4d7a1bc48734b0e69163.zip
chromium_src-710572ce32772f31ebee4d7a1bc48734b0e69163.tar.gz
chromium_src-710572ce32772f31ebee4d7a1bc48734b0e69163.tar.bz2
WebKit merge 49872:49896.
This roll should fix a valgrind error (issue 25297). R=jamesr BUG=25297 TEST=none Review URL: http://codereview.chromium.org/292039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29613 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--tools/valgrind/memcheck/suppressions.txt8
2 files changed, 1 insertions, 9 deletions
diff --git a/DEPS b/DEPS
index 523ab98..2e3f3c7 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "49872",
+ "webkit_revision": "49896",
"ffmpeg_revision": "28488",
}
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index fb331f6..8ac399b 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -1089,11 +1089,3 @@
fun:_Z10cssyyparsePv
fun:_ZN7WebCore9CSSParser10parseSheetEPNS_13CSSStyleSheetERKNS_6StringE
}
-{
- bug_25297
- Memcheck:Leak
- fun:malloc
- fun:_ZN3WTF10fastMalloc*
- fun:_ZN3WTF13FastAllocBase*
- fun:_ZN7WebCore12ScriptString*
-}