<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[166919] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/166919">166919</a></dd>
<dt>Author</dt> <dd>calvaris@igalia.com</dd>
<dt>Date</dt> <dd>2014-04-08 01:15:39 -0700 (Tue, 08 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlsGtkcpp">trunk/Source/WebCore/html/shadow/MediaControlsGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166918 => 166919)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-04-08 Xabier Rodriguez Calvar <calvaris@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.
+
</ins><span class="cx"> 2014-04-08 Mihnea Ovidenie <mihnea@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSSRegions] Fixed positioned elements in named flows have fragmented content
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (166918 => 166919)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -27,8 +27,6 @@
</span><span class="cx"> list(APPEND WebCore_SOURCES
</span><span class="cx"> editing/SmartReplace.cpp
</span><span class="cx">
</span><del>- html/shadow/MediaControlsGtk.cpp
-
</del><span class="cx"> loader/soup/CachedRawResourceSoup.cpp
</span><span class="cx"> loader/soup/SubresourceLoaderSoup.cpp
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlsGtkcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/html/shadow/MediaControlsGtk.cpp (166918 => 166919)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,378 +0,0 @@
</span><del>-/*
- * 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 <zandobersek@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
</del></span></pre>
</div>
</div>
</body>
</html>