Title: [166919] trunk/Source/WebCore
Revision
166919
Author
calva...@igalia.com
Date
2014-04-08 01:15:39 -0700 (Tue, 08 Apr 2014)

Log Message

[GTK] Remove media controls dead code
https://bugs.webkit.org/show_bug.cgi?id=131300

Reviewed by Eric Carlson.

MediaControlsGtk.cpp is no longer used so we can remove it from
the repo.

No new tests needed.

* PlatformGTK.cmake: Remove html/shadow/MediaControlsGtk.cpp from
compilation.
* html/shadow/MediaControlsGtk.cpp: Removed.

Modified Paths

Removed Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (166918 => 166919)


--- trunk/Source/WebCore/ChangeLog	2014-04-08 08:13:11 UTC (rev 166918)
+++ trunk/Source/WebCore/ChangeLog	2014-04-08 08:15:39 UTC (rev 166919)
@@ -1,3 +1,19 @@
+2014-04-08  Xabier Rodriguez Calvar  <calva...@igalia.com>
+
+        [GTK] Remove media controls dead code
+        https://bugs.webkit.org/show_bug.cgi?id=131300
+
+        Reviewed by Eric Carlson.
+
+        MediaControlsGtk.cpp is no longer used so we can remove it from
+        the repo.
+
+        No new tests needed.
+
+        * PlatformGTK.cmake: Remove html/shadow/MediaControlsGtk.cpp from
+        compilation.
+        * html/shadow/MediaControlsGtk.cpp: Removed.
+
 2014-04-08  Mihnea Ovidenie  <mih...@adobe.com>
 
         [CSSRegions] Fixed positioned elements in named flows have fragmented content

Modified: trunk/Source/WebCore/PlatformGTK.cmake (166918 => 166919)


