| 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 26 matching lines...) Expand all Loading... |
| 37 #include "core/html/HTMLMediaElement.h" | 37 #include "core/html/HTMLMediaElement.h" |
| 38 #include "platform/LayoutTestSupport.h" | 38 #include "platform/LayoutTestSupport.h" |
| 39 #include "platform/RuntimeEnabledFeatures.h" | 39 #include "platform/RuntimeEnabledFeatures.h" |
| 40 #include "public/web/WebFrame.h" | 40 #include "public/web/WebFrame.h" |
| 41 #include "public/web/WebViewClient.h" | 41 #include "public/web/WebViewClient.h" |
| 42 #include "web/WebSettingsImpl.h" | 42 #include "web/WebSettingsImpl.h" |
| 43 #include "web/WebViewImpl.h" | 43 #include "web/WebViewImpl.h" |
| 44 | 44 |
| 45 namespace blink { | 45 namespace blink { |
| 46 | 46 |
| 47 PassOwnPtr<FullscreenController> FullscreenController::create(WebViewImpl* webVi
ewImpl) | 47 PassOwnPtrWillBeRawPtr<FullscreenController> FullscreenController::create(WebVie
wImpl* webViewImpl) |
| 48 { | 48 { |
| 49 return adoptPtr(new FullscreenController(webViewImpl)); | 49 return adoptPtrWillBeNoop(new FullscreenController(webViewImpl)); |
| 50 } | 50 } |
| 51 | 51 |
| 52 FullscreenController::FullscreenController(WebViewImpl* webViewImpl) | 52 FullscreenController::FullscreenController(WebViewImpl* webViewImpl) |
| 53 : m_webViewImpl(webViewImpl) | 53 : m_webViewImpl(webViewImpl) |
| 54 , m_exitFullscreenPageScaleFactor(0) | 54 , m_exitFullscreenPageScaleFactor(0) |
| 55 , m_isCancelingFullScreen(false) | 55 , m_isCancelingFullScreen(false) |
| 56 { | 56 { |
| 57 } | 57 } |
| 58 | 58 |
| 59 void FullscreenController::didEnterFullScreen() | 59 void FullscreenController::didEnterFullScreen() |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 | 151 |
| 152 void FullscreenController::exitFullScreenForElement(Element* element) | 152 void FullscreenController::exitFullScreenForElement(Element* element) |
| 153 { | 153 { |
| 154 // The client is exiting full screen, so don't send a notification. | 154 // The client is exiting full screen, so don't send a notification. |
| 155 if (m_isCancelingFullScreen) | 155 if (m_isCancelingFullScreen) |
| 156 return; | 156 return; |
| 157 if (WebViewClient* client = m_webViewImpl->client()) | 157 if (WebViewClient* client = m_webViewImpl->client()) |
| 158 client->exitFullScreen(); | 158 client->exitFullScreen(); |
| 159 } | 159 } |
| 160 | 160 |
| 161 void FullscreenController::trace(Visitor* visitor) |
| 162 { |
| 163 visitor->trace(m_provisionalFullScreenElement); |
| 164 visitor->trace(m_fullScreenFrame); |
| 165 } |
| 166 |
| 161 } // namespace blink | 167 } // namespace blink |
| 162 | 168 |
| OLD | NEW |