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

Side by Side Diff: Source/web/FrameLoaderClientImpl.cpp

Issue 434903002: Make webkitCancelFullScreen() an alias of webkitExitFullscreen() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: polish test Created 6 years, 4 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
« no previous file with comments | « Source/web/ChromeClientImpl.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
3 * Copyright (C) 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2011 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 17 matching lines...) Expand all
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32 #include "config.h" 32 #include "config.h"
33 #include "web/FrameLoaderClientImpl.h" 33 #include "web/FrameLoaderClientImpl.h"
34 34
35 #include "bindings/core/v8/ScriptController.h" 35 #include "bindings/core/v8/ScriptController.h"
36 #include "core/HTMLNames.h" 36 #include "core/HTMLNames.h"
37 #include "core/dom/Document.h" 37 #include "core/dom/Document.h"
38 #include "core/dom/DocumentFullscreen.h" 38 #include "core/dom/FullscreenElementStack.h"
39 #include "core/events/MessageEvent.h" 39 #include "core/events/MessageEvent.h"
40 #include "core/events/MouseEvent.h" 40 #include "core/events/MouseEvent.h"
41 #include "core/frame/FrameView.h" 41 #include "core/frame/FrameView.h"
42 #include "core/frame/Settings.h" 42 #include "core/frame/Settings.h"
43 #include "core/html/HTMLAppletElement.h" 43 #include "core/html/HTMLAppletElement.h"
44 #include "core/loader/DocumentLoader.h" 44 #include "core/loader/DocumentLoader.h"
45 #include "core/loader/FrameLoadRequest.h" 45 #include "core/loader/FrameLoadRequest.h"
46 #include "core/loader/FrameLoader.h" 46 #include "core/loader/FrameLoader.h"
47 #include "core/loader/HistoryItem.h" 47 #include "core/loader/HistoryItem.h"
48 #include "core/page/Chrome.h" 48 #include "core/page/Chrome.h"
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 void FrameLoaderClientImpl::didStopLoading() 516 void FrameLoaderClientImpl::didStopLoading()
517 { 517 {
518 if (m_webFrame->client()) 518 if (m_webFrame->client())
519 m_webFrame->client()->didStopLoading(); 519 m_webFrame->client()->didStopLoading();
520 } 520 }
521 521
522 void FrameLoaderClientImpl::loadURLExternally(const ResourceRequest& request, Na vigationPolicy policy, const String& suggestedName) 522 void FrameLoaderClientImpl::loadURLExternally(const ResourceRequest& request, Na vigationPolicy policy, const String& suggestedName)
523 { 523 {
524 if (m_webFrame->client()) { 524 if (m_webFrame->client()) {
525 ASSERT(m_webFrame->frame()->document()); 525 ASSERT(m_webFrame->frame()->document());
526 DocumentFullscreen::webkitCancelFullScreen(*m_webFrame->frame()->documen t()); 526 FullscreenElementStack::from(*m_webFrame->frame()->document()).fullyExit Fullscreen();
527 WrappedResourceRequest webreq(request); 527 WrappedResourceRequest webreq(request);
528 m_webFrame->client()->loadURLExternally( 528 m_webFrame->client()->loadURLExternally(
529 m_webFrame, webreq, static_cast<WebNavigationPolicy>(policy), sugges tedName); 529 m_webFrame, webreq, static_cast<WebNavigationPolicy>(policy), sugges tedName);
530 } 530 }
531 } 531 }
532 532
533 bool FrameLoaderClientImpl::navigateBackForward(int offset) const 533 bool FrameLoaderClientImpl::navigateBackForward(int offset) const
534 { 534 {
535 WebViewImpl* webview = m_webFrame->viewImpl(); 535 WebViewImpl* webview = m_webFrame->viewImpl();
536 if (!webview->client()) 536 if (!webview->client())
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
822 m_webFrame->client()->didAbortLoading(m_webFrame); 822 m_webFrame->client()->didAbortLoading(m_webFrame);
823 } 823 }
824 824
825 void FrameLoaderClientImpl::dispatchDidChangeManifest() 825 void FrameLoaderClientImpl::dispatchDidChangeManifest()
826 { 826 {
827 if (m_webFrame->client()) 827 if (m_webFrame->client())
828 m_webFrame->client()->didChangeManifest(m_webFrame); 828 m_webFrame->client()->didChangeManifest(m_webFrame);
829 } 829 }
830 830
831 } // namespace blink 831 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/ChromeClientImpl.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698