--- trunk/Source/WebCore/PlatformGTK.cmake	2014-04-08 08:13:11 UTC (rev 166918)
+++ trunk/Source/WebCore/PlatformGTK.cmake	2014-04-08 08:15:39 UTC (rev 166919)
@@ -27,8 +27,6 @@
 list(APPEND WebCore_SOURCES
     editing/SmartReplace.cpp
 
-    html/shadow/MediaControlsGtk.cpp
-
     loader/soup/CachedRawResourceSoup.cpp
     loader/soup/SubresourceLoaderSoup.cpp
 

Deleted: trunk/Source/WebCore/html/shadow/MediaControlsGtk.cpp (166918 => 166919)


--- trunk/Source/WebCore/html/shadow/MediaControlsGtk.cpp	2014-04-08 08:13:11 UTC (rev 166918)
+++ trunk/Source/WebCore/html/shadow/MediaControlsGtk.cpp	2014-04-08 08:15:39 UTC (rev 166919)
@@ -1,378 +0,0 @@
-/*
- * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
- * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
- * Copyright (C) 2012 Zan Dobersek <zandober...@gmail.com>
- * Copyright (C) 2012 Igalia S.L.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if ENABLE(VIDEO)
-#include "MediaControlsGtk.h"
-
-namespace WebCore {
-
-class MediaControlsGtkEventListener : public EventListener {
-public:
-    static PassRefPtr<MediaControlsGtkEventListener> create(MediaControlsGtk* mediaControls) { return adoptRef(new MediaControlsGtkEventListener(mediaControls)); }
-    static const MediaControlsGtkEventListener* cast(const EventListener* listener)
-    {
-        return listener->type() == GObjectEventListenerType
-            ? static_cast<const MediaControlsGtkEventListener*>(listener)
-            : 0;
-    }
-
-    virtual bool operator==(const EventListener& other);
-
-private:
-    MediaControlsGtkEventListener(MediaControlsGtk* mediaControls)
-        : EventListener(GObjectEventListenerType)
-        , m_mediaControls(mediaControls)
-    {
-    }
-
-    virtual void handleEvent(ScriptExecutionContext*, Event*);
-
-    MediaControlsGtk* m_mediaControls;
-};
-
-MediaControlsGtk::MediaControlsGtk(Document& document)
-    : MediaControls(document)
-    , m_durationDisplay(0)
-    , m_enclosure(0)
-    , m_closedCaptionsTrackList(0)
-    , m_closedCaptionsContainer(0)
-    , m_eventListener(0)
-{
-}
-
-PassRefPtr<MediaControls> MediaControls::create(Document& document)
-{
-    return MediaControlsGtk::createControls(document);
-}
-
-PassRefPtr<MediaControlsGtk> MediaControlsGtk::createControls(Document& document)
-{
-    if (!document.page())
-        return 0;
-
-    RefPtr<MediaControlsGtk> controls = adoptRef(new MediaControlsGtk(document));
-
-    if (controls->initializeControls(document))
-        return controls.release();
-
-    return 0;
-}
-
-bool MediaControlsGtk::initializeControls(Document& document)
-{
-    // Create an enclosing element for the panel so we can visually offset the controls correctly.
-    RefPtr<MediaControlPanelEnclosureElement> enclosure = MediaControlPanelEnclosureElement::create(document);
-    RefPtr<MediaControlPanelElement> panel = MediaControlPanelElement::create(document);
-    ExceptionCode exceptionCode;
-
-    RefPtr<MediaControlPlayButtonElement> playButton = MediaControlPlayButtonElement::create(document);
-    m_playButton = playButton.get();
-    panel->appendChild(playButton.release(), exceptionCode);
-    if (exceptionCode)
-        return false;
-
-    RefPtr<MediaControlTimelineElement> timeline = MediaControlTimelineElement::create(document, this);
-    m_timeline = timeline.get();
-    panel->appendChild(timeline.release(), exceptionCode);
-    if (exceptionCode)
-        return false;
-
-    RefPtr<MediaControlCurrentTimeDisplayElement> currentTimeDisplay = MediaControlCurrentTimeDisplayElement::create(document);
-    m_currentTimeDisplay = currentTimeDisplay.get();
-    m_currentTimeDisplay->hide();
-    panel->appendChild(currentTimeDisplay.release(), exceptionCode);
-    if (exceptionCode)
-        return false;
-
-    RefPtr<MediaControlTimeRemainingDisplayElement> durationDisplay = MediaControlTimeRemainingDisplayElement::create(document);
-    m_durationDisplay = durationDisplay.get();
-    panel->appendChild(durationDisplay.release(), exceptionCode);
-    if (exceptionCode)
-        return false;
-
-    if (document.page()->theme().supportsClosedCaptioning()) {
-        RefPtr<MediaControlClosedCaptionsContainerElement> closedCaptionsContainer = MediaControlClosedCaptionsContainerElement::create(document);
-
-        RefPtr<MediaControlClosedCaptionsTrackListElement> closedCaptionsTrackList = MediaControlClosedCaptionsTrackListElement::create(document, this);
-        m_closedCaptionsTrackList = closedCaptionsTrackList.get();
-        closedCaptionsContainer->appendChild(closedCaptionsTrackList.release(), exceptionCode);
-        if (exceptionCode)
-            return false;
-
-        RefPtr<MediaControlToggleClosedCaptionsButtonElement> toggleClosedCaptionsButton = MediaControlToggleClosedCaptionsButtonElement::create(document, this);
-        m_toggleClosedCaptionsButton = toggleClosedCaptionsButton.get();
-        panel->appendChild(toggleClosedCaptionsButton.release(), exceptionCode);
-        if (exceptionCode)
-            return false;
-
-        m_closedCaptionsContainer = closedCaptionsContainer.get();
-        appendChild(closedCaptionsContainer.release(), exceptionCode);
-        if (exceptionCode)
-            return false;
-    }
-
-    RefPtr<MediaControlFullscreenButtonElement> fullscreenButton = MediaControlFullscreenButtonElement::create(document);
-    m_fullScreenButton = fullscreenButton.get();
-    panel->appendChild(fullscreenButton.release(), exceptionCode);
-    if (exceptionCode)
-        return false;
-
-    RefPtr<MediaControlPanelMuteButtonElement> panelMuteButton = MediaControlPanelMuteButtonElement::create(document, this);
-    m_panelMuteButton = panelMuteButton.get();
-    panel->appendChild(panelMuteButton.release(), exceptionCode);
-    if (exceptionCode)
-        return false;
-
-    RefPtr<MediaControlVolumeSliderContainerElement> sliderContainer = MediaControlVolumeSliderContainerElement::create(document);
-    m_volumeSliderContainer = sliderContainer.get();
-    panel->appendChild(sliderContainer.release(), exceptionCode);
-    if (exceptionCode)
-        return false;
-
-    RefPtr<MediaControlPanelVolumeSliderElement> slider = MediaControlPanelVolumeSliderElement::create(document);
-    m_volumeSlider = slider.get();
-    m_volumeSlider->setClearMutedOnUserInteraction(true);
-    m_volumeSliderContainer->appendChild(slider.release(), exceptionCode);
-    if (exceptionCode)
-        return false;
-
-    m_panel = panel.get();
-    enclosure->appendChild(panel.release(), exceptionCode);
-    if (exceptionCode)
-        return false;
-
-    m_enclosure = enclosure.get();
-    appendChild(enclosure.release(), exceptionCode);
-    if (exceptionCode)
-        return false;
-
-    return true;
-}
-
-void MediaControlsGtk::setMediaController(MediaControllerInterface* controller)
-{
-    if (m_mediaController == controller)
-        return;
-
-    MediaControls::setMediaController(controller);
-
-    if (m_durationDisplay)
-        m_durationDisplay->setMediaController(controller);
-    if (m_enclosure)
-        m_enclosure->setMediaController(controller);
-    if (m_closedCaptionsContainer)
-        m_closedCaptionsContainer->setMediaController(controller);
-    if (m_closedCaptionsTrackList)
-        m_closedCaptionsTrackList->setMediaController(controller);
-}
-
-void MediaControlsGtk::reset()
-{
-    Page* page = document().page();
-    if (!page)
-        return;
-
-    double duration = m_mediaController->duration();
-    m_durationDisplay->setInnerText(page->theme().formatMediaControlsTime(duration), ASSERT_NO_EXCEPTION);
-    m_durationDisplay->setCurrentValue(duration);
-
-    if (m_toggleClosedCaptionsButton) {
-        if (m_mediaController->hasClosedCaptions())
-            m_toggleClosedCaptionsButton->show();
-        else
-            m_toggleClosedCaptionsButton->hide();
-    }
-
-    MediaControls::reset();
-}
-
-void MediaControlsGtk::playbackStarted()
-{
-    m_currentTimeDisplay->show();
-    m_durationDisplay->hide();
-
-    MediaControls::playbackStarted();
-}
-
-void MediaControlsGtk::updateCurrentTimeDisplay()
-{
-    double now = m_mediaController->currentTime();
-    double duration = m_mediaController->duration();
-
-    Page* page = document().page();
-    if (!page)
-        return;
-
-    // After seek, hide duration display and show current time.
-    if (now > 0) {
-        m_currentTimeDisplay->show();
-        m_durationDisplay->hide();
-    }
-
-    // Allow the theme to format the time.
-    ExceptionCode exceptionCode;
-    m_currentTimeDisplay->setInnerText(page->theme().formatMediaControlsCurrentTime(now, duration), exceptionCode);
-    m_currentTimeDisplay->setCurrentValue(now);
-}
-
-void MediaControlsGtk::changedMute()
-{
-    MediaControls::changedMute();
-
-    if (m_mediaController->muted())
-        m_volumeSlider->setVolume(0);
-    else
-        m_volumeSlider->setVolume(m_mediaController->volume());
-}
-
-
-void MediaControlsGtk::makeTransparent()
-{
-    MediaControls::makeTransparent();
-
-    if (m_volumeSliderContainer)
-        m_volumeSliderContainer->hide();
-
-    hideClosedCaptionTrackList();
-}
-
-void MediaControlsGtk::showVolumeSlider()
-{
-    if (!m_mediaController->hasAudio())
-        return;
-
-    if (m_volumeSliderContainer)
-        m_volumeSliderContainer->show();
-}
-
-#if ENABLE(VIDEO_TRACK)
-void MediaControlsGtk::createTextTrackDisplay()
-{
-    if (m_textDisplayContainer)
-        return;
-
-    RefPtr<MediaControlTextTrackContainerElement> textDisplayContainer = MediaControlTextTrackContainerElement::create(document());
-    m_textDisplayContainer = textDisplayContainer.get();
-
-    if (m_mediaController)
-        m_textDisplayContainer->setMediaController(m_mediaController);
-
-    // Insert it before the first controller element so it always displays behind the controls.
-    insertBefore(textDisplayContainer.release(), m_enclosure, ASSERT_NO_EXCEPTION);
-}
-#endif
-
-void MediaControlsGtk::toggleClosedCaptionTrackList()
-{
-    if (!m_mediaController->hasClosedCaptions())
-        return;
-
-    if (!m_closedCaptionsContainer || !m_closedCaptionsTrackList)
-        return;
-
-    if (m_closedCaptionsContainer->isShowing()) {
-        hideClosedCaptionTrackList();
-        return;
-    }
-
-    m_closedCaptionsTrackList->updateDisplay();
-    showClosedCaptionTrackList();
-}
-
-void MediaControlsGtk::showClosedCaptionTrackList()
-{
-    m_volumeSliderContainer->hide();
-
-    if (!m_closedCaptionsContainer || m_closedCaptionsContainer->isShowing())
-        return;
-
-    m_closedCaptionsContainer->show();
-    m_panel->setInlineStyleProperty(CSSPropertyPointerEvents, CSSValueNone);
-
-    RefPtr<EventListener> listener = eventListener();
-
-    // Check for clicks outside the media-control
-    document().addEventListener(eventNames().clickEvent, listener, true);
-    // Check for clicks inside the media-control box
-    addEventListener(eventNames().clickEvent, listener, true);
-}
-
-void MediaControlsGtk::hideClosedCaptionTrackList()
-{
-    if (!m_closedCaptionsContainer || !m_closedCaptionsContainer->isShowing())
-        return;
-
-    m_closedCaptionsContainer->hide();
-    m_panel->removeInlineStyleProperty(CSSPropertyPointerEvents);
-
-    EventListener* listener = eventListener().get();
-
-    document().removeEventListener(eventNames().clickEvent, listener, true);
-    removeEventListener(eventNames().clickEvent, listener, true);
-}
-
-void MediaControlsGtk::handleClickEvent(Event *event)
-{
-    Node* currentTarget = event->currentTarget()->toNode();
-    Node* target = event->target()->toNode();
-
-    if ((currentTarget == &document() && !shadowHost()->contains(target))
-        || (currentTarget == this && !m_closedCaptionsContainer->contains(target))) {
-        hideClosedCaptionTrackList();
-        event->stopImmediatePropagation();
-        event->setDefaultHandled();
-    }
-}
-
-PassRefPtr<MediaControlsGtkEventListener> MediaControlsGtk::eventListener()
-{
-    if (!m_eventListener)
-        m_eventListener = MediaControlsGtkEventListener::create(this);
-
-    return m_eventListener;
-}
-
-void MediaControlsGtkEventListener::handleEvent(ScriptExecutionContext*, Event* event)
-{
-    if (event->type() == eventNames().clickEvent)
-        m_mediaControls->handleClickEvent(event);
-
-    return;
-}
-
-bool MediaControlsGtkEventListener::operator==(const EventListener& listener)
-{
-    if (const MediaControlsGtkEventListener* mediaControlsGtkEventListener = MediaControlsGtkEventListener::cast(&listener))
-        return m_mediaControls == mediaControlsGtkEventListener->m_mediaControls;
-    return false;
-}
-
-}
-#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to