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

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

Issue 2199783002: Clarify fullscreenElement vs. currentFullScreenElement distinction (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 void FullscreenController::didExitFullscreen() 95 void FullscreenController::didExitFullscreen()
96 { 96 {
97 if (!m_fullScreenFrame) 97 if (!m_fullScreenFrame)
98 return; 98 return;
99 99
100 if (m_haveEnteredFullscreen) 100 if (m_haveEnteredFullscreen)
101 updatePageScaleConstraints(true); 101 updatePageScaleConstraints(true);
102 102
103 if (Document* document = m_fullScreenFrame->document()) { 103 if (Document* document = m_fullScreenFrame->document()) {
104 if (Fullscreen* fullscreen = Fullscreen::fromIfExists(*document)) { 104 if (Fullscreen* fullscreen = Fullscreen::fromIfExists(*document)) {
105 Element* element = fullscreen->webkitCurrentFullScreenElement(); 105 Element* element = fullscreen->currentFullScreenElement();
106 if (element) { 106 if (element) {
107 // When the client exits from full screen we have to call fullyE xitFullscreen to notify 107 // When the client exits from full screen we have to call fullyE xitFullscreen to notify
108 // the document. While doing that, suppress notifications back t o the client. 108 // the document. While doing that, suppress notifications back t o the client.
109 m_isCancelingFullScreen = true; 109 m_isCancelingFullScreen = true;
110 Fullscreen::fullyExitFullscreen(*document); 110 Fullscreen::fullyExitFullscreen(*document);
111 m_isCancelingFullScreen = false; 111 m_isCancelingFullScreen = false;
112 112
113 // If the video used overlay fullscreen mode, the background was made transparent. Restore the transparency. 113 // If the video used overlay fullscreen mode, the background was made transparent. Restore the transparency.
114 if (isHTMLVideoElement(element) && m_webViewImpl->layerTreeView( )) 114 if (isHTMLVideoElement(element) && m_webViewImpl->layerTreeView( ))
115 m_webViewImpl->layerTreeView()->setHasTransparentBackground( m_webViewImpl->isTransparent()); 115 m_webViewImpl->layerTreeView()->setHasTransparentBackground( m_webViewImpl->isTransparent());
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 m_webViewImpl->updateMainFrameLayoutSize(); 228 m_webViewImpl->updateMainFrameLayoutSize();
229 } 229 }
230 230
231 DEFINE_TRACE(FullscreenController) 231 DEFINE_TRACE(FullscreenController)
232 { 232 {
233 visitor->trace(m_provisionalFullScreenElement); 233 visitor->trace(m_provisionalFullScreenElement);
234 visitor->trace(m_fullScreenFrame); 234 visitor->trace(m_fullScreenFrame);
235 } 235 }
236 236
237 } // namespace blink 237 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698