Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(266)

Side by Side Diff: Source/core/html/HTMLFrameOwnerElement.cpp

Issue 1232223002: Rename LockBackForwardList to ReplaceCurrentItem. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 5 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 235
236 if (AXObjectCache* cache = document().existingAXObjectCache()) 236 if (AXObjectCache* cache = document().existingAXObjectCache())
237 cache->childrenChanged(layoutPart); 237 cache->childrenChanged(layoutPart);
238 } 238 }
239 239
240 Widget* HTMLFrameOwnerElement::ownedWidget() const 240 Widget* HTMLFrameOwnerElement::ownedWidget() const
241 { 241 {
242 return m_widget.get(); 242 return m_widget.get();
243 } 243 }
244 244
245 bool HTMLFrameOwnerElement::loadOrRedirectSubframe(const KURL& url, const Atomic String& frameName, bool lockBackForwardList) 245 bool HTMLFrameOwnerElement::loadOrRedirectSubframe(const KURL& url, const Atomic String& frameName, bool replaceCurrentItem)
246 { 246 {
247 RefPtrWillBeRawPtr<LocalFrame> parentFrame = document().frame(); 247 RefPtrWillBeRawPtr<LocalFrame> parentFrame = document().frame();
248 if (contentFrame()) { 248 if (contentFrame()) {
249 contentFrame()->navigate(document(), url, lockBackForwardList, UserGestu reStatus::None); 249 contentFrame()->navigate(document(), url, replaceCurrentItem, UserGestur eStatus::None);
250 return true; 250 return true;
251 } 251 }
252 252
253 if (!document().securityOrigin()->canDisplay(url)) { 253 if (!document().securityOrigin()->canDisplay(url)) {
254 FrameLoader::reportLocalLoadFailed(parentFrame.get(), url.string()); 254 FrameLoader::reportLocalLoadFailed(parentFrame.get(), url.string());
255 return false; 255 return false;
256 } 256 }
257 257
258 if (!SubframeLoadingDisabler::canLoadFrame(*this)) 258 if (!SubframeLoadingDisabler::canLoadFrame(*this))
259 return false; 259 return false;
260 260
261 if (document().frame()->host()->subframeCount() >= FrameHost::maxNumberOfFra mes) 261 if (document().frame()->host()->subframeCount() >= FrameHost::maxNumberOfFra mes)
262 return false; 262 return false;
263 263
264 return parentFrame->loader().client()->createFrame(FrameLoadRequest(&documen t(), url, "_self", CheckContentSecurityPolicy), frameName, this); 264 return parentFrame->loader().client()->createFrame(FrameLoadRequest(&documen t(), url, "_self", CheckContentSecurityPolicy), frameName, this);
265 } 265 }
266 266
267 DEFINE_TRACE(HTMLFrameOwnerElement) 267 DEFINE_TRACE(HTMLFrameOwnerElement)
268 { 268 {
269 visitor->trace(m_contentFrame); 269 visitor->trace(m_contentFrame);
270 visitor->trace(m_widget); 270 visitor->trace(m_widget);
271 HTMLElement::trace(visitor); 271 HTMLElement::trace(visitor);
272 FrameOwner::trace(visitor); 272 FrameOwner::trace(visitor);
273 } 273 }
274 274
275 275
276 } // namespace blink 276 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698