OLD | NEW |
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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
110 void FullscreenController::willExitFullScreen() | 110 void FullscreenController::willExitFullScreen() |
111 { | 111 { |
112 if (!m_fullScreenFrame) | 112 if (!m_fullScreenFrame) |
113 return; | 113 return; |
114 | 114 |
115 if (Document* doc = m_fullScreenFrame->document()) { | 115 if (Document* doc = m_fullScreenFrame->document()) { |
116 FullscreenElementStack* fullscreen = FullscreenElementStack::fromIfExist
s(*doc); | 116 FullscreenElementStack* fullscreen = FullscreenElementStack::fromIfExist
s(*doc); |
117 if (!fullscreen) | 117 if (!fullscreen) |
118 return; | 118 return; |
119 if (fullscreen->isFullScreen(*doc)) { | 119 if (fullscreen->isFullScreen(*doc)) { |
120 // When the client exits from full screen we have to call webkitCanc
elFullScreen to | 120 // When the client exits from full screen we have to call fullyExitF
ullscreen to notify |
121 // notify the document. While doing that, suppress notifications bac
k to the client. | 121 // the document. While doing that, suppress notifications back to th
e client. |
122 m_isCancelingFullScreen = true; | 122 m_isCancelingFullScreen = true; |
123 fullscreen->webkitCancelFullScreen(); | 123 fullscreen->fullyExitFullscreen(); |
124 m_isCancelingFullScreen = false; | 124 m_isCancelingFullScreen = false; |
125 fullscreen->webkitWillExitFullScreenForElement(0); | 125 fullscreen->webkitWillExitFullScreenForElement(0); |
126 if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled() && m_web
ViewImpl->layerTreeView()) | 126 if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled() && m_web
ViewImpl->layerTreeView()) |
127 m_webViewImpl->layerTreeView()->setHasTransparentBackground(m_we
bViewImpl->isTransparent()); | 127 m_webViewImpl->layerTreeView()->setHasTransparentBackground(m_we
bViewImpl->isTransparent()); |
128 } | 128 } |
129 } | 129 } |
130 } | 130 } |
131 | 131 |
132 void FullscreenController::didExitFullScreen() | 132 void FullscreenController::didExitFullScreen() |
133 { | 133 { |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
183 { | 183 { |
184 // The client is exiting full screen, so don't send a notification. | 184 // The client is exiting full screen, so don't send a notification. |
185 if (m_isCancelingFullScreen) | 185 if (m_isCancelingFullScreen) |
186 return; | 186 return; |
187 if (WebViewClient* client = m_webViewImpl->client()) | 187 if (WebViewClient* client = m_webViewImpl->client()) |
188 client->exitFullScreen(); | 188 client->exitFullScreen(); |
189 } | 189 } |
190 | 190 |
191 } | 191 } |
192 | 192 |
OLD | NEW |