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

Side by Side Diff: third_party/WebKit/Source/web/ChromeClientImpl.cpp

Issue 2495423004: Convert FullscreenController to use WebCallbacks (Closed)
Patch Set: just in case Created 4 years 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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
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 18 matching lines...) Expand all
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 "web/ChromeClientImpl.h" 32 #include "web/ChromeClientImpl.h"
33 33
34 #include "bindings/core/v8/ScriptController.h" 34 #include "bindings/core/v8/ScriptController.h"
35 #include "core/HTMLNames.h" 35 #include "core/HTMLNames.h"
36 #include "core/dom/AXObjectCache.h" 36 #include "core/dom/AXObjectCache.h"
37 #include "core/dom/Document.h" 37 #include "core/dom/Document.h"
38 #include "core/dom/Fullscreen.h" 38 #include "core/dom/Fullscreen.h"
39 #include "core/dom/FullscreenCallbacks.h"
39 #include "core/dom/Node.h" 40 #include "core/dom/Node.h"
40 #include "core/events/UIEventWithKeyState.h" 41 #include "core/events/UIEventWithKeyState.h"
41 #include "core/frame/FrameHost.h" 42 #include "core/frame/FrameHost.h"
42 #include "core/frame/FrameView.h" 43 #include "core/frame/FrameView.h"
43 #include "core/frame/Settings.h" 44 #include "core/frame/Settings.h"
44 #include "core/frame/VisualViewport.h" 45 #include "core/frame/VisualViewport.h"
45 #include "core/html/HTMLInputElement.h" 46 #include "core/html/HTMLInputElement.h"
46 #include "core/html/forms/ColorChooser.h" 47 #include "core/html/forms/ColorChooser.h"
47 #include "core/html/forms/ColorChooserClient.h" 48 #include "core/html/forms/ColorChooserClient.h"
48 #include "core/html/forms/DateTimeChooser.h" 49 #include "core/html/forms/DateTimeChooser.h"
(...skipping 795 matching lines...) Expand 10 before | Expand all | Expand 10 after
844 WebLocalFrameImpl* webFrame = 845 WebLocalFrameImpl* webFrame =
845 WebLocalFrameImpl::fromFrame(localFrame)->localRoot(); 846 WebLocalFrameImpl::fromFrame(localFrame)->localRoot();
846 847
847 // This method can be called when the frame is being detached, after the 848 // This method can be called when the frame is being detached, after the
848 // widget is destroyed. 849 // widget is destroyed.
849 if (webFrame->frameWidget()) 850 if (webFrame->frameWidget())
850 webFrame->frameWidget()->detachCompositorAnimationTimeline( 851 webFrame->frameWidget()->detachCompositorAnimationTimeline(
851 compositorTimeline); 852 compositorTimeline);
852 } 853 }
853 854
854 void ChromeClientImpl::enterFullscreen(LocalFrame& frame) { 855 void ChromeClientImpl::enterFullscreen(
855 m_webView->enterFullscreen(frame); 856 LocalFrame& frame,
857 std::unique_ptr<FullscreenCallbacks> callbacks) {
858 m_webView->enterFullscreen(frame, std::move(callbacks));
856 } 859 }
857 860
858 void ChromeClientImpl::exitFullscreen(LocalFrame& frame) { 861 void ChromeClientImpl::exitFullscreen(LocalFrame& frame) {
859 m_webView->exitFullscreen(frame); 862 m_webView->exitFullscreen(frame);
860 } 863 }
861 864
862 void ChromeClientImpl::fullscreenElementChanged(Element* fromElement, 865 void ChromeClientImpl::fullscreenElementChanged(Element* fromElement,
863 Element* toElement) { 866 Element* toElement) {
864 m_webView->fullscreenElementChanged(fromElement, toElement); 867 m_webView->fullscreenElementChanged(fromElement, toElement);
865 } 868 }
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
1170 if (RuntimeEnabledFeatures::presentationEnabled()) 1173 if (RuntimeEnabledFeatures::presentationEnabled())
1171 PresentationController::provideTo(frame, client->presentationClient()); 1174 PresentationController::provideTo(frame, client->presentationClient());
1172 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) 1175 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled())
1173 provideAudioOutputDeviceClientTo(frame, 1176 provideAudioOutputDeviceClientTo(frame,
1174 AudioOutputDeviceClientImpl::create()); 1177 AudioOutputDeviceClientImpl::create());
1175 if (RuntimeEnabledFeatures::installedAppEnabled()) 1178 if (RuntimeEnabledFeatures::installedAppEnabled())
1176 InstalledAppController::provideTo(frame, client->installedAppClient()); 1179 InstalledAppController::provideTo(frame, client->installedAppClient());
1177 } 1180 }
1178 1181
1179 } // namespace blink 1182 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/ChromeClientImpl.h ('k') | third_party/WebKit/Source/web/FullscreenController.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698