Remove obsolete media player resources.
Following https://codereview.chromium.org/2447503002
This clean up the resources that became obsolete now that the old media
player can no longer be used in Chromium.
BUG=658520
Review-Url: https://codereview.chromium.org/2447663002
Cr-Commit-Position: refs/heads/master@{#427660}
diff --git a/content/child/blink_platform_impl.cc b/content/child/blink_platform_impl.cc
index 95badb0..73260576 100644
--- a/content/child/blink_platform_impl.cc
+++ b/content/child/blink_platform_impl.cc
@@ -516,62 +516,27 @@
const DataResource kDataResources[] = {
{"missingImage", IDR_BROKENIMAGE, ui::SCALE_FACTOR_100P},
{"missingImage@2x", IDR_BROKENIMAGE, ui::SCALE_FACTOR_200P},
- {"mediaplayerPause", IDR_MEDIAPLAYER_PAUSE_BUTTON, ui::SCALE_FACTOR_100P},
{"mediaplayerPauseNew",
IDR_MEDIAPLAYER_PAUSE_BUTTON_NEW,
ui::SCALE_FACTOR_100P},
- {"mediaplayerPlay", IDR_MEDIAPLAYER_PLAY_BUTTON, ui::SCALE_FACTOR_100P},
{"mediaplayerPlayNew",
IDR_MEDIAPLAYER_PLAY_BUTTON_NEW,
ui::SCALE_FACTOR_100P},
- {"mediaplayerPlayDisabled",
- IDR_MEDIAPLAYER_PLAY_BUTTON_DISABLED,
- ui::SCALE_FACTOR_100P},
- {"mediaplayerSoundLevel3",
- IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON,
- ui::SCALE_FACTOR_100P},
{"mediaplayerSoundLevel3New",
IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_NEW,
ui::SCALE_FACTOR_100P},
- {"mediaplayerSoundLevel2",
- IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON,
- ui::SCALE_FACTOR_100P},
- {"mediaplayerSoundLevel1",
- IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON,
- ui::SCALE_FACTOR_100P},
- {"mediaplayerSoundLevel0",
- IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON,
- ui::SCALE_FACTOR_100P},
{"mediaplayerSoundLevel0New",
IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_NEW,
ui::SCALE_FACTOR_100P},
- {"mediaplayerSoundDisabled",
- IDR_MEDIAPLAYER_SOUND_DISABLED,
- ui::SCALE_FACTOR_100P},
- {"mediaplayerSliderThumb",
- IDR_MEDIAPLAYER_SLIDER_THUMB,
- ui::SCALE_FACTOR_100P},
{"mediaplayerSliderThumbNew",
IDR_MEDIAPLAYER_SLIDER_THUMB_NEW,
ui::SCALE_FACTOR_100P},
- {"mediaplayerVolumeSliderThumb",
- IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB,
- ui::SCALE_FACTOR_100P},
{"mediaplayerVolumeSliderThumbNew",
IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_NEW,
ui::SCALE_FACTOR_100P},
- {"mediaplayerVolumeSliderThumbDisabled",
- IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED,
- ui::SCALE_FACTOR_100P},
- {"mediaplayerClosedCaption",
- IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON,
- ui::SCALE_FACTOR_100P},
{"mediaplayerClosedCaptionNew",
IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_NEW,
ui::SCALE_FACTOR_100P},
- {"mediaplayerClosedCaptionDisabled",
- IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED,
- ui::SCALE_FACTOR_100P},
{"mediaplayerClosedCaptionDisabledNew",
IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED_NEW,
ui::SCALE_FACTOR_100P},
@@ -581,51 +546,24 @@
{"mediaplayerExitFullscreen",
IDR_MEDIAPLAYER_EXIT_FULLSCREEN_BUTTON,
ui::SCALE_FACTOR_100P},
- {"mediaplayerFullscreen",
- IDR_MEDIAPLAYER_FULLSCREEN_BUTTON,
- ui::SCALE_FACTOR_100P},
- {"mediaplayerCastOff",
- IDR_MEDIAPLAYER_CAST_BUTTON_OFF,
- ui::SCALE_FACTOR_100P},
- {"mediaplayerCastOn",
- IDR_MEDIAPLAYER_CAST_BUTTON_ON,
- ui::SCALE_FACTOR_100P},
{"mediaplayerCastOffNew",
IDR_MEDIAPLAYER_CAST_BUTTON_OFF_NEW,
ui::SCALE_FACTOR_100P},
{"mediaplayerCastOnNew",
IDR_MEDIAPLAYER_CAST_BUTTON_ON_NEW,
ui::SCALE_FACTOR_100P},
- {"mediaplayerFullscreenDisabled",
- IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED,
- ui::SCALE_FACTOR_100P},
- {"mediaplayerOverlayCastOff",
- IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF,
- ui::SCALE_FACTOR_100P},
{"mediaplayerOverlayCastOffNew",
IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF_NEW,
ui::SCALE_FACTOR_100P},
- {"mediaplayerOverlayPlay",
- IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON,
- ui::SCALE_FACTOR_100P},
{"mediaplayerOverlayPlayNew",
IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON_NEW,
ui::SCALE_FACTOR_100P},
- {"mediaplayerTrackSelectionCheckmark",
- IDR_MEDIAPLAYER_TRACKSELECTION_CHECKMARK,
- ui::SCALE_FACTOR_100P},
{"mediaplayerTrackSelectionCheckmarkNew",
IDR_MEDIAPLAYER_TRACKSELECTION_CHECKMARK_NEW,
ui::SCALE_FACTOR_100P},
- {"mediaplayerClosedCaptionsIcon",
- IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON,
- ui::SCALE_FACTOR_100P},
{"mediaplayerClosedCaptionsIconNew",
IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON_NEW,
ui::SCALE_FACTOR_100P},
- {"mediaplayerSubtitlesIcon",
- IDR_MEDIAPLAYER_SUBTITLES_ICON,
- ui::SCALE_FACTOR_100P},
{"mediaplayerSubtitlesIconNew",
IDR_MEDIAPLAYER_SUBTITLES_ICON_NEW,
ui::SCALE_FACTOR_100P},
@@ -655,10 +593,6 @@
IDR_UASTYLE_FULLSCREEN_ANDROID_CSS,
ui::SCALE_FACTOR_NONE},
// Not limited to Android since it's used for mobile layouts in inspector.
- {"mediaControlsAndroid.css",
- IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_CSS,
- ui::SCALE_FACTOR_NONE},
- // Not limited to Android since it's used for mobile layouts in inspector.
{"mediaControlsAndroidNew.css",
IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_NEW_CSS,
ui::SCALE_FACTOR_NONE},
@@ -678,9 +612,6 @@
ui::SCALE_FACTOR_NONE},
{"svg.css", IDR_UASTYLE_SVG_CSS, ui::SCALE_FACTOR_NONE},
{"mathml.css", IDR_UASTYLE_MATHML_CSS, ui::SCALE_FACTOR_NONE},
- {"mediaControls.css",
- IDR_UASTYLE_MEDIA_CONTROLS_CSS,
- ui::SCALE_FACTOR_NONE},
{"mediaControlsNew.css",
IDR_UASTYLE_MEDIA_CONTROLS_NEW_CSS,
ui::SCALE_FACTOR_NONE},
diff --git a/third_party/WebKit/Source/core/css/mediaControls.css b/third_party/WebKit/Source/core/css/mediaControls.css
deleted file mode 100644
index 79affd91..0000000
--- a/third_party/WebKit/Source/core/css/mediaControls.css
+++ /dev/null
@@ -1,490 +0,0 @@
-/*
- * Copyright (C) 2009 Apple Inc. All rights reserved.
- * Copyright (C) 2009 Google Inc.
- *
- * 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.
- */
-
-/* Chromium default media controls */
-
-/* WARNING: This css file can only style <audio> and <video> elements */
-
-audio:not([controls]) {
- display: none !important;
-}
-
-audio {
- width: 300px;
- height: 30px;
-}
-
-audio::-webkit-media-controls,
-video::-webkit-media-controls {
- width: inherit;
- height: inherit;
- position: relative;
- direction: ltr;
- display: flex;
- flex-direction: column;
- font-family: Arial, Helvetica, sans-serif;
- justify-content: flex-end;
- align-items: center;
-}
-
-audio::-webkit-media-controls-enclosure, video::-webkit-media-controls-enclosure {
- width: 100%;
- max-width: 800px;
- height: 30px;
- flex-shrink: 0;
- bottom: 0;
- text-indent: 0;
- padding: 0;
- box-sizing: border-box;
-}
-
-video::-webkit-media-controls-enclosure {
- padding: 0px 5px 5px 5px;
- height: 35px;
- flex-shrink: 0;
-}
-
-audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel {
- display: flex;
- flex-direction: row;
- align-items: center;
- /* We use flex-start here to ensure that the play button is visible even
- * if we are too small to show all controls.
- */
- justify-content: flex-start;
- -webkit-user-select: none;
- position: relative;
- width: 100%;
- z-index: 0;
- overflow: hidden;
- text-align: right;
- bottom: auto;
- height: 30px;
- background-color: rgba(20, 20, 20, 0.8);
- border-radius: 5px;
- /* The duration is also specified in MediaControlElements.cpp and LayoutTests/media/media-controls.js */
- transition: opacity 0.3s;
-}
-
-audio:-webkit-full-page-media, video:-webkit-full-page-media {
- max-height: 100%;
- max-width: 100%;
-}
-
-audio:-webkit-full-page-media::-webkit-media-controls-panel,
-video:-webkit-full-page-media::-webkit-media-controls-panel {
- bottom: 0px;
-}
-
-audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button {
- -webkit-appearance: media-mute-button;
- display: flex;
- flex: none;
- border: none;
- box-sizing: border-box;
- width: 35px;
- height: 30px;
- line-height: 30px;
- margin: 0 6px 0 0;
- padding: 0;
- background-color: initial;
- color: inherit;
-}
-
-audio::-webkit-media-controls-overlay-enclosure {
- display: none;
-}
-
-video::-webkit-media-controls-overlay-enclosure {
- display: flex;
- position: relative;
- flex-direction: column;
- justify-content: flex-end;
- align-items: center;
- flex: 1 1;
- min-height: 0;
- width: 100%;
- text-indent: 0;
- box-sizing: border-box;
- overflow: hidden;
-}
-
-video::-webkit-media-controls-overlay-play-button {
- -webkit-appearance: media-overlay-play-button;
- display: flex;
- position: absolute;
- top: 50%;
- left: 50%;
- margin-left: -40px;
- margin-top: -40px;
- border: none;
- box-sizing: border-box;
- background-color: transparent;
- width: 80px;
- height: 80px;
- padding: 0;
-}
-
-video::-internal-media-controls-overlay-cast-button {
- -webkit-appearance: -internal-media-overlay-cast-off-button;
- display: flex;
- position: absolute;
- top: 5%;
- left: 5%;
- margin-left: 0px;
- margin-top: 0px;
- border: none;
- box-sizing: border-box;
- background-color: transparent;
- width: 30px;
- height: 30px;
- padding: 0;
-}
-
-audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-button {
- -webkit-appearance: media-play-button;
- display: flex;
- flex: none;
- border: none;
- box-sizing: border-box;
- width: 30px;
- height: 30px;
- line-height: 30px;
- margin-left: 9px;
- margin-right: 9px;
- padding: 0;
- background-color: initial;
- color: inherit;
-}
-
-audio::-webkit-media-controls-timeline-container, video::-webkit-media-controls-timeline-container {
- -webkit-appearance: media-controls-background;
- display: flex;
- flex-direction: row;
- align-items: center;
- justify-content: flex-end;
- flex: 1 1;
- -webkit-user-select: none;
- height: 16px;
- min-width: 0;
-}
-
-audio::-webkit-media-controls-current-time-display, video::-webkit-media-controls-current-time-display,
-audio::-webkit-media-controls-time-remaining-display, video::-webkit-media-controls-time-remaining-display {
- -webkit-appearance: media-current-time-display;
- -webkit-user-select: none;
- flex: none;
- display: flex;
- border: none;
- cursor: default;
-
- height: 30px;
- margin: 0 9px 0 0;
- padding: 0;
-
- line-height: 30px;
- font-size: 13px;
- font-weight: bold;
- font-style: normal;
- color: white;
-
- letter-spacing: normal;
- word-spacing: normal;
- text-transform: none;
- text-indent: 0;
- text-shadow: none;
- text-decoration: none;
-}
-
-audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline {
- -webkit-appearance: media-slider;
- display: flex;
- flex: 1 1 auto;
- height: 8px;
- margin: 0 15px 0 0;
- padding: 0;
- background-color: transparent;
- min-width: 25px;
- border: initial;
- color: inherit;
-}
-
-audio::-webkit-media-controls-volume-slider, video::-webkit-media-controls-volume-slider {
- -webkit-appearance: media-volume-slider;
- display: flex;
- /* The 1.9 value was empirically chosen to match old-flexbox behaviour
- * and be aesthetically pleasing.
- */
- flex: 1 1.9 auto;
- height: 8px;
- max-width: 70px;
- margin: 0 15px 0 0;
- padding: 0;
- background-color: transparent;
- min-width: 15px;
- border: initial;
- color: inherit;
-}
-
-/* FIXME these shouldn't use special pseudoShadowIds, but nicer rules.
- https://code.google.com/p/chromium/issues/detail?id=112508
- https://bugs.webkit.org/show_bug.cgi?id=62218
-*/
-input[type="range" i]::-webkit-media-slider-container {
- display: flex;
- align-items: center;
- flex-direction: row; /* This property is updated by C++ code. */
- box-sizing: border-box;
- height: 100%;
- width: 100%;
- border: 1px solid rgba(230, 230, 230, 0.35);
- border-radius: 4px;
- background-color: transparent; /* Background drawing is managed by C++ code to draw ranges. */
-}
-
-/* The negative right margin causes the track to overflow its container. */
-input[type="range" i]::-webkit-media-slider-container > div {
- margin-right: -14px;
-}
-
-input[type="range" i]::-webkit-media-slider-thumb {
- margin-left: -7px;
- margin-right: -7px;
-}
-
-audio::-webkit-media-controls-fullscreen-button, video::-webkit-media-controls-fullscreen-button {
- -webkit-appearance: media-enter-fullscreen-button;
- display: flex;
- flex: none;
- border: none;
- box-sizing: border-box;
- width: 30px;
- height: 30px;
- line-height: 30px;
- margin-left: -5px;
- margin-right: 9px;
- padding: 0;
- background-color: initial;
- color: inherit;
-}
-
-audio::-internal-media-controls-cast-button, video::-internal-media-controls-cast-button {
- -webkit-appearance: -internal-media-cast-off-button;
- display: flex;
- flex: none;
- border: none;
- box-sizing: border-box;
- width: 30px;
- height: 30px;
- line-height: 30px;
- margin-left: -5px;
- margin-right: 9px;
- padding: 0;
- background-color: initial;
- color: inherit;
-}
-
-audio::-webkit-media-controls-toggle-closed-captions-button {
- display: none;
-}
-
-video::-webkit-media-controls-toggle-closed-captions-button {
- -webkit-appearance: media-toggle-closed-captions-button;
- display: flex;
- flex: none;
- border: none;
- box-sizing: border-box;
- width: 30px;
- height: 30px;
- line-height: 30px;
- margin-left: -5px;
- margin-right: 9px;
- padding: 0;
- background-color: initial;
- color: inherit;
-}
-
-audio::-webkit-media-controls-fullscreen-volume-slider, video::-webkit-media-controls-fullscreen-volume-slider {
- display: none;
-}
-
-audio::-webkit-media-controls-fullscreen-volume-min-button, video::-webkit-media-controls-fullscreen-volume-min-button {
- display: none;
-}
-
-audio::-webkit-media-controls-fullscreen-volume-max-button, video::-webkit-media-controls-fullscreen-volume-max-button {
- display: none;
-}
-
-video::-webkit-scrollbar {
- width: 12px;
-}
-
-video::-webkit-scrollbar-track {
- box-shadow: inset 0 0 6px rgba(20, 20, 20, 0.3);
- border-radius: 10px;
-}
-
-video::-webkit-scrollbar-thumb {
- border-radius: 10px;
- background-color: rgba(80, 80, 80, 0.8);
- box-shadow: inset 0 0 6px rgba(20, 20, 20, 0.5);
-}
-
-video::-internal-media-controls-text-track-list {
- position: absolute;
- bottom: 35px;
- right: 5px;
- background: rgba(20, 20, 20, 0.8);
- max-width: 50%;
- max-height: 250px;
- border-radius: 5px;
- overflow-x: hidden;
- overflow-y: auto;
- text-overflow: ellipsis;
- margin-bottom: 5px;
- white-space: nowrap;
- padding-top: 10px;
- font-weight: bold;
- font-size: 13px;
-}
-
-video::-internal-media-controls-text-track-list-item {
- display: block;
- color: white;
- padding: 4px 30px 4px 10px;
- border-bottom: 1px solid #555;
- text-align: start;
- line-height: 30px;
-}
-
-video::-internal-media-controls-text-track-list-item:hover {
- background-color: rgba(105, 105, 105, 0.8);
-}
-
-video::-internal-media-controls-text-track-list-item-input {
- -webkit-appearance: -internal-media-track-selection-checkmark;
- visibility: hidden;
- left: 0;
- vertical-align: middle;
- margin: 0 5px 0 0;
- width: 25px;
- height: 25px;
-}
-
-video::-internal-media-controls-text-track-list-item-input:checked {
- visibility: visible;
-}
-
-video::-internal-media-controls-text-track-list-kind-captions {
- -webkit-appearance: -internal-media-closed-captions-icon;
- height: 24px;
- width: 24px;
- margin-left: 10px;
- vertical-align: middle;
-}
-
-video::-internal-media-controls-text-track-list-kind-subtitles {
- -webkit-appearance: -internal-media-subtitles-icon;
- height: 24px;
- width: 24px;
- margin-left: 10px;
- vertical-align: middle;
-}
-
-video::-webkit-media-text-track-container {
- position: relative;
- width: inherit;
- height: inherit;
- overflow: hidden;
-
- font: 22px sans-serif;
- text-align: center;
- color: rgba(255, 255, 255, 1);
-
- letter-spacing: normal;
- word-spacing: normal;
- text-transform: none;
- text-indent: 0;
- text-decoration: none;
- pointer-events: none;
- -webkit-user-select: none;
- word-break: break-word;
-}
-
-video::cue {
- display: inline;
-
- background-color: rgba(0, 0, 0, 0.8);
- padding: 2px 2px;
-}
-
-video::-webkit-media-text-track-region {
- position: absolute;
- line-height: 5.33vh;
- writing-mode: horizontal-tb;
- background: rgba(0, 0, 0, 0.8);
- color: rgba(255, 255, 255, 1);
- word-wrap: break-word;
- overflow-wrap: break-word;
- overflow: hidden;
-}
-
-video::-webkit-media-text-track-region-container {
- position: relative;
-
- display: flex;
- flex-flow: column;
- flex-direction: column;
-}
-
-video::-webkit-media-text-track-region-container.scrolling {
- transition: top 433ms linear;
-}
-
-
-video::-webkit-media-text-track-display {
- position: absolute;
- overflow: hidden;
- white-space: pre-wrap;
- -webkit-box-sizing: border-box;
- flex: 0 0 auto;
-}
-
-video::cue(:future) {
- color: gray;
-}
-
-video::cue(b) {
- font-weight: bold;
-}
-
-video::cue(u) {
- text-decoration: underline;
-}
-
-video::cue(i) {
- font-style: italic;
-}
diff --git a/third_party/WebKit/Source/core/css/mediaControlsAndroid.css b/third_party/WebKit/Source/core/css/mediaControlsAndroid.css
deleted file mode 100644
index 70cec724..0000000
--- a/third_party/WebKit/Source/core/css/mediaControlsAndroid.css
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2012 Google Inc.
- *
- * 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.
- */
-
-/* Media controls for Chromium on Android */
-
-/* WARNING: This css file can only style <audio> and <video> elements */
-
-audio {
- height: 35px;
-}
-
-audio::-webkit-media-controls-enclosure {
- height: 35px;
-}
-
-video::-webkit-media-controls-enclosure {
- height: 40px;
-}
-
-audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel {
- height: 35px;
-}
-
-audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-button {
- width: 35px;
- height: 35px;
- line-height: 35px;
-}
-
-audio::-webkit-media-controls-current-time-display, video::-webkit-media-controls-current-time-display,
-audio::-webkit-media-controls-time-remaining-display, video::-webkit-media-controls-time-remaining-display {
- height: 35px;
- line-height: 35px;
- font-size: 18px;
-}
-
-audio::-webkit-media-controls-volume-slider, video::-webkit-media-controls-volume-slider {
- display: none;
-}
-
-video::-webkit-media-controls-fullscreen-button {
- width: 35px;
- height: 35px;
- line-height: 35px;
-}
-
-audio::-webkit-media-controls-fullscreen-button {
- display: none;
-}
-
-audio::-internal-media-controls-cast-button, video::-internal-media-controls-cast-button {
- width: 35px;
- height: 35px;
- line-height: 35px;
-}
-
-video::-webkit-media-controls-toggle-closed-captions-button {
- width: 35px;
- height: 35px;
- line-height: 35px;
-}
diff --git a/third_party/WebKit/public/blink_image_resources.grd b/third_party/WebKit/public/blink_image_resources.grd
index d3f1bda..b8524e5 100644
--- a/third_party/WebKit/public/blink_image_resources.grd
+++ b/third_party/WebKit/public/blink_image_resources.grd
@@ -10,47 +10,25 @@
<release seq="1">
<structures fallback_to_low_resolution="true">
<structure type="chrome_scaled_image" name="IDR_BROKENIMAGE" file="blink/broken_image.png" />
- <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_PAUSE_BUTTON" file="blink/mediaplayer_pause.png" />
<structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_PAUSE_BUTTON_NEW" file="blink/mediaplayer_pause_new.png" />
- <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_PLAY_BUTTON" file="blink/mediaplayer_play.png" />
<structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_PLAY_BUTTON_NEW" file="blink/mediaplayer_play_new.png" />
- <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_PLAY_BUTTON_DISABLED" file="blink/mediaplayer_play_disabled.png" />
- <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON" file="blink/mediaplayer_sound_level3.png" />
<structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_NEW" file="blink/mediaplayer_sound_level3_new.png" />
- <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON" file="blink/mediaplayer_sound_level2.png" />
- <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON" file="blink/mediaplayer_sound_level1.png" />
- <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON" file="blink/mediaplayer_sound_level0.png" />
<structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_NEW" file="blink/mediaplayer_sound_level0_new.png" />
- <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_SOUND_DISABLED" file="blink/mediaplayer_sound_disabled.png" />
- <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_SLIDER_THUMB" file="blink/mediaplayer_slider_thumb.png" />
<structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_SLIDER_THUMB_NEW" file="blink/mediaplayer_slider_thumb_new.png" />
- <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB" file="blink/mediaplayer_volume_slider_thumb.png" />
<structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_NEW" file="blink/mediaplayer_volume_slider_thumb_new.png" />
- <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED" file="blink/mediaplayer_volume_slider_thumb_disabled.png" />
- <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON" file="blink/mediaplayer_closedcaption.png" />
<structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_NEW" file="blink/mediaplayer_closedcaption_new.png" />
- <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED" file="blink/mediaplayer_closedcaption_disabled.png" />
<structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED_NEW" file="blink/mediaplayer_closedcaption_disabled_new.png" />
- <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_FULLSCREEN_BUTTON" file="blink/mediaplayer_fullscreen.png" />
- <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED" file="blink/mediaplayer_fullscreen_disabled.png" />
<structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_ENTER_FULLSCREEN_BUTTON" file="blink/mediaplayer_enter_fullscreen.png" />
<structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_EXIT_FULLSCREEN_BUTTON" file="blink/mediaplayer_exit_fullscreen.png" />
- <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_CAST_BUTTON_OFF" file="blink/mediaplayer_cast_off.png" />
<structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_CAST_BUTTON_OFF_NEW" file="blink/mediaplayer_cast_off_new.png" />
- <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_CAST_BUTTON_ON" file="blink/mediaplayer_cast_on.png" />
<structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_CAST_BUTTON_ON_NEW" file="blink/mediaplayer_cast_on_new.png" />
- <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF" file="blink/mediaplayer_overlay_cast_off.png" />
<structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF_NEW" file="blink/mediaplayer_overlay_cast_off_new.png" />
<structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_ON_NEW" file="blink/mediaplayer_overlay_cast_on_new.png" />
- <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON" file="blink/mediaplayer_overlay_play.png" />
<structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON_NEW" file="blink/mediaplayer_overlay_play_new.png" />
- <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_TRACKSELECTION_CHECKMARK" file="blink/mediaplayer_trackselection_checkmark.png" />
<structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_TRACKSELECTION_CHECKMARK_NEW" file="blink/mediaplayer_trackselection_checkmark_new.png" />
- <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON" file="blink/mediaplayer_closedcaptions_icon.png" />
<structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON_NEW" file="blink/mediaplayer_closedcaptions_icon_new.png" />
<structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_OVERFLOW_MENU_ICON" file="blink/mediaplayer_overflow_menu.png" />
<structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_DOWNLOAD_ICON" file="blink/mediaplayer_download.png" />
- <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_SUBTITLES_ICON" file="blink/mediaplayer_subtitles_icon.png" />
<structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_SUBTITLES_ICON_NEW" file="blink/mediaplayer_subtitles_icon_new.png" />
<structure type="chrome_scaled_image" name="IDR_SEARCH_CANCEL" file="blink/search_cancel.png" />
<structure type="chrome_scaled_image" name="IDR_SEARCH_CANCEL_PRESSED" file="blink/search_cancel_pressed.png" />
diff --git a/third_party/WebKit/public/blink_resources.grd b/third_party/WebKit/public/blink_resources.grd
index 8804144..f4c4c06 100644
--- a/third_party/WebKit/public/blink_resources.grd
+++ b/third_party/WebKit/public/blink_resources.grd
@@ -13,7 +13,6 @@
<include name="IDR_UASTYLE_VIEW_SOURCE_CSS" file="../Source/core/css/view-source.css" type="BINDATA"/>
<include name="IDR_UASTYLE_THEME_CHROMIUM_ANDROID_CSS" file="../Source/core/css/themeChromiumAndroid.css" type="BINDATA"/>
<include name="IDR_UASTYLE_FULLSCREEN_ANDROID_CSS" file="../Source/core/css/fullscreenAndroid.css" type="BINDATA"/>
- <include name="IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_CSS" file="../Source/core/css/mediaControlsAndroid.css" type="BINDATA"/>
<include name="IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_NEW_CSS" file="../Source/core/css/mediaControlsAndroidNew.css" type="BINDATA"/>
<include name="IDR_UASTYLE_THEME_CHROMIUM_LINUX_CSS" file="../Source/core/css/themeChromiumLinux.css" type="BINDATA"/>
<if expr="is_macosx">
@@ -24,7 +23,6 @@
<include name="IDR_UASTYLE_THEME_WIN_QUIRKS_CSS" file="../Source/core/css/themeWinQuirks.css" type="BINDATA"/>
<include name="IDR_UASTYLE_SVG_CSS" file="../Source/core/css/svg.css" type="BINDATA"/>
<include name="IDR_UASTYLE_MATHML_CSS" file="../Source/core/css/mathml.css" type="BINDATA"/>
- <include name="IDR_UASTYLE_MEDIA_CONTROLS_CSS" file="../Source/core/css/mediaControls.css" type="BINDATA"/>
<include name="IDR_UASTYLE_MEDIA_CONTROLS_NEW_CSS" file="../Source/core/css/mediaControlsNew.css" type="BINDATA"/>
<include name="IDR_UASTYLE_FULLSCREEN_CSS" file="../Source/core/css/fullscreen.css" type="BINDATA"/>
<include name="IDR_UASTYLE_XHTMLMP_CSS" file="../Source/core/css/xhtmlmp.css" type="BINDATA"/>
diff --git a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_cast_off.png b/third_party/WebKit/public/default_100_percent/blink/mediaplayer_cast_off.png
deleted file mode 100644
index d3a4d17..0000000
--- a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_cast_off.png
+++ /dev/null
Binary files differ
diff --git a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_cast_on.png b/third_party/WebKit/public/default_100_percent/blink/mediaplayer_cast_on.png
deleted file mode 100644
index 247b389..0000000
--- a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_cast_on.png
+++ /dev/null
Binary files differ
diff --git a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_closedcaption.png b/third_party/WebKit/public/default_100_percent/blink/mediaplayer_closedcaption.png
deleted file mode 100644
index 0ad142da..0000000
--- a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_closedcaption.png
+++ /dev/null
Binary files differ
diff --git a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_closedcaption_disabled.png b/third_party/WebKit/public/default_100_percent/blink/mediaplayer_closedcaption_disabled.png
deleted file mode 100644
index 7ac1a89..0000000
--- a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_closedcaption_disabled.png
+++ /dev/null
Binary files differ
diff --git a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_closedcaptions_icon.png b/third_party/WebKit/public/default_100_percent/blink/mediaplayer_closedcaptions_icon.png
deleted file mode 100644
index 2395e19..0000000
--- a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_closedcaptions_icon.png
+++ /dev/null
Binary files differ
diff --git a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_fullscreen.png b/third_party/WebKit/public/default_100_percent/blink/mediaplayer_fullscreen.png
deleted file mode 100644
index 713a877..0000000
--- a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_fullscreen.png
+++ /dev/null
Binary files differ
diff --git a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_fullscreen_disabled.png b/third_party/WebKit/public/default_100_percent/blink/mediaplayer_fullscreen_disabled.png
deleted file mode 100644
index f0958a6..0000000
--- a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_fullscreen_disabled.png
+++ /dev/null
Binary files differ
diff --git a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_overlay_cast_off.png b/third_party/WebKit/public/default_100_percent/blink/mediaplayer_overlay_cast_off.png
deleted file mode 100644
index 8a126c9d..0000000
--- a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_overlay_cast_off.png
+++ /dev/null
Binary files differ
diff --git a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_overlay_play.png b/third_party/WebKit/public/default_100_percent/blink/mediaplayer_overlay_play.png
deleted file mode 100644
index cfd48d74..0000000
--- a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_overlay_play.png
+++ /dev/null
Binary files differ
diff --git a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_pause.png b/third_party/WebKit/public/default_100_percent/blink/mediaplayer_pause.png
deleted file mode 100644
index b488e97..0000000
--- a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_pause.png
+++ /dev/null
Binary files differ
diff --git a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_play.png b/third_party/WebKit/public/default_100_percent/blink/mediaplayer_play.png
deleted file mode 100644
index 1e53d43..0000000
--- a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_play.png
+++ /dev/null
Binary files differ
diff --git a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_play_disabled.png b/third_party/WebKit/public/default_100_percent/blink/mediaplayer_play_disabled.png
deleted file mode 100644
index 8e122001..0000000
--- a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_play_disabled.png
+++ /dev/null
Binary files differ
diff --git a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_slider_thumb.png b/third_party/WebKit/public/default_100_percent/blink/mediaplayer_slider_thumb.png
deleted file mode 100644
index 4cc24d1..0000000
--- a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_slider_thumb.png
+++ /dev/null
Binary files differ
diff --git a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_sound_disabled.png b/third_party/WebKit/public/default_100_percent/blink/mediaplayer_sound_disabled.png
deleted file mode 100644
index 38fa4ba..0000000
--- a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_sound_disabled.png
+++ /dev/null
Binary files differ
diff --git a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_sound_level0.png b/third_party/WebKit/public/default_100_percent/blink/mediaplayer_sound_level0.png
deleted file mode 100644
index 22d6a10..0000000
--- a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_sound_level0.png
+++ /dev/null
Binary files differ
diff --git a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_sound_level1.png b/third_party/WebKit/public/default_100_percent/blink/mediaplayer_sound_level1.png
deleted file mode 100644
index 2c6809a..0000000
--- a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_sound_level1.png
+++ /dev/null
Binary files differ
diff --git a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_sound_level2.png b/third_party/WebKit/public/default_100_percent/blink/mediaplayer_sound_level2.png
deleted file mode 100644
index e98c51d..0000000
--- a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_sound_level2.png
+++ /dev/null
Binary files differ
diff --git a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_sound_level3.png b/third_party/WebKit/public/default_100_percent/blink/mediaplayer_sound_level3.png
deleted file mode 100644
index 05caa64..0000000
--- a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_sound_level3.png
+++ /dev/null
Binary files differ
diff --git a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_subtitles_icon.png b/third_party/WebKit/public/default_100_percent/blink/mediaplayer_subtitles_icon.png
deleted file mode 100644
index 8ab6cf4e..0000000
--- a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_subtitles_icon.png
+++ /dev/null
Binary files differ
diff --git a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_trackselection_checkmark.png b/third_party/WebKit/public/default_100_percent/blink/mediaplayer_trackselection_checkmark.png
deleted file mode 100644
index f1e2798..0000000
--- a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_trackselection_checkmark.png
+++ /dev/null
Binary files differ
diff --git a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_volume_slider_thumb.png b/third_party/WebKit/public/default_100_percent/blink/mediaplayer_volume_slider_thumb.png
deleted file mode 100644
index c4620f5..0000000
--- a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_volume_slider_thumb.png
+++ /dev/null
Binary files differ
diff --git a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_volume_slider_thumb_disabled.png b/third_party/WebKit/public/default_100_percent/blink/mediaplayer_volume_slider_thumb_disabled.png
deleted file mode 100644
index d32434b..0000000
--- a/third_party/WebKit/public/default_100_percent/blink/mediaplayer_volume_slider_thumb_disabled.png
+++ /dev/null
Binary files differ
