Source/core/frame/Location.cpp - Issue 138443013: Remove iframe@seamless

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: Source/core/frame/Location.cpp

Issue 138443013: Remove iframe@seamless (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Include remove tests Created 6 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2008, 2010 Apple Inc. All rights reserved.	2 * Copyright (C) 2008, 2010 Apple Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 *	7 *

8 * 1. Redistributions of source code must retain the above copyright	8 * 1. Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * 2. Redistributions in binary form must reproduce the above copyright	10 * 2. Redistributions in binary form must reproduce the above copyright

(...skipping 224 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
235 if (!m_frame)	235 if (!m_frame)

236 return;	236 return;

237 if (protocolIsJavaScript(m_frame->document()->url()))	237 if (protocolIsJavaScript(m_frame->document()->url()))

238 return;	238 return;

239 m_frame->navigationScheduler().scheduleRefresh();	239 m_frame->navigationScheduler().scheduleRefresh();

240 }	240 }

241	241

242 void Location::setLocation(const String& url, DOMWindow* activeWindow, DOMWindow * firstWindow)	242 void Location::setLocation(const String& url, DOMWindow* activeWindow, DOMWindow * firstWindow)

243 {	243 {

244 ASSERT(m_frame);	244 ASSERT(m_frame);

245 // We call findFrameForNavigation to handle the case of a seamless iframe co rrectly.

246 Frame* frame = m_frame->loader().findFrameForNavigation(nullAtom, activeWind ow->document());	245 Frame* frame = m_frame->loader().findFrameForNavigation(nullAtom, activeWind ow->document());

247 if (!frame)	246 if (!frame)

248 return;	247 return;

249 frame->domWindow()->setLocation(url, activeWindow, firstWindow);	248 frame->domWindow()->setLocation(url, activeWindow, firstWindow);

250 }	249 }

251	250

252 } // namespace WebCore	251 } // namespace WebCore

OLD	NEW

« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | Source/core/html/HTMLAttributeNames.in » ('j') | Source/core/rendering/RenderView.cpp » ('J')