Changeset 88546 in webkit

Timestamp:

Jun 10, 2011 10:05:31 AM (13 years ago)

Author:

Darin Adler

Message:

2011-06-10 Darin Adler <Darin Adler>

Reviewed by Eric Carlson.

REGRESSION: Fullscreen video controller can't be dragged
​https://bugs.webkit.org/show_bug.cgi?id=62462

No regression test because we don't have machinery for testing the fullscreen
mode. We may find a way to add this in the future.

• html/shadow/MediaControlElements.cpp: (WebCore::MediaControlPanelElement::MediaControlPanelElement): Initialize new booleans related to dragging. (WebCore::MediaControlPanelElement::startDrag): Added. Starts drag if dragging is allowed and a drag isn't already in progress. (WebCore::MediaControlPanelElement::continueDrag): Added. Moves the window if dragging is already in progress. (WebCore::MediaControlPanelElement::endDrag): Added. Ends the capture that is done during the dragging process. (WebCore::MediaControlPanelElement::setPosition): Added. Positions the panel using explicit top/left. (WebCore::MediaControlPanelElement::resetPosition): Added. Removes the positioning done by setPosition. (WebCore::MediaControlPanelElement::defaultEventHandler): Added. Calls startDrag, continueDrag, and endDrag in response to mouse events. (WebCore::MediaControlPanelElement::setCanBeDragged): Added.
• html/shadow/MediaControlElements.h: Added new function and data members as mentioned above.

• html/shadow/MediaControlRootElement.cpp: (WebCore::MediaControlRootElement::enteredFullscreen): Call setCanBeDragged(true) so you can drag the panel while in fullscreen. (WebCore::MediaControlRootElement::exitedFullscreen): Call setCanBeDragged(false) so you can't drag the panel while not in fullscreen. Also call resetPosition so position changes from dragging don't affect the panel in other contexts.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-10  Darin Adler  <darin@apple.com>
+
+        Reviewed by Eric Carlson.
+
+        REGRESSION: Fullscreen video controller can't be dragged
+        https://bugs.webkit.org/show_bug.cgi?id=62462
+
+        No regression test because we don't have machinery for testing the fullscreen
+        mode. We may find a way to add this in the future.
+
+        * html/shadow/MediaControlElements.cpp:
+        (WebCore::MediaControlPanelElement::MediaControlPanelElement): Initialize new
+        booleans related to dragging.
+        (WebCore::MediaControlPanelElement::startDrag): Added. Starts drag if dragging
+        is allowed and a drag isn't already in progress.
+        (WebCore::MediaControlPanelElement::continueDrag): Added. Moves the window if
+        dragging is already in progress.
+        (WebCore::MediaControlPanelElement::endDrag): Added. Ends the capture that is
+        done during the dragging process.
+        (WebCore::MediaControlPanelElement::setPosition): Added. Positions the panel
+        using explicit top/left.
+        (WebCore::MediaControlPanelElement::resetPosition): Added. Removes the positioning
+        done by setPosition.
+        (WebCore::MediaControlPanelElement::defaultEventHandler): Added. Calls startDrag,
+        continueDrag, and endDrag in response to mouse events.
+        (WebCore::MediaControlPanelElement::setCanBeDragged): Added.
+        * html/shadow/MediaControlElements.h: Added new function and data members
+        as mentioned above.
+
+        * html/shadow/MediaControlRootElement.cpp:
+        (WebCore::MediaControlRootElement::enteredFullscreen): Call setCanBeDragged(true)
+        so you can drag the panel while in fullscreen.
+        (WebCore::MediaControlRootElement::exitedFullscreen): Call setCanBeDragged(false)
+        so you can't drag the panel while not in fullscreen. Also call resetPosition so
+        position changes from dragging don't affect the panel in other contexts.
+
 2011-06-10  Darin Adler  <darin@apple.com>
 

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

@@ -34 +34 @@
 
 #include "CSSStyleSelector.h"
+#include "CSSValueKeywords.h"
 #include "EventNames.h"
 #include "FloatConversion.h"
@@ -100 +101 @@
 inline MediaControlPanelElement::MediaControlPanelElement(HTMLMediaElement* mediaElement)
     : MediaControlElement(mediaElement)
+    , m_canBeDragged(false)
+    , m_isBeingDragged(false)
 {
 }
@@ -117 +120 @@
     DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-panel"));
     return id;
