summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjaphet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-19 23:05:27 +0000
committerjaphet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-19 23:05:27 +0000
commit26d1c58cbff72cdf752a78c1cf64a24728aba7ab (patch)
tree4f04c3ddf92f307d9a01df80ad72723cf6479953
parentab926d553d2fbab7f170826afa811a253a8a65c8 (diff)
downloadchromium_src-26d1c58cbff72cdf752a78c1cf64a24728aba7ab.zip
chromium_src-26d1c58cbff72cdf752a78c1cf64a24728aba7ab.tar.gz
chromium_src-26d1c58cbff72cdf752a78c1cf64a24728aba7ab.tar.bz2
WebKit DEPS roll 49761:49809. BUG=none TEST=none TBR=yutak
Review URL: http://codereview.chromium.org/292017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29473 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/api/src/WebPluginContainerImpl.cpp3
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt7
3 files changed, 10 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 97a424c..9a2b463 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "49761",
+ "webkit_revision": "49809",
"ffmpeg_revision": "28488",
}
diff --git a/webkit/api/src/WebPluginContainerImpl.cpp b/webkit/api/src/WebPluginContainerImpl.cpp
index 828075d..5918529 100644
--- a/webkit/api/src/WebPluginContainerImpl.cpp
+++ b/webkit/api/src/WebPluginContainerImpl.cpp
@@ -279,7 +279,8 @@ void WebPluginContainerImpl::loadFrameRequest(
false, // lock history
false, // lock back forward list
0, // event
- 0); // form state
+ 0, // form state
+ SendReferrer);
}
void WebPluginContainerImpl::didReceiveResponse(const ResourceResponse& response)
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index ca0de2a..db16fca 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -1386,6 +1386,7 @@ BUG10351 MAC : LayoutTests/plugins/netscape-get-property-return-value.html = FAI
BUG10351 MAC : LayoutTests/plugins/netscape-identifier-conversion.html = FAIL
BUG10351 MAC : LayoutTests/plugins/netscape-invoke-browserfuncs.html = FAIL
BUG10351 MAC : LayoutTests/plugins/netscape-invoke-default.html = FAIL
+BUG10351 MAC : LayoutTests/plugins/netscape-invoke-failure.html = FAIL
BUG10351 MAC : LayoutTests/plugins/npruntime.html = TIMEOUT
BUG10351 MAC : LayoutTests/plugins/plugin-remove-subframe.html = FAIL
BUG10351 MAC : LayoutTests/plugins/return-error-from-new-stream-doesnt-invoke-destroy-stream.html = TIMEOUT
@@ -3167,3 +3168,9 @@ BUG_YUTAK : LayoutTests/fast/events/drag-and-drop-dataTransfer-types-nocrash.htm
BUG_YUTAK : LayoutTests/svg/W3C-SVG-1.1/masking-mask-01-b.svg = FAIL
BUG_YUTAK MAC : LayoutTests/svg/custom/grayscale-gradient-mask.svg = FAIL
BUG_YUTAK LINUX : LayoutTests/http/tests/security/mixedContent/insecure-plugin-in-iframe.html = FAIL
+
+// WebKit Roll 49761:49809
+BUG_JAPHET LINUX WIN : LayoutTests/fast/canvas/arc360.html = FAIL
+BUG_JAPHET LINUX : LayoutTests/fast/css/transition-color-unspecified.html = FAIL
+BUG_JAPHET : LayoutTests/media/media-load-event.html = FAIL
+BUG_JAPHET : LayoutTests/media/progress-event-at-least-one.html = FAIL