- Revision
- 120949
- Author
- [email protected]
- Date
- 2012-06-21 11:17:21 -0700 (Thu, 21 Jun 2012)
Log Message
remove ENABLE_FULLSCREEN_MEDIA_CONTROL flag
https://bugs.webkit.org/show_bug.cgi?id=89614
Patch by Min Qin <[email protected]> on 2012-06-21
Reviewed by Eric Carlson.
Source/WebCore:
Desktop chromium also starts to use fullscreen button after https://bugs.webkit.org/show_bug.cgi?id=88818
we don't need this flag any more
No test needed as this change just removes a flag.
* html/shadow/MediaControlRootElementChromium.cpp:
(WebCore::MediaControlRootElementChromium::MediaControlRootElementChromium):
(WebCore::MediaControlRootElementChromium::create):
(WebCore::MediaControlRootElementChromium::setMediaController):
(WebCore::MediaControlRootElementChromium::reset):
(WebCore::MediaControlRootElementChromium::reportedError):
* html/shadow/MediaControlRootElementChromium.h:
(MediaControlRootElementChromium):
Source/WebKit/chromium:
Since desktop chrome now has fullscreen button, we don't need this flag anymore
* features.gypi:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (120948 => 120949)
--- trunk/Source/WebCore/ChangeLog 2012-06-21 18:14:44 UTC (rev 120948)
+++ trunk/Source/WebCore/ChangeLog 2012-06-21 18:17:21 UTC (rev 120949)
@@ -1,3 +1,23 @@
+2012-06-21 Min Qin <[email protected]>
+
+ remove ENABLE_FULLSCREEN_MEDIA_CONTROL flag
+ https://bugs.webkit.org/show_bug.cgi?id=89614
+
+ Reviewed by Eric Carlson.
+
+ Desktop chromium also starts to use fullscreen button after https://bugs.webkit.org/show_bug.cgi?id=88818
+ we don't need this flag any more
+ No test needed as this change just removes a flag.
+
+ * html/shadow/MediaControlRootElementChromium.cpp:
+ (WebCore::MediaControlRootElementChromium::MediaControlRootElementChromium):
+ (WebCore::MediaControlRootElementChromium::create):
+ (WebCore::MediaControlRootElementChromium::setMediaController):
+ (WebCore::MediaControlRootElementChromium::reset):
+ (WebCore::MediaControlRootElementChromium::reportedError):
+ * html/shadow/MediaControlRootElementChromium.h:
+ (MediaControlRootElementChromium):
+
2012-06-21 Hayato Ito <[email protected]>
Modify event re-targeting algorithm so that we can tell which distributed node is clicked.
Modified: trunk/Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp (120948 => 120949)
--- trunk/Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp 2012-06-21 18:14:44 UTC (rev 120948)
+++ trunk/Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp 2012-06-21 18:17:21 UTC (rev 120949)
@@ -74,9 +74,7 @@
, m_timeline(0)
, m_panelMuteButton(0)
, m_volumeSlider(0)
-#if ENABLE(FULLSCREEN_MEDIA_CONTROLS)
, m_fullscreenButton(0)
-#endif
, m_panel(0)
, m_enclosure(0)
#if ENABLE(VIDEO_TRACK)
@@ -146,13 +144,11 @@
if (ec)
return 0;
-#if ENABLE(FULLSCREEN_MEDIA_CONTROLS)
RefPtr<MediaControlFullscreenButtonElement> fullscreenButton = MediaControlFullscreenButtonElement::create(document, controls.get());
controls->m_fullscreenButton = fullscreenButton.get();
panel->appendChild(fullscreenButton.release(), ec, true);
if (ec)
return 0;
-#endif
controls->m_panel = panel.get();
enclosure->appendChild(panel.release(), ec, true);
@@ -185,10 +181,8 @@
m_panelMuteButton->setMediaController(controller);
if (m_volumeSlider)
m_volumeSlider->setMediaController(controller);
-#if ENABLE(FULLSCREEN_MEDIA_CONTROLS)
if (m_fullscreenButton)
m_fullscreenButton->setMediaController(controller);
-#endif
if (m_panel)
m_panel->setMediaController(controller);
if (m_enclosure)
@@ -245,9 +239,8 @@
if (m_volumeSlider)
m_volumeSlider->setVolume(m_mediaController->volume());
-#if ENABLE(FULLSCREEN_MEDIA_CONTROLS)
m_fullscreenButton->show();
-#endif
+
makeOpaque();
}
@@ -312,9 +305,7 @@
m_timeline->hide();
m_panelMuteButton->hide();
m_volumeSlider->hide();
-#if ENABLE(FULLSCREEN_MEDIA_CONTROLS)
m_fullscreenButton->hide();
-#endif
}
void MediaControlRootElementChromium::updateStatusDisplay()
Modified: trunk/Source/WebCore/html/shadow/MediaControlRootElementChromium.h (120948 => 120949)
--- trunk/Source/WebCore/html/shadow/MediaControlRootElementChromium.h 2012-06-21 18:14:44 UTC (rev 120948)
+++ trunk/Source/WebCore/html/shadow/MediaControlRootElementChromium.h 2012-06-21 18:17:21 UTC (rev 120949)
@@ -142,9 +142,7 @@
MediaControlTimelineElement* m_timeline;
MediaControlPanelMuteButtonElement* m_panelMuteButton;
MediaControlVolumeSliderElement* m_volumeSlider;
-#if ENABLE(FULLSCREEN_MEDIA_CONTROLS)
MediaControlFullscreenButtonElement* m_fullscreenButton;
-#endif
MediaControlPanelElement* m_panel;
MediaControlChromiumEnclosureElement* m_enclosure;
#if ENABLE(VIDEO_TRACK)
Modified: trunk/Source/WebKit/chromium/ChangeLog (120948 => 120949)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-06-21 18:14:44 UTC (rev 120948)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-06-21 18:17:21 UTC (rev 120949)
@@ -1,3 +1,14 @@
+2012-06-21 Min Qin <[email protected]>
+
+ remove ENABLE_FULLSCREEN_MEDIA_CONTROL flag
+ https://bugs.webkit.org/show_bug.cgi?id=89614
+
+ Reviewed by Eric Carlson.
+
+ Since desktop chrome now has fullscreen button, we don't need this flag anymore
+
+ * features.gypi:
+
2012-06-20 Zeev Lieber <[email protected]>
[Chromium] Damage tracker is not used without partial swap, causing valid render passes to be removed
Modified: trunk/Source/WebKit/chromium/features.gypi (120948 => 120949)
--- trunk/Source/WebKit/chromium/features.gypi 2012-06-21 18:14:44 UTC (rev 120948)
+++ trunk/Source/WebKit/chromium/features.gypi 2012-06-21 18:17:21 UTC (rev 120949)
@@ -136,7 +136,6 @@
'feature_defines': [
'ENABLE_CALENDAR_PICKER=0',
'ENABLE_FONT_BOOSTING=1',
- 'ENABLE_FULLSCREEN_MEDIA_CONTROLS=1',
'ENABLE_INPUT_SPEECH=0',
'ENABLE_INPUT_TYPE_DATETIME=1',
'ENABLE_INPUT_TYPE_DATETIMELOCAL=1',
@@ -162,7 +161,6 @@
'feature_defines': [
'ENABLE_CALENDAR_PICKER=1',
'ENABLE_FONT_BOOSTING=0',
- 'ENABLE_FULLSCREEN_MEDIA_CONTROLS=1',
'ENABLE_INPUT_SPEECH=1',
'ENABLE_JAVASCRIPT_I18N_API=1',
'ENABLE_LEGACY_NOTIFICATIONS=1',
