summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-26 20:49:39 +0000
committerjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-26 20:49:39 +0000
commit34831e0d903dc77863f64096e73f136f4742269b (patch)
tree59a31b89efd9caed9f40a5b7cd86bce435551338
parenta8d99cef0077ddfb03bbf46452c8770068089a45 (diff)
downloadchromium_src-34831e0d903dc77863f64096e73f136f4742269b.zip
chromium_src-34831e0d903dc77863f64096e73f136f4742269b.tar.gz
chromium_src-34831e0d903dc77863f64096e73f136f4742269b.tar.bz2
Roll webkit to 47790.
TBR=ojan TEST=none BUG=20345 Review URL: http://codereview.chromium.org/173515 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24525 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt3
2 files changed, 4 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 7e446c4..ddddc82 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "47779",
+ "webkit_revision": "47790",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index b95b7c7..79bf68f 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2814,3 +2814,6 @@ BUG20319 : LayoutTests/fast/dom/Window/timer-resume-on-navigation-back.html = TI
// Fails after V8 rollup
BUG20314 MAC : LayoutTests/fast/css/only-of-type-pseudo-class.html = FAIL
+
+// WebKit 47777:47790 - getOwnPropertyDescriptor
+BUG20345 : LayoutTests/fast/js/getOwnPropertyDescriptor.html = FAIL