Changeset 115125 in webkit

Timestamp:

Apr 24, 2012 3:50:05 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Extra display logic for the media control panel element
​https://bugs.webkit.org/show_bug.cgi?id=82476

Patch by Victor Carbune <​vcarbune@adobe.com> on 2012-04-24
Reviewed by Eric Carlson.

Source/WebCore:

This patch fixes a bug which caused the controls to be displayed
when they should remain hidden. Added an extra variable to the
panel elements which properly keeps the state of the panel (visible or not).

Test: media/video-controls-toggling.html

• html/shadow/MediaControlElements.cpp:

(WebCore::MediaControlPanelElement::MediaControlPanelElement): Added the
variable m_isDisplayed to hold the state whether the panel is visible or not.
(WebCore::MediaControlPanelElement::makeOpaque): Showing the panel only if it
is visible.
(WebCore::MediaControlPanelElement::makeTransparent): Enabled the transition
timer which sets the display:none property on the controls.
(WebCore::MediaControlPanelElement::setIsDisplayed): Setter for the state variable.
(WebCore):

• html/shadow/MediaControlElements.h:

(MediaControlPanelElement):

• html/shadow/MediaControlRootElement.cpp:

(WebCore::MediaControlRootElement::show): Updated the panel visibility state.
(WebCore::MediaControlRootElement::hide): Updated the panel visibility state.

• html/shadow/MediaControlRootElementChromium.cpp:

(WebCore::MediaControlRootElementChromium::show): Updated the panel visibility state.
(WebCore::MediaControlRootElementChromium::hide): Updated the panel visibility state.

LayoutTests:

Added test to ensure that controls are not displayed when
the controls attribute is not set.

• media/video-controls-toggling-expected.txt: Added.
• media/video-controls-toggling.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/video-controls-toggling-expected.txt (added)
• LayoutTests/media/video-controls-toggling.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/shadow/MediaControlElements.cpp (modified) (4 diffs)
• Source/WebCore/html/shadow/MediaControlElements.h (modified) (2 diffs)
• Source/WebCore/html/shadow/MediaControlRootElement.cpp (modified) (2 diffs)
• Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-04-24  Victor Carbune  <vcarbune@adobe.com>
+
+        Extra display logic for the media control panel element
+        https://bugs.webkit.org/show_bug.cgi?id=82476
+
+        Reviewed by Eric Carlson.
+
+        Added test to ensure that controls are not displayed when
+        the controls attribute is not set.
+
+        * media/video-controls-toggling-expected.txt: Added.
+        * media/video-controls-toggling.html: Added.
+
 2012-04-24  Alexandru Chiculita  <achicu@adobe.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-24  Victor Carbune  <vcarbune@adobe.com>
+
+        Extra display logic for the media control panel element
+        https://bugs.webkit.org/show_bug.cgi?id=82476
+
+        Reviewed by Eric Carlson.
+
+        This patch fixes a bug which caused the controls to be displayed
+        when they should remain hidden. Added an extra variable to the
+        panel elements which properly keeps the state of the panel (visible or not).
+
+        Test: media/video-controls-toggling.html
+
+        * html/shadow/MediaControlElements.cpp:
+        (WebCore::MediaControlPanelElement::MediaControlPanelElement): Added the
+        variable m_isDisplayed to hold the state whether the panel is visible or not.
+        (WebCore::MediaControlPanelElement::makeOpaque): Showing the panel only if it
+        is visible.
+        (WebCore::MediaControlPanelElement::makeTransparent): Enabled the transition
+        timer which sets the display:none property on the controls.
+        (WebCore::MediaControlPanelElement::setIsDisplayed): Setter for the state variable.
+        (WebCore):
+        * html/shadow/MediaControlElements.h:
+        (MediaControlPanelElement):
+        * html/shadow/MediaControlRootElement.cpp:
+        (WebCore::MediaControlRootElement::show): Updated the panel visibility state.
+        (WebCore::MediaControlRootElement::hide): Updated the panel visibility state.
+        * html/shadow/MediaControlRootElementChromium.cpp:
+        (WebCore::MediaControlRootElementChromium::show): Updated the panel visibility state.
+        (WebCore::MediaControlRootElementChromium::hide): Updated the panel visibility state.
+
 2012-04-24  Alexandru Chiculita  <achicu@adobe.com>
 

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

@@ -109 +109 @@
     , m_canBeDragged(false)
     , m_isBeingDragged(false)
+    , m_isDisplayed(false)
     , m_opaque(true)
     , m_transitionTimer(this, &MediaControlPanelElement::transitionTimerFired)
@@ -242 +243 @@
     m_opaque = true;
 
-    // FIXME(BUG 79347): The display:none property should be toggled below only
-    // when display logic is introduced.
-    // show();
+    if (m_isDisplayed)
+        show();
 }
 
@@ -258 +258 @@
     m_opaque = false;
 
-    // FIXME(BUG 79347): The display:none property should be toggled below
-    // (through the timer start) when display logic is introduced.
-    // startTimer();
+    startTimer();
 }
 
@@ -291 +289 @@
     if (!canBeDragged)
         endDrag();
+}
+
+void MediaControlPanelElement::setIsDisplayed(bool isDisplayed)
+{
+    m_isDisplayed = isDisplayed;
 }
 

trunk/Source/WebCore/html/shadow/MediaControlElements.h

@@ -110 +110 @@
 
     void setCanBeDragged(bool);
+    void setIsDisplayed(bool);
+
     void resetPosition();
     void makeOpaque();
@@ -132 +134 @@
     bool m_canBeDragged;
     bool m_isBeingDragged;
+    bool m_isDisplayed;
     bool m_opaque;
     LayoutPoint m_dragStartEventLocation;

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

@@ -285 +285 @@
 void MediaControlRootElement::show()
 {
+    m_panel->setIsDisplayed(true);
     m_panel->show();
 }
@@ -290 +291 @@
 void MediaControlRootElement::hide()
 {
+    m_panel->setIsDisplayed(false);
     m_panel->hide();
 }

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

@@ -171 +171 @@
 void MediaControlRootElementChromium::show()
 {
+    m_panel->setIsDisplayed(true);
     m_panel->show();
 }
@@ -176 +177 @@
 void MediaControlRootElementChromium::hide()
 {
+    m_panel->setIsDisplayed(false);
     m_panel->hide();
 }