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

Side by Side Diff: third_party/WebKit/Source/core/frame/LocalFrame.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Simon Hausmann <hausmann@kde.org> 5 * 2000 Simon Hausmann <hausmann@kde.org>
6 * 2000 Stefan Schimanski <1Stein@gmx.de> 6 * 2000 Stefan Schimanski <1Stein@gmx.de>
7 * 2001 George Staikos <staikos@kde.org> 7 * 2001 George Staikos <staikos@kde.org>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 370
371 SecurityContext* LocalFrame::securityContext() const 371 SecurityContext* LocalFrame::securityContext() const
372 { 372 {
373 return document(); 373 return document();
374 } 374 }
375 375
376 void LocalFrame::printNavigationErrorMessage(const Frame& targetFrame, const cha r* reason) 376 void LocalFrame::printNavigationErrorMessage(const Frame& targetFrame, const cha r* reason)
377 { 377 {
378 // URLs aren't available for RemoteFrames, so the error message uses their 378 // URLs aren't available for RemoteFrames, so the error message uses their
379 // origin instead. 379 // origin instead.
380 String targetFrameDescription = targetFrame.isLocalFrame() ? "with URL '" + toLocalFrame(targetFrame).document()->url().getString() + "'" : "with origin '" + targetFrame.securityContext()->securityOrigin()->toString() + "'"; 380 String targetFrameDescription = targetFrame.isLocalFrame() ? "with URL '" + toLocalFrame(targetFrame).document()->url().getString() + "'" : "with origin '" + targetFrame.securityContext()->getSecurityOrigin()->toString() + "'";
381 String message = "Unsafe JavaScript attempt to initiate navigation for frame " + targetFrameDescription + " from frame with URL '" + document()->url().getSt ring() + "'. " + reason + "\n"; 381 String message = "Unsafe JavaScript attempt to initiate navigation for frame " + targetFrameDescription + " from frame with URL '" + document()->url().getSt ring() + "'. " + reason + "\n";
382 382
383 localDOMWindow()->printErrorMessage(message); 383 localDOMWindow()->printErrorMessage(message);
384 } 384 }
385 385
386 WindowProxyManager* LocalFrame::windowProxyManager() const 386 WindowProxyManager* LocalFrame::windowProxyManager() const
387 { 387 {
388 return m_script->windowProxyManager(); 388 return m_script->windowProxyManager();
389 } 389 }
390 390
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
875 { 875 {
876 m_frame->disableNavigation(); 876 m_frame->disableNavigation();
877 } 877 }
878 878
879 FrameNavigationDisabler::~FrameNavigationDisabler() 879 FrameNavigationDisabler::~FrameNavigationDisabler()
880 { 880 {
881 m_frame->enableNavigation(); 881 m_frame->enableNavigation();
882 } 882 }
883 883
884 } // namespace blink 884 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp ('k') | third_party/WebKit/Source/core/frame/Location.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698