Changeset 116782 in webkit
- Timestamp:
- May 11, 2012 10:05:23 AM (12 years ago)
- Location:
- trunk/Source
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r116780 r116782 1 2012-05-11 Min Qin <qinmin@google.com> 2 3 split MediaPlayer::enterFullscreen into 2 seperate functions 4 https://bugs.webkit.org/show_bug.cgi?id=86052 5 6 Reviewed by Adam Barth. 7 8 It is confusing that enterFullscreen returns a boolean while exitFullscreen does 9 not do the same. And ios does not need the return value. 10 So remove the return value on enterFullscreen and make a seperate canEnterFullscreen() 11 function for android. 12 No tests as there are no behavior change, just refactoring. 13 14 * platform/graphics/MediaPlayer.cpp: 15 (WebCore::MediaPlayer::enterFullscreen): 16 (WebCore): 17 (WebCore::MediaPlayer::canEnterFullscreen): 18 * platform/graphics/MediaPlayer.h: 19 (MediaPlayer): 20 * platform/graphics/MediaPlayerPrivate.h: 21 (WebCore::MediaPlayerPrivateInterface::enterFullscreen): 22 (MediaPlayerPrivateInterface): 23 (WebCore::MediaPlayerPrivateInterface::canEnterFullscreen): 24 1 25 2012-05-11 Pavel Feldman <pfeldman@chromium.org> 2 26 -
trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp
r116736 r116782 771 771 772 772 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO) || USE(NATIVE_FULLSCREEN_VIDEO) 773 bool MediaPlayer::enterFullscreen() const 774 { 775 returnm_private->enterFullscreen();773 void MediaPlayer::enterFullscreen() 774 { 775 m_private->enterFullscreen(); 776 776 } 777 777 … … 779 779 { 780 780 m_private->exitFullscreen(); 781 } 782 #endif 783 784 #if USE(NATIVE_FULLSCREEN_VIDEO) 785 bool MediaPlayer::canEnterFullscreen() const 786 { 787 return m_private->canEnterFullscreen(); 781 788 } 782 789 #endif -
trunk/Source/WebCore/platform/graphics/MediaPlayer.h
r116736 r116782 328 328 329 329 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO) || USE(NATIVE_FULLSCREEN_VIDEO) 330 bool enterFullscreen() const;330 void enterFullscreen(); 331 331 void exitFullscreen(); 332 #endif 333 334 #if USE(NATIVE_FULLSCREEN_VIDEO) 335 bool canEnterFullscreen() const; 332 336 #endif 333 337 -
trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h
r116736 r116782 119 119 120 120 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO) || USE(NATIVE_FULLSCREEN_VIDEO) 121 virtual bool enterFullscreen() const { return false;}121 virtual void enterFullscreen() const { } 122 122 virtual void exitFullscreen() { } 123 #endif 124 125 #if USE(NATIVE_FULLSCREEN_VIDEO) 126 virtual bool canEnterFullscreen() const { return false; } 123 127 #endif 124 128 -
trunk/Source/WebKit/chromium/ChangeLog
r116779 r116782 1 2012-05-11 Min Qin <qinmin@google.com> 2 3 split MediaPlayer::enterFullscreen into 2 seperate functions 4 https://bugs.webkit.org/show_bug.cgi?id=86052 5 6 Reviewed by Adam Barth. 7 8 In WebCore, we splitted bool enterFullscreen() into two seperate calls: 9 void enterFullscreen() and bool canEnterFullscreen() 10 This is the change in the chromium part that we needed to support the WebCore change 11 No behavior change, just refactoring. 12 13 * public/WebMediaPlayer.h: 14 (WebMediaPlayer): 15 (WebKit::WebMediaPlayer::enterFullscreen): 16 (WebKit::WebMediaPlayer::canEnterFullscreen): 17 * src/WebMediaPlayerClientImpl.cpp: 18 (WebKit::WebMediaPlayerClientImpl::enterFullscreen): 19 (WebKit): 20 (WebKit::WebMediaPlayerClientImpl::exitFullscreen): 21 * src/WebMediaPlayerClientImpl.h: 22 (WebMediaPlayerClientImpl): 23 * src/WebViewImpl.cpp: 24 (WebKit::WebViewImpl::enterFullScreenForElement): 25 1 26 2012-05-11 David Reveman <reveman@chromium.org> 2 27 -
trunk/Source/WebKit/chromium/public/WebMediaPlayer.h
r116736 r116782 185 185 virtual MediaKeyException cancelKeyRequest(const WebString& keySystem, const WebString& sessionId) { return MediaKeyExceptionKeySystemNotSupported; } 186 186 187 // Instuct WebMediaPlayer to enter/exit fullscreen. 187 // Instruct WebMediaPlayer to enter/exit fullscreen. 188 virtual void enterFullscreen() { } 189 virtual void exitFullscreen() { } 188 190 // Returns true if the player can enter fullscreen. 189 virtual bool enterFullscreen() { return false; } 190 virtual void exitFullscreen() { } 191 virtual bool canEnterFullscreen() const { return false; } 191 192 }; 192 193 -
trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp
r116736 r116782 341 341 342 342 #if USE(NATIVE_FULLSCREEN_VIDEO) 343 bool WebMediaPlayerClientImpl::enterFullscreen() const 344 { 345 if (m_webMediaPlayer) 346 return m_webMediaPlayer->enterFullscreen(); 347 return false; 343 void WebMediaPlayerClientImpl::enterFullscreen() 344 { 345 if (m_webMediaPlayer) 346 m_webMediaPlayer->enterFullscreen(); 348 347 } 349 348 … … 352 351 if (m_webMediaPlayer) 353 352 m_webMediaPlayer->exitFullscreen(); 353 } 354 355 bool WebMediaPlayerClientImpl::canEnterFullscreen() const 356 { 357 return m_webMediaPlayer && m_webMediaPlayer->canEnterFullscreen(); 354 358 } 355 359 #endif -
trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h
r116736 r116782 136 136 virtual unsigned videoDecodedByteCount() const; 137 137 #if USE(NATIVE_FULLSCREEN_VIDEO) 138 virtual bool enterFullscreen() const;138 virtual void enterFullscreen(); 139 139 virtual void exitFullscreen(); 140 virtual bool canEnterFullscreen() const; 140 141 #endif 141 142 -
trunk/Source/WebKit/chromium/src/WebViewImpl.cpp
r116736 r116782 1603 1603 if (element && element->isMediaElement()) { 1604 1604 HTMLMediaElement* mediaElement = static_cast<HTMLMediaElement*>(element); 1605 if (mediaElement->player() && mediaElement->player()->enterFullscreen()) 1605 if (mediaElement->player() && mediaElement->player()->canEnterFullscreen()) { 1606 mediaElement->player()->enterFullscreen(); 1606 1607 m_provisionalFullScreenElement = element; 1608 } 1607 1609 return; 1608 1610 }
Note: See TracChangeset
for help on using the changeset viewer.