summaryrefslogtreecommitdiffstats
path: root/content/renderer
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-27 13:11:21 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-27 13:11:21 +0000
commit5cef23d337bf13f96bc932e0536d5ef5ffd2b713 (patch)
treeafab8e8aeac1a9a8d42967809389d2e766eac005 /content/renderer
parentdeda08bcd4901f9dcc4d737e1d1245b7c4cdcfab (diff)
downloadchromium_src-5cef23d337bf13f96bc932e0536d5ef5ffd2b713.zip
chromium_src-5cef23d337bf13f96bc932e0536d5ef5ffd2b713.tar.gz
chromium_src-5cef23d337bf13f96bc932e0536d5ef5ffd2b713.tar.bz2
Do not set the main frame's name to the frame name parameter of createView
If e.g. a link has target=_blank, createView is invoked with a frame name parameter "_blank". However, WebCore assumes that no frame ever has the name _blank (see e.g. FrameTree::find). BUG=177982,111316 R=darin@chromium.org TEST=e.g. http/tests/security/mixedContent tests pass on content_shell Review URL: https://chromiumcodereview.appspot.com/12313090 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184941 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
-rw-r--r--content/renderer/render_view_impl.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 8b3f021..7983f7a 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1917,7 +1917,8 @@ WebView* RenderViewImpl::createView(
params.user_gesture = creator->isProcessingUserGesture();
params.window_container_type = WindowFeaturesToContainerType(features);
params.session_storage_namespace_id = session_storage_namespace_id_;
- params.frame_name = frame_name;
+ if (frame_name != "_blank")
+ params.frame_name = frame_name;
params.opener_frame_id = creator->identifier();
params.opener_url = creator->document().url();
GURL security_url(creator->document().securityOrigin().toString().utf8());
@@ -1951,7 +1952,7 @@ WebView* RenderViewImpl::createView(
routing_id,
surface_id,
cloned_session_storage_namespace_id,
- frame_name,
+ string16(), // WebCore will take care of setting the correct name.
true,
false,
1,