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

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

Issue 2550703002: Move pending state from FullscreenController to Fullscreen (Closed)
Patch Set: tests and documentation 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 833 matching lines...) Expand 10 before | Expand all | Expand 10 after
844 WebLocalFrameImpl* webFrame = 844 WebLocalFrameImpl* webFrame =
845 WebLocalFrameImpl::fromFrame(localFrame)->localRoot(); 845 WebLocalFrameImpl::fromFrame(localFrame)->localRoot();
846 846
847 // This method can be called when the frame is being detached, after the 847 // This method can be called when the frame is being detached, after the
848 // widget is destroyed. 848 // widget is destroyed.
849 if (webFrame->frameWidget()) 849 if (webFrame->frameWidget())
850 webFrame->frameWidget()->detachCompositorAnimationTimeline( 850 webFrame->frameWidget()->detachCompositorAnimationTimeline(
851 compositorTimeline); 851 compositorTimeline);
852 } 852 }
853 853
854 void ChromeClientImpl::enterFullscreenForElement(Element* element) { 854 void ChromeClientImpl::enterFullscreen(LocalFrame& frame) {
855 m_webView->enterFullscreenForElement(element); 855 m_webView->enterFullscreen(frame);
856 } 856 }
857 857
858 void ChromeClientImpl::exitFullscreen(LocalFrame* frame) { 858 void ChromeClientImpl::exitFullscreen(LocalFrame& frame) {
859 m_webView->exitFullscreen(frame); 859 m_webView->exitFullscreen(frame);
860 } 860 }
861 861
862 void ChromeClientImpl::fullscreenElementChanged(Element* fromElement, 862 void ChromeClientImpl::fullscreenElementChanged(Element* fromElement,
863 Element* toElement) { 863 Element* toElement) {
864 m_webView->fullscreenElementChanged(fromElement, toElement); 864 m_webView->fullscreenElementChanged(fromElement, toElement);
865 } 865 }
866 866
867 void ChromeClientImpl::clearCompositedSelection(LocalFrame* frame) { 867 void ChromeClientImpl::clearCompositedSelection(LocalFrame* frame) {
868 LocalFrame* localRoot = frame->localFrameRoot(); 868 LocalFrame* localRoot = frame->localFrameRoot();
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
1170 if (RuntimeEnabledFeatures::presentationEnabled()) 1170 if (RuntimeEnabledFeatures::presentationEnabled())
1171 PresentationController::provideTo(frame, client->presentationClient()); 1171 PresentationController::provideTo(frame, client->presentationClient());
1172 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) 1172 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled())
1173 provideAudioOutputDeviceClientTo(frame, 1173 provideAudioOutputDeviceClientTo(frame,
1174 AudioOutputDeviceClientImpl::create()); 1174 AudioOutputDeviceClientImpl::create());
1175 if (RuntimeEnabledFeatures::installedAppEnabled()) 1175 if (RuntimeEnabledFeatures::installedAppEnabled())
1176 InstalledAppController::provideTo(frame, client->installedAppClient()); 1176 InstalledAppController::provideTo(frame, client->installedAppClient());
1177 } 1177 }
1178 1178
1179 } // namespace blink 1179 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698