Changeset 83600 in webkit

Timestamp:

Apr 12, 2011 9:44:56 AM (13 years ago)

Author:

Dimitri Glazkov

Message:

2011-04-11 Dimitri Glazkov <Dimitri Glazkov>

Reviewed by Eric Carlson.

Should MediaControls::changedNetworkState fiddle with Fullscreen controls?
​https://bugs.webkit.org/show_bug.cgi?id=58163

Covered by existing tests and manual-tests/media-controls.html.

• html/shadow/MediaControls.cpp: (WebCore::MediaControls::reset): Moved fullscreen showing/hiding here. (WebCore::MediaControls::changedNetworkState): ... from here.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/shadow/MediaControlRootElement.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-11  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Reviewed by Eric Carlson.
+
+        Should MediaControls::changedNetworkState fiddle with Fullscreen controls?
+        https://bugs.webkit.org/show_bug.cgi?id=58163
+
+        Covered by existing tests and manual-tests/media-controls.html.
+
+        * html/shadow/MediaControls.cpp:
+        (WebCore::MediaControls::reset): Moved fullscreen showing/hiding here.
+        (WebCore::MediaControls::changedNetworkState): ... from here.
+
 2011-04-12  Ilya Tikhonovsky  <loislo@chromium.org>
 

trunk/Source/WebCore/html/shadow/MediaControlRootElement.cpp

@@ -281 +281 @@
 
     changedNetworkState();
+
+    if (m_mediaElement->supportsFullscreen())
+        m_fullScreenButton->show();
+    else
+        m_fullScreenButton->hide();
+
     float duration = m_mediaElement->duration();
     if (!isnan(duration) || page->theme()->hasOwnDisabledStateHandlingFor(MediaSliderPart)) {
@@ -376 +382 @@
 void MediaControlRootElement::changedNetworkState()
 {
-    // FIXME: Why are we changing fullscreen button visibility here? <http://webkit.org/b/58163>
-    if (m_mediaElement->supportsFullscreen())
-        m_fullScreenButton->show();
-    else
-        m_fullScreenButton->hide();
-
     if (m_statusDisplay)
         m_statusDisplay->update();