summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webplugin_impl.cc
diff options
context:
space:
mode:
authorericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-03 09:42:07 +0000
committerericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-03 09:42:07 +0000
commitf8af7742f9669c056510df377c899bd8fd860834 (patch)
treeba3ad25a70f30ed60fc89ed91bc41f0df5e9e12b /webkit/glue/webplugin_impl.cc
parent2a9763b94b86bfb18360730d5e1259c98b2d98f9 (diff)
downloadchromium_src-f8af7742f9669c056510df377c899bd8fd860834.zip
chromium_src-f8af7742f9669c056510df377c899bd8fd860834.tar.gz
chromium_src-f8af7742f9669c056510df377c899bd8fd860834.tar.bz2
WebKitMerge 40409:40464 (chromium-side).
* The death of FrameLoaderClient.cpp correspond with <http://trac.webkit.org/changeset/40435> * The custom V8 binding for V8HTMLFormElement::submit() corresponds with <http://trac.webkit.org/changeset/40424> * Changes to FrameLoader::loadFrameRequestWithFormAndValues() and FrameLoadTypeRedirectWithLockedHistory correspond with <http://trac.webkit.org/changeset/40432> * No action was taken for the disable-web-security change <http://trac.webkit.org/changeset/40449>, defaults to enabled. * Frame::isFrameSet() moving to Document::isFrameSet corresponds with <http://trac.webkit.org/changeset/40443> * Frame::sendResizeEvent() moved to EventHandler::sendResizeEvent() <http://trac.webkit.org/changeset/40444> * Not sure which webkit change added RenderObjectChildList.cpp. ======================= Rebaselined the following layout tests to reflect upstream changes: ======================= * LayoutTests/fast/table/form-with-table-style.html http://trac.webkit.org/browser/trunk/LayoutTests/platform/mac/fast/table/form-with-table-style-expected.png?rev=40457 * LayoutTests/fast/table/insert-row-before-form.html http://trac.webkit.org/changeset/40456/trunk/LayoutTests/platform/mac/fast/table/insert-row-before-form-expected.txt?old=30635&old_path=trunk/LayoutTests/platform/mac/fast/table/insert-row-before-form-expected.txt * LayoutTests/tables/mozilla/bugs/bug4527.html http://trac.webkit.org/changeset/40458/trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug4527-expected.txt?old=30635&old_path=trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug4527-expected.txt * LayoutTests/tables/mozilla/bugs/bug96343.html http://trac.webkit.org/changeset/40458/trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug96343-expected.txt?old=30635&old_path=trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug96343-expected.txt * LayoutTests/tables/mozilla_expected_failures/bugs/bug1725.html http://trac.webkit.org/changeset/40459/trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1725-expected.txt?old=30635&old_path=trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1725-expected.txt * LayoutTests/tables/mozilla_expected_failures/other/test4.html http://trac.webkit.org/changeset/40460/trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/other/test4-expected.txt?old=34683&old_path=trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/other/test4-expected.txt * LayoutTests/editing/deleting/deletionUI-single-instance-actual.png http://trac.webkit.org/changeset/40454/trunk/LayoutTests/platform/mac/editing/deleting/deletionUI-single-instance-expected.txt?old=32226&old_path=trunk/LayoutTests/platform/mac/editing/deleting/deletionUI-single-instance-expected.txt Review URL: http://codereview.chromium.org/21007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9077 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webplugin_impl.cc')
-rw-r--r--webkit/glue/webplugin_impl.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc
index 4b3cdb7..292ff9e 100644
--- a/webkit/glue/webplugin_impl.cc
+++ b/webkit/glue/webplugin_impl.cc
@@ -508,6 +508,7 @@ RoutingStatus WebPluginImpl::RouteToFrame(const char *method,
loader->loadFrameRequestWithFormAndValues(
load_request,
false, // lock history
+ false, // lock back forward list
0, // event
0, // form element
HashMap<WebCore::String, WebCore::String>());