<!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>[161607] 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/161607">161607</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-09 17:24:53 -0800 (Thu, 09 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove remaining blackberry files I could find in WebCore
https://bugs.webkit.org/show_bug.cgi?id=126715
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-01-09
Reviewed by Anders Carlsson.
* PlatformBlackBerry.cmake: Removed.
* Resources/blackberry: Removed.
* css/mediaControlsBlackBerry.css: Removed.
* css/mediaControlsBlackBerryFullscreen.css: Removed.
* css/themeBlackBerry.css: Removed.
* editing/blackberry: Removed.
* history/blackberry: Removed.
* html/shadow/MediaControlsBlackBerry.cpp: Removed.
* html/shadow/MediaControlsBlackBerry.h: Removed.
* page/blackberry: Removed.
* page/scrolling/blackberry: Removed.
* plugins/blackberry: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorePlatformBlackBerrycmake">trunk/Source/WebCore/PlatformBlackBerry.cmake</a></li>
<li>trunk/Source/WebCore/Resources/blackberry/</li>
<li><a href="#trunkSourceWebCorecssmediaControlsBlackBerrycss">trunk/Source/WebCore/css/mediaControlsBlackBerry.css</a></li>
<li><a href="#trunkSourceWebCorecssmediaControlsBlackBerryFullscreencss">trunk/Source/WebCore/css/mediaControlsBlackBerryFullscreen.css</a></li>
<li><a href="#trunkSourceWebCorecssthemeBlackBerrycss">trunk/Source/WebCore/css/themeBlackBerry.css</a></li>
<li>trunk/Source/WebCore/editing/blackberry/</li>
<li>trunk/Source/WebCore/history/blackberry/</li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlsBlackBerrycpp">trunk/Source/WebCore/html/shadow/MediaControlsBlackBerry.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlsBlackBerryh">trunk/Source/WebCore/html/shadow/MediaControlsBlackBerry.h</a></li>
<li>trunk/Source/WebCore/page/blackberry/</li>
<li>trunk/Source/WebCore/page/scrolling/blackberry/</li>
<li>trunk/Source/WebCore/plugins/blackberry/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161606 => 161607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-10 01:18:18 UTC (rev 161606)
+++ trunk/Source/WebCore/ChangeLog 2014-01-10 01:24:53 UTC (rev 161607)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-01-09 Benjamin Poulain <bpoulain@apple.com>
+
+ Remove remaining blackberry files I could find in WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=126715
+
+ Reviewed by Anders Carlsson.
+
+ * PlatformBlackBerry.cmake: Removed.
+ * Resources/blackberry: Removed.
+ * css/mediaControlsBlackBerry.css: Removed.
+ * css/mediaControlsBlackBerryFullscreen.css: Removed.
+ * css/themeBlackBerry.css: Removed.
+ * editing/blackberry: Removed.
+ * history/blackberry: Removed.
+ * html/shadow/MediaControlsBlackBerry.cpp: Removed.
+ * html/shadow/MediaControlsBlackBerry.h: Removed.
+ * page/blackberry: Removed.
+ * page/scrolling/blackberry: Removed.
+ * plugins/blackberry: Removed.
+
</ins><span class="cx"> 2014-01-09 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebGL] Return filtered results for getProgramParameter for ACTIVE_ATTRIBUTES and ACTIVE_UNIFORMS
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformBlackBerrycmake"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/PlatformBlackBerry.cmake (161606 => 161607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformBlackBerry.cmake 2014-01-10 01:18:18 UTC (rev 161606)
+++ trunk/Source/WebCore/PlatformBlackBerry.cmake 2014-01-10 01:24:53 UTC (rev 161607)
</span><span class="lines">@@ -1,270 +0,0 @@
</span><del>-list(INSERT WebCore_INCLUDE_DIRECTORIES 0
- "${BLACKBERRY_THIRD_PARTY_DIR}" # For <unicode.h>, which is included from <sys/keycodes.h>.
-)
-
-list(REMOVE_ITEM WebCore_SOURCES
- html/shadow/MediaControlsApple.cpp
-)
-
-list(APPEND WebCore_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/platform/blackberry/CookieDatabaseBackingStore"
- "${WEBCORE_DIR}/platform/graphics/harfbuzz"
- "${WEBCORE_DIR}/platform/graphics/opentype/"
- "${WEBCORE_DIR}/platform/network/blackberry"
- "${WEBCORE_DIR}/platform/network/blackberry/rss"
-)
-
-# Other sources
-list(APPEND WebCore_SOURCES
- platform/blackberry/AuthenticationChallengeManager.cpp
- platform/blackberry/CookieManager.cpp
- platform/blackberry/CookieMap.cpp
- platform/blackberry/CookieParser.cpp
- platform/blackberry/FileSystemBlackBerry.cpp
- platform/blackberry/ParsedCookie.cpp
-
- platform/blackberry/CookieDatabaseBackingStore/CookieDatabaseBackingStore.cpp
-
- platform/graphics/WOFFFileFormat.cpp
-
- platform/graphics/opentype/OpenTypeSanitizer.cpp
-
- platform/image-encoders/JPEGImageEncoder.cpp
-
- platform/posix/FileSystemPOSIX.cpp
- platform/posix/SharedBufferPOSIX.cpp
-
- platform/text/LocaleNone.cpp
-
- platform/text/blackberry/TextBreakIteratorInternalICUBlackBerry.cpp
-)
-
-# Networking sources
-list(APPEND WebCore_SOURCES
- platform/network/MIMESniffing.cpp
- platform/network/NetworkStorageSessionStub.cpp
- platform/network/ProxyServer.cpp
-
- platform/network/blackberry/AutofillBackingStore.cpp
- platform/network/blackberry/BlobStream.cpp
- platform/network/blackberry/CookieJarBlackBerry.cpp
- platform/network/blackberry/DNSBlackBerry.cpp
- platform/network/blackberry/DeferredData.cpp
- platform/network/blackberry/NetworkJob.cpp
- platform/network/blackberry/NetworkManager.cpp
- platform/network/blackberry/NetworkStateNotifierBlackBerry.cpp
- platform/network/blackberry/ProxyServerBlackBerry.cpp
- platform/network/blackberry/ResourceErrorBlackBerry.cpp
- platform/network/blackberry/ResourceHandleBlackBerry.cpp
- platform/network/blackberry/ResourceRequestBlackBerry.cpp
- platform/network/blackberry/ResourceResponseBlackBerry.cpp
- platform/network/blackberry/SocketStreamHandleBlackBerry.cpp
-
- platform/network/blackberry/rss/RSS10Parser.cpp
- platform/network/blackberry/rss/RSS20Parser.cpp
- platform/network/blackberry/rss/RSSAtomParser.cpp
- platform/network/blackberry/rss/RSSFilterStream.cpp
- platform/network/blackberry/rss/RSSGenerator.cpp
- platform/network/blackberry/rss/RSSParserBase.cpp
-)
-
-list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
- ${WEBCORE_DIR}/css/mediaControlsBlackBerry.css
- ${WEBCORE_DIR}/css/mediaControlsBlackBerryFullscreen.css
- ${WEBCORE_DIR}/css/themeBlackBerry.css
-)
-
-list(APPEND WebCore_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/bridge/blackberry"
- "${WEBCORE_DIR}/history/blackberry"
- "${WEBCORE_DIR}/page/blackberry"
- "${WEBCORE_DIR}/page/scrolling/blackberry"
- "${WEBCORE_DIR}/platform/blackberry"
- "${WEBCORE_DIR}/platform/graphics/blackberry"
- "${WEBCORE_DIR}/platform/image-decoders/bmp"
- "${WEBCORE_DIR}/platform/image-decoders/gif"
- "${WEBCORE_DIR}/platform/image-decoders/ico"
- "${WEBCORE_DIR}/platform/image-decoders/jpeg"
- "${WEBCORE_DIR}/platform/image-decoders/png"
- "${WEBCORE_DIR}/platform/image-encoders"
- "${WEBCORE_DIR}/platform/network/blackberry"
- "${WEBCORE_DIR}/platform/text/blackberry"
- "${WEBKIT_DIR}/blackberry/Api"
- "${WEBKIT_DIR}/blackberry/WebCoreSupport"
- "${WEBKIT_DIR}/blackberry/WebKitSupport"
-)
-
-# BlackBerry sources
-list(APPEND WebCore_SOURCES
- editing/blackberry/SmartReplaceBlackBerry.cpp
-
- html/shadow/MediaControlsBlackBerry.cpp
-
- page/blackberry/AccessibilityObjectBlackBerry.cpp
- page/blackberry/DragControllerBlackBerry.cpp
- page/blackberry/EventHandlerBlackBerry.cpp
- page/blackberry/SettingsBlackBerry.cpp
-
- platform/blackberry/CursorBlackBerry.cpp
- platform/blackberry/DragDataBlackBerry.cpp
- platform/blackberry/DragImageBlackBerry.cpp
- platform/blackberry/EventLoopBlackBerry.cpp
- platform/blackberry/LocalizedStringsBlackBerry.cpp
- platform/blackberry/LoggingBlackBerry.cpp
- platform/blackberry/MIMETypeRegistryBlackBerry.cpp
- platform/blackberry/PasteboardBlackBerry.cpp
- platform/blackberry/PlatformKeyboardEventBlackBerry.cpp
- platform/blackberry/PlatformMouseEventBlackBerry.cpp
- platform/blackberry/PlatformScreenBlackBerry.cpp
- platform/blackberry/PlatformTouchEventBlackBerry.cpp
- platform/blackberry/PlatformTouchPointBlackBerry.cpp
- platform/blackberry/PopupMenuBlackBerry.cpp
- platform/blackberry/RenderThemeBlackBerry.cpp
- platform/blackberry/SSLKeyGeneratorBlackBerry.cpp
- platform/blackberry/ScrollbarThemeBlackBerry.cpp
- platform/blackberry/SearchPopupMenuBlackBerry.cpp
- platform/blackberry/SharedTimerBlackBerry.cpp
- platform/blackberry/SoundBlackBerry.cpp
- platform/blackberry/TemporaryLinkStubs.cpp
- platform/blackberry/WidgetBlackBerry.cpp
-
- platform/graphics/blackberry/FloatPointBlackBerry.cpp
- platform/graphics/blackberry/FloatRectBlackBerry.cpp
- platform/graphics/blackberry/FloatSizeBlackBerry.cpp
- platform/graphics/blackberry/IconBlackBerry.cpp
- platform/graphics/blackberry/ImageBlackBerry.cpp
- platform/graphics/blackberry/IntPointBlackBerry.cpp
- platform/graphics/blackberry/IntRectBlackBerry.cpp
- platform/graphics/blackberry/IntSizeBlackBerry.cpp
- platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.cpp
-
- platform/text/blackberry/StringBlackBerry.cpp
-)
-
-# Credential Persistence sources
-list(APPEND WebCore_SOURCES
- platform/network/blackberry/CredentialBackingStore.cpp
- platform/network/blackberry/CredentialStorageBlackBerry.cpp
-)
-
-if (ENABLE_SMOOTH_SCROLLING)
- list(APPEND WebCore_SOURCES
- platform/blackberry/ScrollAnimatorBlackBerry.cpp
- )
-endif ()
-
-if (ENABLE_REQUEST_ANIMATION_FRAME)
- list(APPEND WebCore_SOURCES
- platform/graphics/DisplayRefreshMonitor.cpp
-
- platform/graphics/blackberry/DisplayRefreshMonitorBlackBerry.cpp
- )
-endif ()
-
-if (ENABLE_WEBGL)
- add_definitions(-DWTF_USE_OPENGL_ES_2=1)
- list(APPEND WebCore_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/platform/graphics/gpu"
- "${WEBCORE_DIR}/platform/graphics/opengl"
- )
- list(APPEND WebCore_SOURCES
- platform/graphics/blackberry/DrawingBufferBlackBerry.cpp
- platform/graphics/blackberry/GraphicsContext3DBlackBerry.cpp
-
- platform/graphics/gpu/SharedGraphicsContext3D.cpp
-
- platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
- platform/graphics/opengl/Extensions3DOpenGLES.cpp
- platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
- platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
- platform/graphics/opengl/TemporaryOpenGLSetting.cpp
- )
-endif ()
-
-if (ENABLE_MEDIA_STREAM)
- list(APPEND WebCore_SOURCES
- platform/mediastream/blackberry/MediaStreamCenterBlackBerry.cpp
- )
-endif ()
-
-if (ENABLE_NETSCAPE_PLUGIN_API)
- list(APPEND WebCore_SOURCES
- plugins/blackberry/NPCallbacksBlackBerry.cpp
- plugins/blackberry/PluginPackageBlackBerry.cpp
- plugins/blackberry/PluginViewBlackBerry.cpp
- plugins/blackberry/PluginViewPrivateBlackBerry.cpp
- )
-else ()
- list(APPEND WebCore_SOURCES
- plugins/PluginDataNone.cpp
- )
-endif ()
-
-if (ENABLE_TEXT_AUTOSIZING)
- list(APPEND WebCore_SOURCES
- rendering/TextAutosizer.cpp
- )
-endif ()
-
-# To speed up linking when working on accel comp, you can move this whole chunk
-# to Source/WebKit/blackberry/CMakeListsBlackBerry.txt.
-# Append to WebKit_SOURCES instead of WebCore_SOURCES.
-if (WTF_USE_ACCELERATED_COMPOSITING)
- list(APPEND WebCore_SOURCES
- platform/graphics/GraphicsLayer.cpp
- platform/graphics/GraphicsLayerUpdater.cpp
-
- platform/graphics/blackberry/CanvasLayerWebKitThread.cpp
- platform/graphics/blackberry/EGLImageLayerCompositingThreadClient.cpp
- platform/graphics/blackberry/EGLImageLayerWebKitThread.cpp
- platform/graphics/blackberry/GraphicsLayerBlackBerry.cpp
- platform/graphics/blackberry/LayerAnimation.cpp
- platform/graphics/blackberry/LayerCompositingThread.cpp
- platform/graphics/blackberry/LayerFilterRenderer.cpp
- platform/graphics/blackberry/LayerRenderer.cpp
- platform/graphics/blackberry/LayerRendererSurface.cpp
- platform/graphics/blackberry/LayerTexture.cpp
- platform/graphics/blackberry/LayerTile.cpp
- platform/graphics/blackberry/LayerTiler.cpp
- platform/graphics/blackberry/LayerWebKitThread.cpp
- platform/graphics/blackberry/PluginLayerWebKitThread.cpp
- platform/graphics/blackberry/TextureCacheCompositingThread.cpp
- platform/graphics/blackberry/WebGLLayerWebKitThread.cpp
-
- rendering/RenderLayerBacking.cpp
- rendering/RenderLayerCompositor.cpp
- )
-endif ()
-
-set(ENV{WEBKITDIR} ${CMAKE_SOURCE_DIR}/Source)
-set(ENV{PLATFORMNAME} ${CMAKE_SYSTEM_NAME})
-execute_process(
- COMMAND hostname
- OUTPUT_VARIABLE host
-)
-string(REPLACE "\n" "" host1 "${host}")
-set(ENV{COMPUTERNAME} ${host1})
-
-if ($ENV{PUBLIC_BUILD})
- add_definitions(-DPUBLIC_BUILD=$ENV{PUBLIC_BUILD})
-endif ()
-
-# Generate contents for PopupPicker.cpp
-set(WebCore_POPUP_CSS_AND_JS
- ${WEBCORE_DIR}/Resources/blackberry/popupControlBlackBerry.css
- ${WEBCORE_DIR}/Resources/blackberry/selectControlBlackBerry.css
- ${WEBCORE_DIR}/Resources/blackberry/selectControlBlackBerry.js
-)
-
-add_custom_command(
- OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/PopupPicker.h ${DERIVED_SOURCES_WEBCORE_DIR}/PopupPicker.cpp
- MAIN_DEPENDENCY ${WEBCORE_DIR}/make-file-arrays.py
- DEPENDS ${WebCore_POPUP_CSS_AND_JS}
- COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/make-file-arrays.py --out-h=${DERIVED_SOURCES_WEBCORE_DIR}/PopupPicker.h --out-cpp=${DERIVED_SOURCES_WEBCORE_DIR}/PopupPicker.cpp ${WebCore_POPUP_CSS_AND_JS}
-)
-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/PopupPicker.cpp)
-
-set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> <LINK_FLAGS> cruT <TARGET> <OBJECTS>")
-set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> <LINK_FLAGS> ruT <TARGET> <OBJECTS>")
-set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> <LINK_FLAGS> cruT <TARGET> <OBJECTS>")
-set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> <LINK_FLAGS> ruT <TARGET> <OBJECTS>")
</del></span></pre></div>
<a id="trunkSourceWebCorecssmediaControlsBlackBerrycss"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/mediaControlsBlackBerry.css (161606 => 161607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/mediaControlsBlackBerry.css 2014-01-10 01:18:18 UTC (rev 161606)
+++ trunk/Source/WebCore/css/mediaControlsBlackBerry.css 2014-01-10 01:24:53 UTC (rev 161607)
</span><span class="lines">@@ -1,190 +0,0 @@
</span><del>-/*
- * BlackBerry specific overrides for HTML5 media elements.
- *
- * Copyright (C) 2009 Apple Inc. All rights reserved.
- * Copyright (C) 2010, 2011, 2012 Research In Motion Limited. All rights reserved.
- *
- * 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 COMPUTER, 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 COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * 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.
- */
-
- /* BlackBerry default media controls. */
-
-audio {
- background-color: rgba(38, 38, 38, 0.8);
- width: 300px;
- height: 32px;
-}
-
-audio::-webkit-media-controls-embedded-panel, video::-webkit-media-controls-embedded-panel {
- display: -webkit-flex;
- -webkit-flex-direction: row;
- -webkit-align-items: center;
- position: absolute;
- bottom: 0;
- width: 100%;
- height: auto;
- background-color: rgba(38, 38, 38, 0.8);
-}
-
-audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel {
- display: none;
-}
-
-video::-webkit-media-controls-button-group-container, audio::-webkit-media-controls-button-group-container {
- display: none;
-}
-
-video::-webkit-media-controls-fullscreen-time-display-container, audio::-webkit-media-controls-fullscreen-time-display-container {
- display: none;
-}
-
-video::-webkit-media-controls-time-display-container, audio::-webkit-media-controls-time-display-container {
- -webkit-appearance: media-controls-background;
- display: -webkit-flex;
- -webkit-flex-direction: row;
- -webkit-align-items: center;
- -webkit-justify-content: space-between;
- -webkit-flex: 1 1;
-}
-
-video::-webkit-media-controls-fullscreen-play-button, audio::-webkit-media-controls-fullscreen-play-button {
- display: none;
-}
-
-video::-webkit-media-controls-play-button, audio::-webkit-media-controls-play-button {
- -webkit-appearance: media-play-button;
- display: -webkit-flex;
-}
-
-audio::-webkit-media-controls-fullscreen-timeline-container, video::-webkit-media-controls-fullscreen-timeline-container {
- display: none;
-}
-
-video::-webkit-media-controls-timeline-container, audio::-webkit-media-controls-timeline-container {
- -webkit-appearance: media-controls-background;
- display: -webkit-flex;
- -webkit-flex-direction: column;
- -webkit-align-items: stretch;
- -webkit-justify-content: center;
- -webkit-flex: 1 1;
- height: auto;
- width: 100%;
-}
-
-audio::-webkit-media-controls-fullscreen-current-time-display, video::-webkit-media-controls-fullscreen-current-time-display {
- display: none;
-}
-
-audio::-webkit-media-controls-current-time-display, video::-webkit-media-controls-current-time-display {
- -webkit-appearance: media-current-time-display;
- display: -webkit-flex;
- -webkit-flex-direction: row;
- -webkit-align-items: center;
- -webkit-justify-content: flex-end;
- -webkit-flex: 0 0;
- color: #fafafa;
-}
-
-video::-webkit-media-controls-fullscreen-time-remaining-display, audio::-webkit-media-controls-fullscreen-time-remaining-display {
- display: none;
-}
-
-video::-webkit-media-controls-time-remaining-display, audio::-webkit-media-controls-time-remaining-display {
- -webkit-appearance: media-time-remaining-display;
- display: -webkit-flex;
- -webkit-flex-direction: row;
- -webkit-align-items: center;
- -webkit-justify-content: flex-end;
- -webkit-flex: 0 0;
- color: rgb(125, 125, 125);
-}
-
-audio::-webkit-media-controls-fullscreen-timeline, video::-webkit-media-controls-fullscreen-timeline {
- display: none;
-}
-
-audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline {
- -webkit-appearance: media-slider;
- display: -webkit-flex;
- -webkit-flex: 1 1;
- margin-bottom: 2px;
-}
-
-video::-webkit-media-controls-fullscreen-fullscreen-button, audio::-webkit-media-controls-fullscreen-fullscreen-button {
- display: none;
-}
-
-video::-webkit-media-controls-fullscreen-button {
- -webkit-appearance: media-enter-fullscreen-button;
- display: -webkit-flex;
-}
-
-audio::-webkit-media-controls-fullscreen-button {
- display: none;
-}
-
-audio::-webkit-media-controls-audio-mute-button {
- -webkit-appearance: media-mute-button;
- display: -webkit-flex;
-}
-
-video::-webkit-media-controls-audio-mute-button {
- display: none;
-}
-
-audio::-webkit-media-controls-volume-slider-container {
- -webkit-appearance: media-volume-slider-container;
- display: -webkit-flex;
- -webkit-flex-direction: column;
- -webkit-align-items: center;
- -webkit-justify-content: flex-end;
- -webkit-flex: 1 1;
- -webkit-user-select: none;
- position: absolute;
- left: 0px;
- right: 0px;
- background-color: rgba(38, 38, 38, 0.8);
-}
-
-video::-webkit-media-controls-volume-slider-container {
- display: none;
-}
-
-audio::-webkit-media-controls-volume-slider {
- -webkit-appearance: media-volume-slider;
- display: -webkit-flex;
- -webkit-flex: 1 1;
- position: absolute;
- left: 3%;
- right: 3%;
-}
-
-video::-webkit-media-controls-volume-slider {
- display: none;
-}
-
-video::-webkit-media-controls-fullscreen-button-divider, audio::-webkit-media-controls-fullscreen-button-divider {
- display: none;
-}
-
-video::-webkit-media-controls-fullscreen-button-container, video::-webkit-media-controls-play-button-container, audio::-webkit-media-controls-fullscreen-button-container, audio::-webkit-media-controls-play-button-container {
- display: none;
-}
</del></span></pre></div>
<a id="trunkSourceWebCorecssmediaControlsBlackBerryFullscreencss"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/mediaControlsBlackBerryFullscreen.css (161606 => 161607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/mediaControlsBlackBerryFullscreen.css 2014-01-10 01:18:18 UTC (rev 161606)
+++ trunk/Source/WebCore/css/mediaControlsBlackBerryFullscreen.css 2014-01-10 01:24:53 UTC (rev 161607)
</span><span class="lines">@@ -1,182 +0,0 @@
</span><del>-/*
- * BlackBerry specific overrides for HTML5 media elements.
- *
- * Copyright (C) 2009 Apple Inc. All rights reserved.
- * Copyright (C) 2010, 2011, 2012 Research In Motion Limited. All rights reserved.
- *
- * 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 COMPUTER, 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 COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * 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.
- */
-
- /* BlackBerry fullscreen video controls. */
-
-body:-webkit-full-page-media {
- background-color: rgb(0, 0, 0);
-}
-
-video:-webkit-full-screen::-webkit-media-controls-embedded-panel {
- display: none;
-}
-
-video:-webkit-full-screen::-webkit-media-controls-panel {
- display: -webkit-flex;
- -webkit-flex-direction: column;
- -webkit-align-items: stretch;
- position: absolute;
- bottom: 0px;
- width: 100%;
- height: auto;
- background-color: rgba(38, 38, 38, 0.8);
- color: rgb(250, 250, 250);
-}
-
-video:-webkit-full-screen::-webkit-media-controls-button-group-container {
- -webkit-appearance: media-controls-background;
- display: -webkit-flex;
- -webkit-flex-direction: row;
- -webkit-align-items: center;
- -webkit-justify-content: space-between;
- -webkit-flex: 1;
- background-color: rgb(0, 0, 0);
-}
-
-video:-webkit-full-screen::-webkit-media-controls-fullscreen-time-display-container {
- -webkit-appearance: media-controls-background;
- display: -webkit-flex;
- -webkit-flex-direction: row;
- -webkit-align-items: center;
- -webkit-justify-content: space-between;
- -webkit-flex: 1;
-}
-
-video:-webkit-full-screen::-webkit-media-controls-time-display-container {
- display: none;
-}
-
-video:-webkit-full-screen::-webkit-media-controls-fullscreen-play-button {
- -webkit-appearance: media-play-button;
- display: -webkit-flex;
-}
-
-video:-webkit-full-screen::-webkit-media-controls-play-button {
- display: none;
-}
-
-video:-webkit-full-screen::-webkit-media-controls-fullscreen-timeline-container {
- -webkit-appearance: media-controls-background;
- display: -webkit-flex;
- -webkit-flex-direction: column;
- -webkit-align-items: stretch;
- -webkit-justify-content: center;
- -webkit-flex: 1;
- height: auto;
- width: 100%;
-}
-
-video:-webkit-full-screen::-webkit-media-controls-timeline-container {
- display: none;
-}
-
-video:-webkit-full-screen::-webkit-media-controls-fullscreen-current-time-display {
- -webkit-appearance: media-current-time-display;
- display: -webkit-flex;
- -webkit-flex-direction: row;
- -webkit-align-items: center;
- -webkit-justify-content: flex-end;
- -webkit-flex: 0;
-}
-
-video:-webkit-full-screen::-webkit-media-controls-current-time-display {
- display: none;
-}
-
-video:-webkit-full-screen::-webkit-media-controls-fullscreen-time-remaining-display {
- -webkit-appearance: media-time-remaining-display;
- display: -webkit-flex;
- -webkit-flex-direction: row;
- -webkit-align-items: center;
- -webkit-justify-content: flex-end;
- -webkit-flex: 0;
- color: rgb(125, 125, 125);
-}
-
-video:-webkit-full-screen::-webkit-media-controls-time-remaining-display {
- display: none;
-}
-
-video:-webkit-full-screen::-webkit-media-controls-fullscreen-timeline {
- -webkit-appearance: media-slider;
- display: -webkit-flex;
- -webkit-flex: 1;
-}
-
-video:-webkit-full-screen::-webkit-media-controls-timeline {
- display: none;
-}
-
-video:-webkit-full-screen::-webkit-media-controls-fullscreen-fullscreen-button {
- -webkit-appearance: media-exit-fullscreen-button;
- display: -webkit-flex;
-}
-
-video:-webkit-full-screen::-webkit-media-controls-fullscreen-button {
- display: none;
-}
-
-video:-webkit-full-screen::-webkit-media-controls-audio-mute-button {
- display: none;
-}
-
-video:-webkit-full-screen::-webkit-media-controls-volume-slider-container {
- display: none;
-}
-
-video:-webkit-full-screen::-webkit-media-controls-volume-slider {
- display: none;
-}
-
-video:-webkit-full-screen::-webkit-media-controls-fullscreen-button-divider {
- -webkit-appearance: media-rewind-button;
- display: -webkit-flex;
-}
-
-video:-webkit-full-screen::-webkit-media-controls-fullscreen-button-container, video:-webkit-full-screen::-webkit-media-controls-play-button-container {
- -webkit-appearance: media-controls-background;
- display: -webkit-flex;
- -webkit-flex-direction: row;
- -webkit-align-items: center;
- -webkit-flex: 1;
- min-width: 100%;
-}
-
-video:-webkit-full-screen::-webkit-media-controls-fullscreen-button-container {
- -webkit-justify-content: flex-start;
-}
-
-video:-webkit-full-screen::-webkit-media-controls-play-button-container {
- -webkit-justify-content: center;
-}
-
-video:-webkit-full-screen::-webkit-media-controls-placeholder {
- -webkit-appearance: media-controls-background;
- display: -webkit-flex;
- -webkit-flex: 1;
- min-width: 100%;
-}
</del></span></pre></div>
<a id="trunkSourceWebCorecssthemeBlackBerrycss"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/themeBlackBerry.css (161606 => 161607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/themeBlackBerry.css 2014-01-10 01:18:18 UTC (rev 161606)
+++ trunk/Source/WebCore/css/themeBlackBerry.css 2014-01-10 01:24:53 UTC (rev 161607)
</span><span class="lines">@@ -1,108 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009, 2010, 2011, 2012 Research In Motion Limited. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-textarea {
- font-family: monospace;
-}
-
-select {
- border-radius: 0;
-}
-
-select[size="0"],
-select[size="1"] {
- border-radius: 0;
-}
-
-::-webkit-validation-bubble-message {
- padding-left: 10px;
- padding-right: 10px;
- background: #fafafa;
- border-color: #ffffff;
- border-width: 1px;
- box-shadow: 2px 2px 4px rgba(100,100,100,0.3), 0 0 4px rgba(100,100,100,0.6);
- -webkit-border-radius: 4px;
- top: -1px;
-}
-
-::-webkit-validation-bubble-arrow {
- left: 40px;
- top: 3px;
- background: #fafafa;
- border-color: #ffffff;
- border-width: 1px;
- box-shadow: 0 0 4px rgba(100,100,100,0.6);
-}
-
-::-webkit-validation-bubble-heading {
- font-weight: normal;
-}
-
-
-/* Suggestion Box */
-
-input::-webkit-suggestion-dropdown-box {
- position: absolute;
- z-index: 2147483647;
- opacity: 0.98;
- max-height: 200px;
- overflow-y: scroll;
- overflow-x: hidden;
- border: 1px solid #e0e0e0;
- border-top: none;
- background-color: #fcfcfc;
- -webkit-box-shadow: 0px 5px 5px -2px #606060 inset;
- -webkit-box-shadow: 2px 0px 8px -5px #AEAEAE;
-}
-
-input::-webkit-suggestion-dropdown-box-item {
- display: block;
- width: 100%;
- padding: 10px 5px;
- color: #363636;
- text-decoration: none;
- border-bottom: 1px solid #e8e8e8;
- text-overflow: -blackberry-fade;
- overflow: hidden;
-}
-
-input::-webkit-suggestion-prefix-text {
- font-weight: bold;
-}
-
-input::-webkit-suggestion-dropdown-box-item-last {
- display: block;
- width: 100%;
- padding: 10px 5px;
- color: #363636;
- text-decoration: none;
- text-overflow: -blackberry-fade;
- overflow: hidden;
- border-bottom: none;
-}
-
-input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="time"], input[type="month"] {
- font-family: "Slate Pro";
- -webkit-appearance: button;
- text-align: center;
- width:auto;
-}
-
-input::-webkit-date-and-time-value {
- margin: 1px 6px 1px 6px;
-}
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlsBlackBerrycpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/html/shadow/MediaControlsBlackBerry.cpp (161606 => 161607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlsBlackBerry.cpp 2014-01-10 01:18:18 UTC (rev 161606)
+++ trunk/Source/WebCore/html/shadow/MediaControlsBlackBerry.cpp 2014-01-10 01:24:53 UTC (rev 161607)
</span><span class="lines">@@ -1,1102 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
- * Copyright (C) 2011 Google Inc. All rights reserved.
- * Copyright (C) 2012 Research In Motion Limited. All rights reserved.
- *
- * 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 COMPUTER, 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 COMPUTER, 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 "MediaControlsBlackBerry.h"
-
-#include "DOMTokenList.h"
-#include "ExceptionCodePlaceholder.h"
-#include "Frame.h"
-#include "HTMLNames.h"
-#include "RenderDeprecatedFlexibleBox.h"
-#include "RenderSlider.h"
-#include "Settings.h"
-
-using namespace std;
-
-namespace WebCore {
-
-using namespace HTMLNames;
-
-static const double timeWithoutMouseMovementBeforeHidingControls = 3;
-
-inline MediaControlButtonGroupContainerElement::MediaControlButtonGroupContainerElement(Document* document)
- : MediaControlDivElement(document, MediaControlsPanel)
-{
-}
-
-PassRefPtr<MediaControlButtonGroupContainerElement> MediaControlButtonGroupContainerElement::create(Document* document)
-{
- RefPtr<MediaControlButtonGroupContainerElement> element = adoptRef(new MediaControlButtonGroupContainerElement(document));
- return element.release();
-}
-
-const AtomicString& MediaControlButtonGroupContainerElement::shadowPseudoId() const
-{
- DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-button-group-container", AtomicString::ConstructFromLiteral));
- return id;
-}
-
-inline MediaControlTimeDisplayContainerElement::MediaControlTimeDisplayContainerElement(Document* document)
- : MediaControlDivElement(document, MediaControlsPanel)
-{
-}
-
-PassRefPtr<MediaControlTimeDisplayContainerElement> MediaControlTimeDisplayContainerElement::create(Document* document)
-{
- RefPtr<MediaControlTimeDisplayContainerElement> element = adoptRef(new MediaControlTimeDisplayContainerElement(document));
- return element.release();
-}
-
-const AtomicString& MediaControlTimeDisplayContainerElement::shadowPseudoId() const
-{
- DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-time-display-container", AtomicString::ConstructFromLiteral));
- return id;
-}
-
-MediaControlEmbeddedPanelElement::MediaControlEmbeddedPanelElement(Document* document)
- : MediaControlDivElement(document, MediaControlsPanel)
- , m_canBeDragged(false)
- , m_isBeingDragged(false)
- , m_isDisplayed(false)
- , m_opaque(true)
- , m_transitionTimer(this, &MediaControlEmbeddedPanelElement::transitionTimerFired)
-{
-}
-
-PassRefPtr<MediaControlEmbeddedPanelElement> MediaControlEmbeddedPanelElement::create(Document* document)
-{
- return adoptRef(new MediaControlEmbeddedPanelElement(document));
-}
-
-const AtomicString& MediaControlEmbeddedPanelElement::shadowPseudoId() const
-{
- DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-embedded-panel", AtomicString::ConstructFromLiteral));
- return id;
-}
-
-void MediaControlEmbeddedPanelElement::startDrag(const LayoutPoint& 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_lastDragEventLocation = eventLocation;
-
- frame->eventHandler().setCapturingMouseEventsNode(this);
-
- m_isBeingDragged = true;
-}
-
-void MediaControlEmbeddedPanelElement::continueDrag(const LayoutPoint& eventLocation)
-{
- if (!m_isBeingDragged)
- return;
-
- LayoutSize distanceDragged = eventLocation - m_lastDragEventLocation;
- m_cumulativeDragOffset.move(distanceDragged);
- m_lastDragEventLocation = eventLocation;
- setPosition(m_cumulativeDragOffset);
-}
-
-void MediaControlEmbeddedPanelElement::endDrag()
-{
- if (!m_isBeingDragged)
- return;
-
- m_isBeingDragged = false;
-
- Frame* frame = document()->frame();
- if (!frame)
- return;
-
- frame->eventHandler().setCapturingMouseEventsNode(0);
-}
-
-void MediaControlEmbeddedPanelElement::startTimer()
-{
- stopTimer();
-
- // The timer is required to set the property display:'none' on the panel,
- // such that captions are correctly displayed at the bottom of the video
- // at the end of the fadeout transition.
- double duration = document()->page() ? document()->page()->theme()->mediaControlsFadeOutDuration() : 0;
- m_transitionTimer.startOneShot(duration);
-}
-
-void MediaControlEmbeddedPanelElement::stopTimer()
-{
- if (m_transitionTimer.isActive())
- m_transitionTimer.stop();
-}
-
-void MediaControlEmbeddedPanelElement::transitionTimerFired(Timer<MediaControlEmbeddedPanelElement>*)
-{
- if (!m_opaque)
- hide();
-
- stopTimer();
-}
-
-void MediaControlEmbeddedPanelElement::setPosition(const LayoutPoint& position)
-{
- 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.
- setInlineStyleProperty(CSSPropertyLeft, left, CSSPrimitiveValue::CSS_PX);
- setInlineStyleProperty(CSSPropertyTop, top, CSSPrimitiveValue::CSS_PX);
- setInlineStyleProperty(CSSPropertyMarginLeft, 0.0, CSSPrimitiveValue::CSS_PX);
- setInlineStyleProperty(CSSPropertyMarginTop, 0.0, CSSPrimitiveValue::CSS_PX);
-
- classList()->add("dragged", IGNORE_EXCEPTION);
-}
-
-void MediaControlEmbeddedPanelElement::resetPosition()
-{
- removeInlineStyleProperty(CSSPropertyLeft);
- removeInlineStyleProperty(CSSPropertyTop);
- removeInlineStyleProperty(CSSPropertyMarginLeft);
- removeInlineStyleProperty(CSSPropertyMarginTop);
-
- classList()->remove("dragged", IGNORE_EXCEPTION);
-
- m_cumulativeDragOffset.setX(0);
- m_cumulativeDragOffset.setY(0);
-}
-
-void MediaControlEmbeddedPanelElement::makeOpaque()
-{
- if (m_opaque)
- return;
-
- double duration = document()->page() ? document()->page()->theme()->mediaControlsFadeInDuration() : 0;
-
- setInlineStyleProperty(CSSPropertyWebkitTransitionProperty, CSSPropertyOpacity);
- setInlineStyleProperty(CSSPropertyWebkitTransitionDuration, duration, CSSPrimitiveValue::CSS_S);
- setInlineStyleProperty(CSSPropertyOpacity, 1.0, CSSPrimitiveValue::CSS_NUMBER);
-
- m_opaque = true;
-
- if (m_isDisplayed)
- show();
-}
-
-void MediaControlEmbeddedPanelElement::makeTransparent()
-{
- if (!m_opaque)
- return;
-
- double duration = document()->page() ? document()->page()->theme()->mediaControlsFadeOutDuration() : 0;
-
- setInlineStyleProperty(CSSPropertyWebkitTransitionProperty, CSSPropertyOpacity);
- setInlineStyleProperty(CSSPropertyWebkitTransitionDuration, duration, CSSPrimitiveValue::CSS_S);
- setInlineStyleProperty(CSSPropertyOpacity, 0.0, CSSPrimitiveValue::CSS_NUMBER);
-
- m_opaque = false;
- startTimer();
-}
-
-void MediaControlEmbeddedPanelElement::defaultEventHandler(Event* event)
-{
- MediaControlDivElement::defaultEventHandler(event);
-
- if (event->isMouseEvent()) {
- LayoutPoint location = static_cast<MouseEvent*>(event)->absoluteLocation();
- if (event->type() == eventNames().mousedownEvent && event->target() == this) {
- startDrag(location);
- event->setDefaultHandled();
- } else if (event->type() == eventNames().mousemoveEvent && m_isBeingDragged)
- continueDrag(location);
- else if (event->type() == eventNames().mouseupEvent && m_isBeingDragged) {
- continueDrag(location);
- endDrag();
- event->setDefaultHandled();
- }
- }
-}
-
-void MediaControlEmbeddedPanelElement::setCanBeDragged(bool canBeDragged)
-{
- if (m_canBeDragged == canBeDragged)
- return;
-
- m_canBeDragged = canBeDragged;
-
- if (!canBeDragged)
- endDrag();
-}
-
-void MediaControlEmbeddedPanelElement::setIsDisplayed(bool isDisplayed)
-{
- m_isDisplayed = isDisplayed;
-}
-
-inline MediaControlFullscreenTimeDisplayContainerElement::MediaControlFullscreenTimeDisplayContainerElement(Document* document)
- : MediaControlDivElement(document, MediaControlsPanel)
-{
-}
-
-PassRefPtr<MediaControlFullscreenTimeDisplayContainerElement> MediaControlFullscreenTimeDisplayContainerElement::create(Document* document)
-{
- RefPtr<MediaControlFullscreenTimeDisplayContainerElement> element = adoptRef(new MediaControlFullscreenTimeDisplayContainerElement(document));
- return element.release();
-}
-
-const AtomicString& MediaControlFullscreenTimeDisplayContainerElement::shadowPseudoId() const
-{
- DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-fullscreen-time-display-container", AtomicString::ConstructFromLiteral));
- return id;
-}
-
-inline MediaControlFullscreenButtonContainerElement::MediaControlFullscreenButtonContainerElement(Document* document)
- : MediaControlDivElement(document, MediaControlsPanel)
-{
-}
-
-PassRefPtr<MediaControlFullscreenButtonContainerElement> MediaControlFullscreenButtonContainerElement::create(Document* document)
-{
- RefPtr<MediaControlFullscreenButtonContainerElement> element = adoptRef(new MediaControlFullscreenButtonContainerElement(document));
- return element.release();
-}
-
-const AtomicString& MediaControlFullscreenButtonContainerElement::shadowPseudoId() const
-{
- DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-fullscreen-button-container", AtomicString::ConstructFromLiteral));
- return id;
-}
-
-inline MediaControlFullscreenButtonDividerElement::MediaControlFullscreenButtonDividerElement(Document* document)
- : MediaControlDivElement(document, MediaRewindButton)
-{
-}
-
-PassRefPtr<MediaControlFullscreenButtonDividerElement> MediaControlFullscreenButtonDividerElement::create(Document* document)
-{
- RefPtr<MediaControlFullscreenButtonDividerElement> element = adoptRef(new MediaControlFullscreenButtonDividerElement(document));
- return element.release();
-}
-
-const AtomicString& MediaControlFullscreenButtonDividerElement::shadowPseudoId() const
-{
- DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-fullscreen-button-divider", AtomicString::ConstructFromLiteral));
- return id;
-}
-
-inline MediaControlPlayButtonContainerElement::MediaControlPlayButtonContainerElement(Document* document)
- : MediaControlDivElement(document, MediaControlsPanel)
-{
-}
-
-PassRefPtr<MediaControlPlayButtonContainerElement> MediaControlPlayButtonContainerElement::create(Document* document)
-{
- RefPtr<MediaControlPlayButtonContainerElement> element = adoptRef(new MediaControlPlayButtonContainerElement(document));
- return element.release();
-}
-
-const AtomicString& MediaControlPlayButtonContainerElement::shadowPseudoId() const
-{
- DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-play-button-container", AtomicString::ConstructFromLiteral));
- return id;
-}
-
-inline MediaControlPlaceholderElement::MediaControlPlaceholderElement(Document* document)
- : MediaControlDivElement(document, MediaControlsPanel)
-{
-}
-
-PassRefPtr<MediaControlPlaceholderElement> MediaControlPlaceholderElement::create(Document* document)
-{
- RefPtr<MediaControlPlaceholderElement> element = adoptRef(new MediaControlPlaceholderElement(document));
- return element.release();
-}
-
-const AtomicString& MediaControlPlaceholderElement::shadowPseudoId() const
-{
- DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-placeholder", AtomicString::ConstructFromLiteral));
- return id;
-}
-
-inline MediaControlFullscreenPlayButtonElement::MediaControlFullscreenPlayButtonElement(Document* document)
- : MediaControlInputElement(document, MediaPlayButton)
-{
-}
-
-PassRefPtr<MediaControlFullscreenPlayButtonElement> MediaControlFullscreenPlayButtonElement::create(Document* document)
-{
- RefPtr<MediaControlFullscreenPlayButtonElement> button = adoptRef(new MediaControlFullscreenPlayButtonElement(document));
- button->ensureUserAgentShadowRoot();
- button->setType("button");
- return button.release();
-}
-
-void MediaControlFullscreenPlayButtonElement::defaultEventHandler(Event* event)
-{
- if (event->type() == eventNames().clickEvent) {
- if (mediaController()->canPlay())
- mediaController()->play();
- else
- mediaController()->pause();
- updateDisplayType();
- event->setDefaultHandled();
- }
- HTMLInputElement::defaultEventHandler(event);
-}
-
-void MediaControlFullscreenPlayButtonElement::updateDisplayType()
-{
- setDisplayType(mediaController()->canPlay() ? MediaPlayButton : MediaPauseButton);
-}
-
-const AtomicString& MediaControlFullscreenPlayButtonElement::shadowPseudoId() const
-{
- DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-fullscreen-play-button", AtomicString::ConstructFromLiteral));
- return id;
-}
-
-inline MediaControlFullscreenFullscreenButtonElement::MediaControlFullscreenFullscreenButtonElement(Document* document)
- : MediaControlInputElement(document, MediaExitFullscreenButton)
-{
-}
-
-PassRefPtr<MediaControlFullscreenFullscreenButtonElement> MediaControlFullscreenFullscreenButtonElement::create(Document* document)
-{
- RefPtr<MediaControlFullscreenFullscreenButtonElement> button = adoptRef(new MediaControlFullscreenFullscreenButtonElement(document));
- button->ensureUserAgentShadowRoot();
- button->setType("button");
- button->hide();
- return button.release();
-}
-
-void MediaControlFullscreenFullscreenButtonElement::defaultEventHandler(Event* event)
-{
- if (event->type() == eventNames().clickEvent) {
-#if ENABLE(FULLSCREEN_API)
- // Only use the new full screen API if the fullScreenEnabled setting has
- // been explicitly enabled. Otherwise, use the old fullscreen API. This
- // allows apps which embed a WebView to retain the existing full screen
- // video implementation without requiring them to implement their own full
- // screen behavior.
- if (document()->settings() && document()->settings()->fullScreenEnabled()) {
- if (document()->webkitIsFullScreen() && document()->webkitCurrentFullScreenElement() == parentMediaElement(this))
- document()->webkitCancelFullScreen();
- else
- document()->requestFullScreenForElement(parentMediaElement(this), 0, Document::ExemptIFrameAllowFullScreenRequirement);
- } else
-#endif
- mediaController()->enterFullscreen();
- event->setDefaultHandled();
- }
- HTMLInputElement::defaultEventHandler(event);
-}
-
-const AtomicString& MediaControlFullscreenFullscreenButtonElement::shadowPseudoId() const
-{
- DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-fullscreen-fullscreen-button", AtomicString::ConstructFromLiteral));
- return id;
-}
-
-void MediaControlFullscreenFullscreenButtonElement::setIsFullscreen(bool)
-{
- setDisplayType(MediaExitFullscreenButton);
-}
-
-inline MediaControlFullscreenTimelineContainerElement::MediaControlFullscreenTimelineContainerElement(Document* document)
- : MediaControlDivElement(document, MediaTimelineContainer)
-{
-}
-
-PassRefPtr<MediaControlFullscreenTimelineContainerElement> MediaControlFullscreenTimelineContainerElement::create(Document* document)
-{
- RefPtr<MediaControlFullscreenTimelineContainerElement> element = adoptRef(new MediaControlFullscreenTimelineContainerElement(document));
- element->hide();
- return element.release();
-}
-
-const AtomicString& MediaControlFullscreenTimelineContainerElement::shadowPseudoId() const
-{
- DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-fullscreen-timeline-container", AtomicString::ConstructFromLiteral));
- return id;
-}
-
-MediaControlFullscreenTimelineElement::MediaControlFullscreenTimelineElement(Document* document, MediaControls* controls)
- : MediaControlInputElement(document, MediaSlider)
- , m_controls(controls)
-{
-}
-
-PassRefPtr<MediaControlFullscreenTimelineElement> MediaControlFullscreenTimelineElement::create(Document* document, MediaControls* controls)
-{
- ASSERT(controls);
-
- RefPtr<MediaControlFullscreenTimelineElement> timeline = adoptRef(new MediaControlFullscreenTimelineElement(document, controls));
- timeline->ensureUserAgentShadowRoot();
- timeline->setType("range");
- timeline->setAttribute(precisionAttr, "double");
- return timeline.release();
-}
-
-void MediaControlFullscreenTimelineElement::defaultEventHandler(Event* event)
-{
- // Left button is 0. Rejects mouse events not from left button.
- if (event->isMouseEvent() && static_cast<MouseEvent*>(event)->button())
- return;
-
- if (!attached())
- return;
-
- if (event->type() == eventNames().mousedownEvent)
- mediaController()->beginScrubbing();
-
- if (event->type() == eventNames().mouseupEvent)
- mediaController()->endScrubbing();
-
- MediaControlInputElement::defaultEventHandler(event);
-
- if (event->type() == eventNames().mouseoverEvent || event->type() == eventNames().mouseoutEvent || event->type() == eventNames().mousemoveEvent)
- return;
-
- double time = value().toDouble();
- if (event->type() == eventNames().inputEvent && time != mediaController()->currentTime())
- mediaController()->setCurrentTime(time, IGNORE_EXCEPTION);
-
- RenderSlider* slider = toRenderSlider(renderer());
- if (slider && slider->inDragMode())
- m_controls->updateCurrentTimeDisplay();
-}
-
-bool MediaControlFullscreenTimelineElement::willRespondToMouseClickEvents()
-{
- if (!attached())
- return false;
-
- return true;
-}
-
-void MediaControlFullscreenTimelineElement::setPosition(double currentTime)
-{
- setValue(String::number(currentTime));
-}
-
-void MediaControlFullscreenTimelineElement::setDuration(double duration)
-{
- setAttribute(maxAttr, String::number(std::isfinite(duration) ? duration : 0));
-}
-
-const AtomicString& MediaControlFullscreenTimelineElement::shadowPseudoId() const
-{
- DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-fullscreen-timeline", AtomicString::ConstructFromLiteral));
- return id;
-}
-
-PassRefPtr<MediaControlFullscreenTimeRemainingDisplayElement> MediaControlFullscreenTimeRemainingDisplayElement::create(Document* document)
-{
- return adoptRef(new MediaControlFullscreenTimeRemainingDisplayElement(document));
-}
-
-MediaControlFullscreenTimeRemainingDisplayElement::MediaControlFullscreenTimeRemainingDisplayElement(Document* document)
- : MediaControlTimeDisplayElement(document, MediaTimeRemainingDisplay)
-{
-}
-
-const AtomicString& MediaControlFullscreenTimeRemainingDisplayElement::shadowPseudoId() const
-{
- DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-fullscreen-time-remaining-display", AtomicString::ConstructFromLiteral));
- return id;
-}
-
-PassRefPtr<MediaControlFullscreenCurrentTimeDisplayElement> MediaControlFullscreenCurrentTimeDisplayElement::create(Document* document)
-{
- return adoptRef(new MediaControlFullscreenCurrentTimeDisplayElement(document));
-}
-
-MediaControlFullscreenCurrentTimeDisplayElement::MediaControlFullscreenCurrentTimeDisplayElement(Document* document)
- : MediaControlTimeDisplayElement(document, MediaCurrentTimeDisplay)
-{
-}
-
-const AtomicString& MediaControlFullscreenCurrentTimeDisplayElement::shadowPseudoId() const
-{
- DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-fullscreen-current-time-display", AtomicString::ConstructFromLiteral));
- return id;
-}
-
-MediaControlAudioMuteButtonElement::MediaControlAudioMuteButtonElement(Document* document, MediaControls* controls)
- : MediaControlMuteButtonElement(document, MediaMuteButton)
- , m_controls(controls)
-{
-}
-
-PassRefPtr<MediaControlAudioMuteButtonElement> MediaControlAudioMuteButtonElement::create(Document* document, MediaControls* controls)
-{
- ASSERT(controls);
-
- RefPtr<MediaControlAudioMuteButtonElement> button = adoptRef(new MediaControlAudioMuteButtonElement(document, controls));
- button->ensureUserAgentShadowRoot();
- button->setType("button");
- return button.release();
-}
-
-void MediaControlAudioMuteButtonElement::defaultEventHandler(Event* event)
-{
- if (event->type() == eventNames().mousedownEvent) {
- // We do not mute when the media player volume/mute control is touched.
- // Instead we show/hide the volume slider.
- static_cast<MediaControlsBlackBerry*>(m_controls)->toggleVolumeSlider();
- event->setDefaultHandled();
- return;
- }
- if (event->type() == eventNames().mouseoverEvent)
- m_controls->showVolumeSlider();
-
- MediaControlMuteButtonElement::defaultEventHandler(event);
-}
-
-const AtomicString& MediaControlAudioMuteButtonElement::shadowPseudoId() const
-{
- DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-audio-mute-button", AtomicString::ConstructFromLiteral));
- return id;
-}
-
-MediaControlsBlackBerry::MediaControlsBlackBerry(Document* document)
- : MediaControls(document)
- , m_buttonContainer(0)
- , m_timeDisplayContainer(0)
- , m_fullscreenTimeDisplayContainer(0)
- , m_fullscreenPlayButton(0)
- , m_fullscreenCurrentTimeDisplay(0)
- , m_fullscreenTimeline(0)
- , m_timeRemainingDisplay(0)
- , m_fullscreenTimeRemainingDisplay(0)
- , m_timelineContainer(0)
- , m_fullscreenTimelineContainer(0)
- , m_fullScreenDivider(0)
- , m_fullscreenFullScreenButton(0)
- , m_muteButton(0)
- , m_volumeSliderContainer(0)
- , m_embeddedPanel(0)
- , m_fullScreenButtonContainer(0)
- , m_playButtonContainer(0)
- , m_placeholder(0)
-{
-}
-
-PassRefPtr<MediaControls> MediaControls::create(Document* document)
-{
- return MediaControlsBlackBerry::createControls(document);
-}
-
-PassRefPtr<MediaControlsBlackBerry> MediaControlsBlackBerry::createControls(Document* document)
-{
- if (!document->page())
- return 0;
-
- RefPtr<MediaControlsBlackBerry> controls = adoptRef(new MediaControlsBlackBerry(document));
-
- RefPtr<MediaControlPanelElement> panel = MediaControlPanelElement::create(document);
- RefPtr<MediaControlEmbeddedPanelElement> embedPanel = MediaControlEmbeddedPanelElement::create(document);
-
- ExceptionCode ec;
-
- RefPtr<MediaControlPlayButtonElement> playButton = MediaControlPlayButtonElement::create(document);
- controls->m_playButton = playButton.get();
- embedPanel->appendChild(playButton.release(), ec, AttachLazily);
- if (ec)
- return 0;
-
- RefPtr<MediaControlTimelineContainerElement> timelineContainer = MediaControlTimelineContainerElement::create(document);
-
- RefPtr<MediaControlTimelineElement> timeline = MediaControlTimelineElement::create(document, controls.get());
- controls->m_timeline = timeline.get();
- timelineContainer->appendChild(timeline.release(), ec, AttachLazily);
- if (ec)
- return 0;
-
- RefPtr<MediaControlTimeDisplayContainerElement> timeDisplayContainer = MediaControlTimeDisplayContainerElement::create(document);
-
- RefPtr<MediaControlCurrentTimeDisplayElement> currentTimeDisplay = MediaControlCurrentTimeDisplayElement::create(document);
- controls->m_currentTimeDisplay = currentTimeDisplay.get();
- timeDisplayContainer->appendChild(currentTimeDisplay.release(), ec, AttachLazily);
- if (ec)
- return 0;
-
- RefPtr<MediaControlTimeRemainingDisplayElement> timeRemainingDisplay = MediaControlTimeRemainingDisplayElement::create(document);
- controls->m_timeRemainingDisplay = timeRemainingDisplay.get();
- timeDisplayContainer->appendChild(timeRemainingDisplay.release(), ec, AttachLazily);
- if (ec)
- return 0;
-
- controls->m_timeDisplayContainer = timeDisplayContainer.get();
- timelineContainer->appendChild(timeDisplayContainer.release(), ec, AttachLazily);
- if (ec)
- return 0;
-
- controls->m_timelineContainer = timelineContainer.get();
- embedPanel->appendChild(timelineContainer.release(), ec, AttachLazily);
- if (ec)
- return 0;
-
- RefPtr<MediaControlFullscreenButtonElement> fullScreenButton = MediaControlFullscreenButtonElement::create(document);
- controls->m_fullScreenButton = fullScreenButton.get();
- embedPanel->appendChild(fullScreenButton.release(), ec, AttachLazily);
- if (ec)
- return 0;
-
- if (document->page()->theme()->usesMediaControlVolumeSlider()) {
- // The mute button and the slider element should be in the same div.
- RefPtr<HTMLDivElement> volumeControlContainer = HTMLDivElement::create(document);
-
- RefPtr<MediaControlVolumeSliderContainerElement> volumeSliderContainer = MediaControlVolumeSliderContainerElement::create(document);
-
- RefPtr<MediaControlPanelVolumeSliderElement> slider = MediaControlPanelVolumeSliderElement::create(document);
- controls->m_volumeSlider = slider.get();
- volumeSliderContainer->appendChild(slider.release(), ec, AttachLazily);
- if (ec)
- return 0;
-
- controls->m_volumeSliderContainer = volumeSliderContainer.get();
- volumeControlContainer->appendChild(volumeSliderContainer.release(), ec, AttachLazily);
- if (ec)
- return 0;
- RefPtr<MediaControlAudioMuteButtonElement> muteButton = MediaControlAudioMuteButtonElement::create(document, controls.get());
- controls->m_muteButton = muteButton.get();
- volumeControlContainer->appendChild(muteButton.release(), ec, AttachLazily);
- if (ec)
- return 0;
-
- embedPanel->appendChild(volumeControlContainer.release(), ec, AttachLazily);
- if (ec)
- return 0;
- }
-
- RefPtr<MediaControlFullscreenTimelineContainerElement> fullscreenTimelineContainer = MediaControlFullscreenTimelineContainerElement::create(document);
-
- RefPtr<MediaControlFullscreenTimelineElement> fullscreenTimeline = MediaControlFullscreenTimelineElement::create(document, controls.get());
- controls->m_fullscreenTimeline = fullscreenTimeline.get();
- fullscreenTimelineContainer->appendChild(fullscreenTimeline.release(), ec, AttachLazily);
- if (ec)
- return 0;
-
- RefPtr<MediaControlFullscreenTimeDisplayContainerElement> fullscreenTimeDisplayContainer = MediaControlFullscreenTimeDisplayContainerElement::create(document);
-
- RefPtr<MediaControlFullscreenCurrentTimeDisplayElement> fullscreenCurrentTimeDisplay = MediaControlFullscreenCurrentTimeDisplayElement::create(document);
- controls->m_fullscreenCurrentTimeDisplay = fullscreenCurrentTimeDisplay.get();
- fullscreenTimeDisplayContainer->appendChild(fullscreenCurrentTimeDisplay.release(), ec, AttachLazily);
- if (ec)
- return 0;
-
- RefPtr<MediaControlFullscreenTimeRemainingDisplayElement> fullscreenTimeRemainingDisplay = MediaControlFullscreenTimeRemainingDisplayElement::create(document);
- controls->m_fullscreenTimeRemainingDisplay = fullscreenTimeRemainingDisplay.get();
- fullscreenTimeDisplayContainer->appendChild(fullscreenTimeRemainingDisplay.release(), ec, AttachLazily);
- if (ec)
- return 0;
-
- controls->m_fullscreenTimeDisplayContainer = fullscreenTimeDisplayContainer.get();
- fullscreenTimelineContainer->appendChild(fullscreenTimeDisplayContainer.release(), ec, AttachLazily);
- if (ec)
- return 0;
-
- controls->m_fullscreenTimelineContainer = fullscreenTimelineContainer.get();
- panel->appendChild(fullscreenTimelineContainer.release(), ec, AttachLazily);
- if (ec)
- return 0;
-
- RefPtr<MediaControlButtonGroupContainerElement> buttonGroupContainer = MediaControlButtonGroupContainerElement::create(document);
-
- // FIXME: Only create when needed <http://webkit.org/b/57163>
- RefPtr<MediaControlFullscreenButtonContainerElement> fullScreenButtonContainer = MediaControlFullscreenButtonContainerElement::create(document);
- controls->m_fullScreenButtonContainer = fullScreenButtonContainer.get();
- RefPtr<MediaControlFullscreenFullscreenButtonElement> fullscreenFullScreenButton = MediaControlFullscreenFullscreenButtonElement::create(document);
- controls->m_fullscreenFullScreenButton = fullscreenFullScreenButton.get();
- fullScreenButtonContainer->appendChild(fullscreenFullScreenButton.release(), ec, AttachLazily);
- if (ec)
- return 0;
- RefPtr<MediaControlFullscreenButtonDividerElement> fullScreenDivider = MediaControlFullscreenButtonDividerElement::create(document);
- controls->m_fullScreenDivider = fullScreenDivider.get();
- fullScreenButtonContainer->appendChild(fullScreenDivider.release(), ec, AttachLazily);
- if (ec)
- return 0;
- buttonGroupContainer->appendChild(fullScreenButtonContainer.release(), ec, AttachLazily);
- if (ec)
- return 0;
-
- RefPtr<MediaControlPlayButtonContainerElement> playButtonContainer = MediaControlPlayButtonContainerElement::create(document);
- controls->m_playButtonContainer = playButtonContainer.get();
- RefPtr<MediaControlFullscreenPlayButtonElement> fullscreenPlayButton = MediaControlFullscreenPlayButtonElement::create(document);
- controls->m_fullscreenPlayButton = fullscreenPlayButton.get();
- playButtonContainer->appendChild(fullscreenPlayButton.release(), ec, AttachLazily);
- if (ec)
- return 0;
- buttonGroupContainer->appendChild(playButtonContainer.release(), ec, AttachLazily);
- if (ec)
- return 0;
-
- RefPtr<MediaControlPlaceholderElement> placeholder = MediaControlPlaceholderElement::create(document);
- controls->m_placeholder = placeholder.get();
- buttonGroupContainer->appendChild(placeholder.release(), ec, AttachLazily);
- if (ec)
- return 0;
-
- controls->m_buttonContainer = buttonGroupContainer.get();
- panel->appendChild(buttonGroupContainer.release(), ec, AttachLazily);
- if (ec)
- return 0;
-
- if (document->page()->theme()->supportsClosedCaptioning()) {
- RefPtr<MediaControlToggleClosedCaptionsButtonElement> toggleClosedCaptionsButton = MediaControlToggleClosedCaptionsButtonElement::create(document, controls.get());
- controls->m_toggleClosedCaptionsButton = toggleClosedCaptionsButton.get();
- panel->appendChild(toggleClosedCaptionsButton.release(), ec, AttachLazily);
- if (ec)
- return 0;
- }
-
- controls->m_panel = panel.get();
- controls->appendChild(panel.release(), ec, AttachLazily);
- if (ec)
- return 0;
-
- controls->m_embeddedPanel = embedPanel.get();
- controls->appendChild(embedPanel.release(), ec, AttachLazily);
- if (ec)
- return 0;
-
- return controls.release();
-}
-
-void MediaControlsBlackBerry::setMediaController(MediaControllerInterface* controller)
-{
- if (m_mediaController == controller)
- return;
-
- MediaControls::setMediaController(controller);
-
- if (m_buttonContainer)
- m_buttonContainer->setMediaController(controller);
- if (m_timeDisplayContainer)
- m_timeDisplayContainer->setMediaController(controller);
- if (m_fullscreenTimeDisplayContainer)
- m_fullscreenTimeDisplayContainer->setMediaController(controller);
- if (m_fullscreenPlayButton)
- m_fullscreenPlayButton->setMediaController(controller);
- if (m_fullscreenCurrentTimeDisplay)
- m_fullscreenCurrentTimeDisplay->setMediaController(controller);
- if (m_fullscreenTimeline)
- m_fullscreenTimeline->setMediaController(controller);
- if (m_timeRemainingDisplay)
- m_timeRemainingDisplay->setMediaController(controller);
- if (m_fullscreenTimeRemainingDisplay)
- m_fullscreenTimeRemainingDisplay->setMediaController(controller);
- if (m_timelineContainer)
- m_timelineContainer->setMediaController(controller);
- if (m_fullscreenTimelineContainer)
- m_fullscreenTimelineContainer->setMediaController(controller);
- if (m_fullscreenFullScreenButton)
- m_fullscreenFullScreenButton->setMediaController(controller);
- if (m_muteButton)
- m_muteButton->setMediaController(controller);
- if (m_volumeSliderContainer)
- m_volumeSliderContainer->setMediaController(controller);
- if (m_embeddedPanel)
- m_embeddedPanel->setMediaController(controller);
- reset();
-}
-
-void MediaControlsBlackBerry::show()
-{
- if (m_isFullscreen) {
- m_panel->setIsDisplayed(true);
- m_panel->show();
- } else {
- m_embeddedPanel->setIsDisplayed(true);
- m_embeddedPanel->show();
- }
-}
-
-void MediaControlsBlackBerry::hide()
-{
- if (m_isFullscreen) {
- m_panel->setIsDisplayed(false);
- m_panel->hide();
- } else {
- m_embeddedPanel->setIsDisplayed(false);
- m_embeddedPanel->hide();
- m_volumeSliderContainer->hide();
- }
-}
-
-void MediaControlsBlackBerry::makeOpaque()
-{
- if (m_isFullscreen)
- m_panel->makeOpaque();
- else
- m_embeddedPanel->makeOpaque();
-}
-
-void MediaControlsBlackBerry::makeTransparent()
-{
- if (m_isFullscreen)
- m_panel->makeTransparent();
- else {
- m_embeddedPanel->makeTransparent();
- m_volumeSliderContainer->hide();
- }
-}
-
-void MediaControlsBlackBerry::reset()
-{
- Page* page = document()->page();
- if (!page)
- return;
-
- updateStatusDisplay();
-
- if (m_fullScreenButton) {
- if (m_mediaController->supportsFullscreen())
- m_fullScreenButton->show();
- else
- m_fullScreenButton->hide();
- }
- if (m_fullscreenFullScreenButton) {
- if (m_mediaController->supportsFullscreen())
- m_fullscreenFullScreenButton->show();
- else
- m_fullscreenFullScreenButton->hide();
- }
- double duration = m_mediaController->duration();
- if (std::isfinite(duration) || page->theme()->hasOwnDisabledStateHandlingFor(MediaSliderPart)) {
- double now = m_mediaController->currentTime();
- m_timeline->setDuration(duration);
- m_fullscreenTimeline->setDuration(duration);
- m_timelineContainer->show();
- m_fullscreenTimelineContainer->show();
- m_timeline->setPosition(now);
- m_fullscreenTimeline->setPosition(now);
- updateCurrentTimeDisplay();
- } else {
- m_timelineContainer->hide();
- m_fullscreenTimelineContainer->hide();
- }
-
- if (m_mediaController->hasAudio() || page->theme()->hasOwnDisabledStateHandlingFor(MediaMuteButtonPart))
- m_muteButton->show();
- else
- m_muteButton->hide();
-
- if (m_volumeSlider)
- setSliderVolume();
-
- if (m_toggleClosedCaptionsButton) {
- if (m_mediaController->hasClosedCaptions())
- m_toggleClosedCaptionsButton->show();
- else
- m_toggleClosedCaptionsButton->hide();
- }
-
- if (m_playButton)
- m_playButton->updateDisplayType();
-
- if (m_fullscreenPlayButton)
- m_fullscreenPlayButton->updateDisplayType();
-
- makeOpaque();
-}
-
-void MediaControlsBlackBerry::bufferingProgressed()
-{
- // We only need to update buffering progress when paused, during normal
- // playback playbackProgressed() will take care of it.
- if (m_mediaController->paused()) {
- double now = m_mediaController->currentTime();
- m_timeline->setPosition(now);
- m_fullscreenTimeline->setPosition(now);
- }
-}
-
-void MediaControlsBlackBerry::playbackStarted()
-{
- double now = m_mediaController->currentTime();
- m_playButton->updateDisplayType();
- m_fullscreenPlayButton->updateDisplayType();
- m_timeline->setPosition(now);
- m_fullscreenTimeline->setPosition(now);
- updateCurrentTimeDisplay();
-
- if (m_isFullscreen)
- startHideFullscreenControlsTimer();
-}
-
-void MediaControlsBlackBerry::playbackProgressed()
-{
- double now = m_mediaController->currentTime();
- m_timeline->setPosition(now);
- m_fullscreenTimeline->setPosition(now);
- updateCurrentTimeDisplay();
-
- if (!m_isMouseOverControls && m_mediaController->hasVideo())
- makeTransparent();
-}
-
-void MediaControlsBlackBerry::playbackStopped()
-{
- double now = m_mediaController->currentTime();
- m_playButton->updateDisplayType();
- m_fullscreenPlayButton->updateDisplayType();
- m_timeline->setPosition(now);
- m_fullscreenTimeline->setPosition(now);
- updateCurrentTimeDisplay();
- makeOpaque();
-
- stopHideFullscreenControlsTimer();
-}
-
-void MediaControlsBlackBerry::updateCurrentTimeDisplay()
-{
- double now = m_mediaController->currentTime();
- double duration = m_mediaController->duration();
-
- Page* page = document()->page();
- if (!page)
- return;
-
- // Allow the theme to format the time.
- m_currentTimeDisplay->setInnerText(page->theme()->formatMediaControlsCurrentTime(now, duration), IGNORE_EXCEPTION);
- m_currentTimeDisplay->setCurrentValue(now);
- m_fullscreenCurrentTimeDisplay->setInnerText(page->theme()->formatMediaControlsCurrentTime(now, duration), IGNORE_EXCEPTION);
- m_fullscreenCurrentTimeDisplay->setCurrentValue(now);
- m_timeRemainingDisplay->setInnerText(page->theme()->formatMediaControlsRemainingTime(now, duration), IGNORE_EXCEPTION);
- m_timeRemainingDisplay->setCurrentValue(now - duration);
- m_fullscreenTimeRemainingDisplay->setInnerText(page->theme()->formatMediaControlsRemainingTime(now, duration), IGNORE_EXCEPTION);
- m_fullscreenTimeRemainingDisplay->setCurrentValue(now - duration);
-}
-
-void MediaControlsBlackBerry::reportedError()
-{
- Page* page = document()->page();
- if (!page)
- return;
-
- if (!page->theme()->hasOwnDisabledStateHandlingFor(MediaSliderPart)) {
- m_timelineContainer->hide();
- m_fullscreenTimelineContainer->hide();
- }
-
- if (!page->theme()->hasOwnDisabledStateHandlingFor(MediaMuteButtonPart))
- m_muteButton->hide();
-
- if (m_fullScreenButton)
- m_fullScreenButton->hide();
-
- if (m_fullScreenDivider)
- m_fullScreenDivider->hide();
-
- if (m_fullscreenFullScreenButton)
- m_fullscreenFullScreenButton->hide();
-
- if (m_volumeSliderContainer)
- m_volumeSliderContainer->hide();
-
- if (m_toggleClosedCaptionsButton && !page->theme()->hasOwnDisabledStateHandlingFor(MediaToggleClosedCaptionsButtonPart))
- m_toggleClosedCaptionsButton->hide();
-}
-
-void MediaControlsBlackBerry::changedMute()
-{
- m_muteButton->changedMute();
-}
-
-void MediaControlsBlackBerry::enteredFullscreen()
-{
- MediaControls::enteredFullscreen();
-
- m_panel->setCanBeDragged(true);
- m_embeddedPanel->setCanBeDragged(true);
-
- if (m_fullscreenFullScreenButton)
- m_fullscreenFullScreenButton->setIsFullscreen(true);
-}
-
-void MediaControlsBlackBerry::exitedFullscreen()
-{
- m_panel->setCanBeDragged(false);
- m_embeddedPanel->setCanBeDragged(false);
-
- if (m_fullscreenFullScreenButton)
- m_fullscreenFullScreenButton->setIsFullscreen(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();
- m_embeddedPanel->resetPosition();
-
- MediaControls::exitedFullscreen();
-}
-
-void MediaControlsBlackBerry::showVolumeSlider()
-{
- if (!m_mediaController->hasAudio())
- return;
-
- if (m_volumeSliderContainer)
- m_volumeSliderContainer->show();
-}
-
-void MediaControlsBlackBerry::toggleVolumeSlider()
-{
- if (!m_mediaController->hasAudio())
- return;
-
- if (m_volumeSliderContainer) {
- if (m_volumeSliderContainer->renderer() && m_volumeSliderContainer->renderer()->visibleToHitTesting())
- m_volumeSliderContainer->hide();
- else
- m_volumeSliderContainer->show();
- }
-}
-
-bool MediaControlsBlackBerry::shouldHideControls()
-{
- if (m_isFullscreen)
- return !m_panel->hovered();
- return !m_embeddedPanel->hovered();
-}
-}
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlsBlackBerryh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/html/shadow/MediaControlsBlackBerry.h (161606 => 161607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlsBlackBerry.h 2014-01-10 01:18:18 UTC (rev 161606)
+++ trunk/Source/WebCore/html/shadow/MediaControlsBlackBerry.h 2014-01-10 01:24:53 UTC (rev 161607)
</span><span class="lines">@@ -1,298 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
- * Copyright (C) 2011 Google Inc. All rights reserved.
- * Copyright (C) 2012 Research In Motion Limited. All rights reserved.
- *
- * 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 COMPUTER, 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 COMPUTER, 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.
- */
-
-#ifndef MediaControlsBlackBerry_h
-#define MediaControlsBlackBerry_h
-
-#if ENABLE(VIDEO)
-
-#include "MediaControlElementTypes.h"
-#include "MediaControlElements.h"
-#include "MediaControls.h"
-#include <wtf/RefPtr.h>
-
-namespace WebCore {
-
-class HTMLInputElement;
-class HTMLMediaElement;
-class Event;
-class MediaPlayer;
-
-class RenderBox;
-class RenderMedia;
-
-#if ENABLE(VIDEO_TRACK)
-class MediaControlTextTrackContainerElement;
-class MediaControlTextTrackDisplayElement;
-#endif
-
-class MediaControlButtonGroupContainerElement : public MediaControlDivElement {
-public:
- static PassRefPtr<MediaControlButtonGroupContainerElement> create(Document*);
-
-protected:
- MediaControlButtonGroupContainerElement(Document*);
- virtual const AtomicString& shadowPseudoId() const OVERRIDE;
-};
-
-class MediaControlTimeDisplayContainerElement : public MediaControlDivElement {
-public:
- static PassRefPtr<MediaControlTimeDisplayContainerElement> create(Document*);
-
-protected:
- MediaControlTimeDisplayContainerElement(Document*);
- virtual const AtomicString& shadowPseudoId() const OVERRIDE;
-};
-
-class MediaControlEmbeddedPanelElement : public MediaControlDivElement {
-public:
- static PassRefPtr<MediaControlEmbeddedPanelElement> create(Document*);
-
- void setCanBeDragged(bool);
- void setIsDisplayed(bool);
-
- void resetPosition();
- void makeOpaque();
- void makeTransparent();
-
- virtual bool willRespondToMouseMoveEvents() OVERRIDE { return true; }
- virtual bool willRespondToMouseClickEvents() OVERRIDE { return true; }
-
-private:
- explicit MediaControlEmbeddedPanelElement(Document*);
-
- virtual const AtomicString& shadowPseudoId() const OVERRIDE;
- virtual void defaultEventHandler(Event*) OVERRIDE;
-
- void startDrag(const LayoutPoint& eventLocation);
- void continueDrag(const LayoutPoint& eventLocation);
- void endDrag();
-
- void startTimer();
- void stopTimer();
- void transitionTimerFired(Timer<MediaControlEmbeddedPanelElement>*);
-
- void setPosition(const LayoutPoint&);
-
- bool m_canBeDragged;
- bool m_isBeingDragged;
- bool m_isDisplayed;
- bool m_opaque;
- LayoutPoint m_lastDragEventLocation;
- LayoutPoint m_cumulativeDragOffset;
-
- Timer<MediaControlEmbeddedPanelElement> m_transitionTimer;
-};
-
-class MediaControlFullscreenTimeDisplayContainerElement : public MediaControlDivElement {
-public:
- static PassRefPtr<MediaControlFullscreenTimeDisplayContainerElement> create(Document*);
-
-protected:
- MediaControlFullscreenTimeDisplayContainerElement(Document*);
- virtual const AtomicString& shadowPseudoId() const OVERRIDE;
-};
-
-class MediaControlFullscreenButtonContainerElement : public MediaControlDivElement {
-public:
- static PassRefPtr<MediaControlFullscreenButtonContainerElement> create(Document*);
-
-private:
- MediaControlFullscreenButtonContainerElement(Document*);
- virtual const AtomicString& shadowPseudoId() const OVERRIDE;
-};
-
-class MediaControlFullscreenButtonDividerElement : public MediaControlDivElement {
-public:
- static PassRefPtr<MediaControlFullscreenButtonDividerElement> create(Document*);
-
-private:
- MediaControlFullscreenButtonDividerElement(Document*);
- virtual const AtomicString& shadowPseudoId() const OVERRIDE;
-};
-
-class MediaControlPlayButtonContainerElement : public MediaControlDivElement {
-public:
- static PassRefPtr<MediaControlPlayButtonContainerElement> create(Document*);
-
-private:
- MediaControlPlayButtonContainerElement(Document*);
- virtual const AtomicString& shadowPseudoId() const OVERRIDE;
-};
-
-class MediaControlPlaceholderElement : public MediaControlDivElement {
-public:
- static PassRefPtr<MediaControlPlaceholderElement> create(Document*);
-
-private:
- MediaControlPlaceholderElement(Document*);
- virtual const AtomicString& shadowPseudoId() const OVERRIDE;
-};
-
-class MediaControlFullscreenPlayButtonElement : public MediaControlInputElement {
-public:
- static PassRefPtr<MediaControlFullscreenPlayButtonElement> create(Document*);
-
- virtual bool willRespondToMouseClickEvents() OVERRIDE { return true; }
- virtual void updateDisplayType() OVERRIDE;
-
-private:
- MediaControlFullscreenPlayButtonElement(Document*);
- virtual const AtomicString& shadowPseudoId() const OVERRIDE;
- virtual void defaultEventHandler(Event*) OVERRIDE;
-};
-
-class MediaControlFullscreenFullscreenButtonElement : public MediaControlInputElement {
-public:
- static PassRefPtr<MediaControlFullscreenFullscreenButtonElement> create(Document*);
-
- virtual bool willRespondToMouseClickEvents() OVERRIDE { return true; }
- void setIsFullscreen(bool);
-
-private:
- MediaControlFullscreenFullscreenButtonElement(Document*);
- virtual const AtomicString& shadowPseudoId() const OVERRIDE;
- virtual void defaultEventHandler(Event*) OVERRIDE;
-};
-
-class MediaControlFullscreenTimelineContainerElement : public MediaControlDivElement {
-public:
- static PassRefPtr<MediaControlFullscreenTimelineContainerElement> create(Document*);
-
-private:
- MediaControlFullscreenTimelineContainerElement(Document*);
- virtual const AtomicString& shadowPseudoId() const OVERRIDE;
-};
-
-class MediaControlFullscreenTimelineElement : public MediaControlInputElement {
-public:
- static PassRefPtr<MediaControlFullscreenTimelineElement> create(Document*, MediaControls*);
-
- virtual bool willRespondToMouseClickEvents() OVERRIDE;
- void setPosition(double);
- void setDuration(double);
-
-private:
- MediaControlFullscreenTimelineElement(Document*, MediaControls*);
- virtual const AtomicString& shadowPseudoId() const OVERRIDE;
- virtual void defaultEventHandler(Event*) OVERRIDE;
-
- MediaControls* m_controls;
-};
-
-class MediaControlFullscreenTimeRemainingDisplayElement : public MediaControlTimeDisplayElement {
-public:
- static PassRefPtr<MediaControlFullscreenTimeRemainingDisplayElement> create(Document*);
-
-private:
- MediaControlFullscreenTimeRemainingDisplayElement(Document*);
- virtual const AtomicString& shadowPseudoId() const OVERRIDE;
-};
-
-class MediaControlFullscreenCurrentTimeDisplayElement : public MediaControlTimeDisplayElement {
-public:
- static PassRefPtr<MediaControlFullscreenCurrentTimeDisplayElement> create(Document*);
-
-private:
- MediaControlFullscreenCurrentTimeDisplayElement(Document*);
- virtual const AtomicString& shadowPseudoId() const OVERRIDE;
-};
-
-class MediaControlAudioMuteButtonElement : public MediaControlMuteButtonElement {
-public:
- static PassRefPtr<MediaControlAudioMuteButtonElement> create(Document*, MediaControls*);
-
- virtual bool willRespondToMouseMoveEvents() OVERRIDE { return true; }
-
-private:
- explicit MediaControlAudioMuteButtonElement(Document*, MediaControls*);
-
- virtual const AtomicString& shadowPseudoId() const OVERRIDE;
- virtual void defaultEventHandler(Event*) OVERRIDE;
-
- MediaControls* m_controls;
-};
-
-class MediaControlsBlackBerry : public MediaControls {
-public:
- static PassRefPtr<MediaControlsBlackBerry> createControls(Document*);
-
- // MediaControls implementation.
- void setMediaController(MediaControllerInterface*) OVERRIDE;
-
- void show() OVERRIDE;
- void hide() OVERRIDE;
- void makeOpaque() OVERRIDE;
- void makeTransparent() OVERRIDE;
-
- void reset() OVERRIDE;
-
- void bufferingProgressed() OVERRIDE;
- void playbackProgressed() OVERRIDE;
- void playbackStarted() OVERRIDE;
- void playbackStopped() OVERRIDE;
-
- void changedMute() OVERRIDE;
-
- void enteredFullscreen() OVERRIDE;
- void exitedFullscreen() OVERRIDE;
-
- void reportedError() OVERRIDE;
-
- void showVolumeSlider() OVERRIDE;
- void toggleVolumeSlider();
- void updateCurrentTimeDisplay() OVERRIDE;
-
- virtual bool shouldHideControls() OVERRIDE;
-
-private:
- MediaControlsBlackBerry(Document*);
-
- MediaControlButtonGroupContainerElement* m_buttonContainer;
- MediaControlTimeDisplayContainerElement* m_timeDisplayContainer;
- MediaControlFullscreenTimeDisplayContainerElement* m_fullscreenTimeDisplayContainer;
- MediaControlFullscreenPlayButtonElement* m_fullscreenPlayButton;
- MediaControlFullscreenCurrentTimeDisplayElement* m_fullscreenCurrentTimeDisplay;
- MediaControlFullscreenTimelineElement* m_fullscreenTimeline;
- MediaControlTimeRemainingDisplayElement* m_timeRemainingDisplay;
- MediaControlFullscreenTimeRemainingDisplayElement* m_fullscreenTimeRemainingDisplay;
- MediaControlTimelineContainerElement* m_timelineContainer;
- MediaControlFullscreenTimelineContainerElement* m_fullscreenTimelineContainer;
- MediaControlFullscreenButtonDividerElement* m_fullScreenDivider;
- MediaControlFullscreenFullscreenButtonElement* m_fullscreenFullScreenButton;
- MediaControlAudioMuteButtonElement* m_muteButton;
- MediaControlVolumeSliderContainerElement* m_volumeSliderContainer;
- MediaControlEmbeddedPanelElement* m_embeddedPanel;
- MediaControlFullscreenButtonContainerElement* m_fullScreenButtonContainer;
- MediaControlPlayButtonContainerElement* m_playButtonContainer;
- MediaControlPlaceholderElement* m_placeholder;
-};
-
-}
-
-#endif
-#endif
</del></span></pre>
</div>
</div>
</body>
</html>