- Revision
- 115771
- Author
- [email protected]
- Date
- 2012-05-01 17:39:31 -0700 (Tue, 01 May 2012)
Log Message
use USE(NATIVE_FULLSCREEN_VIDEO) instead of ENABLE(NATIVE_FULLSCREEN_VIDEO)
https://bugs.webkit.org/show_bug.cgi?id=85316
Patch by Min Qin <[email protected]> on 2012-05-01
Reviewed by Kent Tamura.
Source/WebCore:
NATIVE_FULLSCREEN_VIDEO means the fullscreen video is implemented by native
system view instead of webkit.
So it is more appropriate to use USE(NATIVE_FULLSCREEN_VIDEO).
This chagne also disabled the rendering of the fullscreen video element in webkit
when that flag is set.
Just renaming the variable, no new tests.
* dom/Document.cpp:
(WebCore::Document::webkitWillEnterFullScreenForElement):
(WebCore):
* platform/graphics/MediaPlayer.cpp:
(WebCore):
* platform/graphics/MediaPlayer.h:
(MediaPlayer):
* platform/graphics/MediaPlayerPrivate.h:
(MediaPlayerPrivateInterface):
Source/WebKit/chromium:
NATIVE_FULLSCREEN_VIDEO means the fullscreen video is implemented by native
system view instead of webkit
So it is more appropriate to use USE(NATIVE_FULLSCREEN_VIDEO).
Just rename the flag, no new tests
* features.gypi:
* src/WebMediaPlayerClientImpl.cpp:
(WebKit):
* src/WebMediaPlayerClientImpl.h:
(WebMediaPlayerClientImpl):
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::enterFullScreenForElement):
(WebKit::WebViewImpl::exitFullScreenForElement):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (115770 => 115771)
--- trunk/Source/WebCore/ChangeLog 2012-05-02 00:36:31 UTC (rev 115770)
+++ trunk/Source/WebCore/ChangeLog 2012-05-02 00:39:31 UTC (rev 115771)
@@ -1,3 +1,27 @@
+2012-05-01 Min Qin <[email protected]>
+
+ use USE(NATIVE_FULLSCREEN_VIDEO) instead of ENABLE(NATIVE_FULLSCREEN_VIDEO)
+ https://bugs.webkit.org/show_bug.cgi?id=85316
+
+ Reviewed by Kent Tamura.
+
+ NATIVE_FULLSCREEN_VIDEO means the fullscreen video is implemented by native
+ system view instead of webkit.
+ So it is more appropriate to use USE(NATIVE_FULLSCREEN_VIDEO).
+ This chagne also disabled the rendering of the fullscreen video element in webkit
+ when that flag is set.
+ Just renaming the variable, no new tests.
+
+ * dom/Document.cpp:
+ (WebCore::Document::webkitWillEnterFullScreenForElement):
+ (WebCore):
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore):
+ * platform/graphics/MediaPlayer.h:
+ (MediaPlayer):
+ * platform/graphics/MediaPlayerPrivate.h:
+ (MediaPlayerPrivateInterface):
+
2012-05-01 Jeffrey Pfau <[email protected]>
<rdar://problem/10422318> Support for web content filter delegate for filtering https content
Modified: trunk/Source/WebCore/dom/Document.cpp (115770 => 115771)
--- trunk/Source/WebCore/dom/Document.cpp 2012-05-02 00:36:31 UTC (rev 115770)
+++ trunk/Source/WebCore/dom/Document.cpp 2012-05-02 00:39:31 UTC (rev 115771)
@@ -5495,6 +5495,11 @@
m_fullScreenElement = element;
+#if USE(NATIVE_FULLSCREEN_VIDEO)
+ if (element && element->isMediaElement())
+ return;
+#endif
+
// Create a placeholder block for a the full-screen element, to keep the page from reflowing
// when the element is removed from the normal flow. Only do this for a RenderBox, as only
// a box will have a frameRect. The placeholder will be created in setFullScreenRenderer()
@@ -5513,7 +5518,7 @@
recalcStyle(Force);
}
-
+
void Document::webkitDidEnterFullScreenForElement(Element*)
{
if (!m_fullScreenElement)
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (115770 => 115771)
--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2012-05-02 00:36:31 UTC (rev 115770)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2012-05-02 00:39:31 UTC (rev 115771)
@@ -769,7 +769,7 @@
}
#endif
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO) || ENABLE(NATIVE_FULLSCREEN_VIDEO)
+#if ENABLE(PLUGIN_PROXY_FOR_VIDEO) || USE(NATIVE_FULLSCREEN_VIDEO)
bool MediaPlayer::enterFullscreen() const
{
return m_private->enterFullscreen();
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (115770 => 115771)
--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2012-05-02 00:36:31 UTC (rev 115770)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2012-05-02 00:39:31 UTC (rev 115771)
@@ -326,7 +326,7 @@
void setControls(bool);
#endif
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO) || ENABLE(NATIVE_FULLSCREEN_VIDEO)
+#if ENABLE(PLUGIN_PROXY_FOR_VIDEO) || USE(NATIVE_FULLSCREEN_VIDEO)
bool enterFullscreen() const;
void exitFullscreen();
#endif
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (115770 => 115771)
--- trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2012-05-02 00:36:31 UTC (rev 115770)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2012-05-02 00:39:31 UTC (rev 115771)
@@ -117,7 +117,7 @@
virtual void setControls(bool) { }
#endif
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO) || ENABLE(NATIVE_FULLSCREEN_VIDEO)
+#if ENABLE(PLUGIN_PROXY_FOR_VIDEO) || USE(NATIVE_FULLSCREEN_VIDEO)
virtual bool enterFullscreen() const { return false; }
virtual void exitFullscreen() { }
#endif
Modified: trunk/Source/WebKit/chromium/ChangeLog (115770 => 115771)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-05-02 00:36:31 UTC (rev 115770)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-05-02 00:39:31 UTC (rev 115771)
@@ -1,3 +1,24 @@
+2012-05-01 Min Qin <[email protected]>
+
+ use USE(NATIVE_FULLSCREEN_VIDEO) instead of ENABLE(NATIVE_FULLSCREEN_VIDEO)
+ https://bugs.webkit.org/show_bug.cgi?id=85316
+
+ Reviewed by Kent Tamura.
+
+ NATIVE_FULLSCREEN_VIDEO means the fullscreen video is implemented by native
+ system view instead of webkit
+ So it is more appropriate to use USE(NATIVE_FULLSCREEN_VIDEO).
+ Just rename the flag, no new tests
+
+ * features.gypi:
+ * src/WebMediaPlayerClientImpl.cpp:
+ (WebKit):
+ * src/WebMediaPlayerClientImpl.h:
+ (WebMediaPlayerClientImpl):
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::enterFullScreenForElement):
+ (WebKit::WebViewImpl::exitFullScreenForElement):
+
2012-05-01 Mark Pilgrim <[email protected]>
[Chromium] Additional instances of calling createAudioDevice directly
Modified: trunk/Source/WebKit/chromium/features.gypi (115770 => 115771)
--- trunk/Source/WebKit/chromium/features.gypi 2012-05-02 00:36:31 UTC (rev 115770)
+++ trunk/Source/WebKit/chromium/features.gypi 2012-05-02 00:39:31 UTC (rev 115771)
@@ -137,14 +137,13 @@
['OS=="android"', {
'feature_defines': [
'ENABLE_CALENDAR_PICKER=0',
- 'ENABLE_NATIVE_FULLSCREEN_VIDEO=1',
'ENABLE_PAGE_POPUP=0',
'ENABLE_WEB_AUDIO=0',
+ 'WTF_USE_NATIVE_FULLSCREEN_VIDEO=1',
],
}, {
'feature_defines': [
'ENABLE_CALENDAR_PICKER=1',
- 'ENABLE_NATIVE_FULLSCREEN_VIDEO=0',
'ENABLE_PAGE_POPUP=1',
'ENABLE_WEB_AUDIO=1',
],
Modified: trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp (115770 => 115771)
--- trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp 2012-05-02 00:36:31 UTC (rev 115770)
+++ trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp 2012-05-02 00:39:31 UTC (rev 115771)
@@ -339,7 +339,7 @@
m_webMediaPlayer->pause();
}
-#if ENABLE(NATIVE_FULLSCREEN_VIDEO)
+#if USE(NATIVE_FULLSCREEN_VIDEO)
bool WebMediaPlayerClientImpl::enterFullscreen() const
{
if (m_webMediaPlayer)
Modified: trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h (115770 => 115771)
--- trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h 2012-05-02 00:36:31 UTC (rev 115770)
+++ trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h 2012-05-02 00:39:31 UTC (rev 115771)
@@ -134,7 +134,7 @@
virtual unsigned droppedFrameCount() const;
virtual unsigned audioDecodedByteCount() const;
virtual unsigned videoDecodedByteCount() const;
-#if ENABLE(NATIVE_FULLSCREEN_VIDEO)
+#if USE(NATIVE_FULLSCREEN_VIDEO)
virtual bool enterFullscreen() const;
virtual void exitFullscreen();
#endif
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (115770 => 115771)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-05-02 00:36:31 UTC (rev 115770)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-05-02 00:39:31 UTC (rev 115771)
@@ -1580,7 +1580,7 @@
return;
}
-#if ENABLE(NATIVE_FULLSCREEN_VIDEO)
+#if USE(NATIVE_FULLSCREEN_VIDEO)
if (element && element->isMediaElement()) {
HTMLMediaElement* mediaElement = static_cast<HTMLMediaElement*>(element);
if (mediaElement->player() && mediaElement->player()->enterFullscreen())
@@ -1599,7 +1599,7 @@
// The client is exiting full screen, so don't send a notification.
if (m_isCancelingFullScreen)
return;
-#if ENABLE(NATIVE_FULLSCREEN_VIDEO)
+#if USE(NATIVE_FULLSCREEN_VIDEO)
if (element && element->isMediaElement()) {
HTMLMediaElement* mediaElement = static_cast<HTMLMediaElement*>(element);
if (mediaElement->player())