+}
+
+void MediaControlPanelElement::startDrag(const IntPoint& eventLocation)
+{
+    if (!m_canBeDragged)
+        return;
+
+    if (m_isBeingDragged)
+        return;
+
+    RenderObject* renderer = this->renderer();
+    if (!renderer || !renderer->isBox())
+        return;
+
+    Frame* frame = document()->frame();
+    if (!frame)
+        return;
+
+    m_dragStartPosition = toRenderBox(renderer)->location();
+    m_dragStartEventLocation = eventLocation;
+
+    frame->eventHandler()->setCapturingMouseEventsNode(this);
+
+    m_isBeingDragged = true;
+}
+
+void MediaControlPanelElement::continueDrag(const IntPoint& eventLocation)
+{
+    if (!m_isBeingDragged)
+        return;
+
+    IntSize distanceDragged = eventLocation - m_dragStartEventLocation;
+    setPosition(m_dragStartPosition + distanceDragged);
+}
+
+void MediaControlPanelElement::endDrag()
+{
+    if (!m_isBeingDragged)
+        return;
+
+    m_isBeingDragged = false;
+
+    Frame* frame = document()->frame();
+    if (!frame)
+        return;
+
+    frame->eventHandler()->setCapturingMouseEventsNode(0);
+}
+
+void MediaControlPanelElement::setPosition(const IntPoint& position)
+{
+    CSSMutableStyleDeclaration* style = getInlineStyleDecl();
+
+    double left = position.x();
+    double top = position.y();
+
+    // Set the left and top to control the panel's position; this depends on it being absolute positioned.
+    // Set the margin to zero since the position passed in will already include the effect of the margin.
+    style->setProperty(CSSPropertyLeft, left, CSSPrimitiveValue::CSS_PX);
+    style->setProperty(CSSPropertyTop, top, CSSPrimitiveValue::CSS_PX);
+    style->setProperty(CSSPropertyMarginLeft, 0.0, CSSPrimitiveValue::CSS_PX);
+    style->setProperty(CSSPropertyMarginTop, 0.0, CSSPrimitiveValue::CSS_PX);
+}
+
+void MediaControlPanelElement::resetPosition()
+{
+    CSSMutableStyleDeclaration* style = getInlineStyleDecl();
+
+    style->removeProperty(CSSPropertyLeft);
+    style->removeProperty(CSSPropertyTop);
+    style->removeProperty(CSSPropertyMarginLeft);
+    style->removeProperty(CSSPropertyMarginTop);
+}
+
+void MediaControlPanelElement::defaultEventHandler(Event* event)
+{
+    MediaControlElement::defaultEventHandler(event);
+
+    if (event->isMouseEvent()) {
+        IntPoint location = static_cast<MouseEvent*>(event)->absoluteLocation();
+        if (event->type() == eventNames().mousedownEvent) {
+            startDrag(location);
+            event->setDefaultHandled();
+        } else if (event->type() == eventNames().mousemoveEvent)
+            continueDrag(location);
+        else if (event->type() == eventNames().mouseupEvent) {
+            continueDrag(location);
+            endDrag();
+            event->setDefaultHandled();
+        }
+    }
+}
+
+void MediaControlPanelElement::setCanBeDragged(bool canBeDragged)
+{
+    if (m_canBeDragged == canBeDragged)
+        return;
+
+    m_canBeDragged = canBeDragged;
+
+    if (!canBeDragged)
+        endDrag();
 }
 

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

@@ -100 +100 @@
     static PassRefPtr<MediaControlPanelElement> create(HTMLMediaElement*);
 
+    void setCanBeDragged(bool);
+    void resetPosition();
+
 private:
     MediaControlPanelElement(HTMLMediaElement*);
     virtual MediaControlElementType displayType() const;
     virtual const AtomicString& shadowPseudoId() const;
+    virtual void defaultEventHandler(Event*);
+
+    void startDrag(const IntPoint& eventLocation);
+    void continueDrag(const IntPoint& eventLocation);
+    void endDrag();
+
+    void setPosition(const IntPoint&);
+
+    bool m_canBeDragged;
+    bool m_isBeingDragged;
+    IntPoint m_dragStartPosition;
+    IntPoint m_dragStartEventLocation;
 };
 

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

@@ -452 +452 @@
     }
 
+    m_panel->setCanBeDragged(true);
+
     startHideFullscreenControlsTimer();
 }
@@ -464 +466 @@
     m_seekForwardButton->show();
     m_returnToRealTimeButton->show();
+
+    m_panel->setCanBeDragged(false);
+
+    // We will keep using the panel, but we want it to go back to the standard position.
+    // This will matter right away because we use the panel even when not fullscreen.
+    // And if we reenter fullscreen we also want the panel in the standard position.
+    m_panel->resetPosition();
 
     stopHideFullscreenControlsTimer();