- Revision
- 111518
- Author
- [email protected]
- Date
- 2012-03-21 03:09:33 -0700 (Wed, 21 Mar 2012)
Log Message
[BlackBerry] Upstreaming blackberry specific css file
https://bugs.webkit.org/show_bug.cgi?id=81650
Ustream BlackBerry specific css files, including:
css/themeBlackBerry.css
css/mediaControlsBlackBerry.css
Patch by Jonathan Dong <[email protected]> on 2012-03-21
Reviewed by Nikolas Zimmermann.
No new tests, this is the initial upstream patch
for BlackBerry specific css files.
* css/mediaControlsBlackBerry.css: Added.
(audio):
(audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel):
(video:-webkit-full-page-media::-webkit-media-controls-panel):
(audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-button):
(audio::-webkit-media-controls-timeline-container, video::-webkit-media-controls-timeline-container):
(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):
(audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline):
(audio::-webkit-media-controls-fullscreen-button, video::-webkit-media-controls-fullscreen-button):
(audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button):
(audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-controls-volume-slider-container):
(audio::-webkit-media-controls-volume-slider, video::-webkit-media-controls-volume-slider):
(audio::-webkit-media-controls-seek-back-button, video::-webkit-media-controls-seek-back-button):
(audio::-webkit-media-controls-seek-forward-button, video::-webkit-media-controls-seek-forward-button):
* css/themeBlackBerry.css: Added.
(textarea):
(input, textarea):
(input[type="color"]):
(select:focus):
(select[size][multiple]):
(select[size][multiple]:focus):
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (111517 => 111518)
--- trunk/Source/WebCore/ChangeLog 2012-03-21 10:05:57 UTC (rev 111517)
+++ trunk/Source/WebCore/ChangeLog 2012-03-21 10:09:33 UTC (rev 111518)
@@ -1,3 +1,40 @@
+2012-03-21 Jonathan Dong <[email protected]>
+
+ [BlackBerry] Upstreaming blackberry specific css file
+ https://bugs.webkit.org/show_bug.cgi?id=81650
+
+ Ustream BlackBerry specific css files, including:
+ css/themeBlackBerry.css
+ css/mediaControlsBlackBerry.css
+
+ Reviewed by Nikolas Zimmermann.
+
+ No new tests, this is the initial upstream patch
+ for BlackBerry specific css files.
+
+ * css/mediaControlsBlackBerry.css: Added.
+ (audio):
+ (audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel):
+ (video:-webkit-full-page-media::-webkit-media-controls-panel):
+ (audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-button):
+ (audio::-webkit-media-controls-timeline-container, video::-webkit-media-controls-timeline-container):
+ (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):
+ (audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline):
+ (audio::-webkit-media-controls-fullscreen-button, video::-webkit-media-controls-fullscreen-button):
+ (audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button):
+ (audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-controls-volume-slider-container):
+ (audio::-webkit-media-controls-volume-slider, video::-webkit-media-controls-volume-slider):
+ (audio::-webkit-media-controls-seek-back-button, video::-webkit-media-controls-seek-back-button):
+ (audio::-webkit-media-controls-seek-forward-button, video::-webkit-media-controls-seek-forward-button):
+ * css/themeBlackBerry.css: Added.
+ (textarea):
+ (input, textarea):
+ (input[type="color"]):
+ (select:focus):
+ (select[size][multiple]):
+ (select[size][multiple]:focus):
+
2012-03-21 Levi Weintraub <[email protected]>
Update LayoutUnit usage in descendants of RenderReplaced
Added: trunk/Source/WebCore/css/mediaControlsBlackBerry.css (0 => 111518)
--- trunk/Source/WebCore/css/mediaControlsBlackBerry.css (rev 0)
+++ trunk/Source/WebCore/css/mediaControlsBlackBerry.css 2012-03-21 10:09:33 UTC (rev 111518)
@@ -0,0 +1,152 @@
+/*
+ * 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 {
+ width: 300px;
+ height: 32px;
+}
+
+audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel {
+ display: -webkit-box;
+ -webkit-box-orient: horizontal;
+ -webkit-box-align: center;
+ -webkit-user-select: none;
+ position: absolute;
+ bottom: 0;
+ width: 100%;
+ z-index: 0;
+ overflow: visible;
+ height: 32px;
+ text-align: center;
+ background-color: rgba(0, 0, 0, 0.6);
+}
+
+video:-webkit-full-page-media::-webkit-media-controls-panel {
+ bottom: 0px;
+}
+
+audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-button {
+ -webkit-appearance: media-play-button;
+ display: -webkit-box;
+ width: 32px;
+ height: 32px;
+}
+
+audio::-webkit-media-controls-timeline-container, video::-webkit-media-controls-timeline-container {
+ -webkit-appearance: media-controls-background;
+ display: -webkit-box;
+ -webkit-box-orient: horizontal;
+ -webkit-box-align: center;
+ -webkit-box-pack: end;
+ -webkit-box-flex: 1;
+ -webkit-user-select: none;
+ height: 32px;
+}
+
+audio::-webkit-media-controls-current-time-display, video::-webkit-media-controls-current-time-display {
+ -webkit-appearance: media-current-time-display;
+ display: -webkit-box;
+ -webkit-box-orient: horizontal;
+ -webkit-box-align: center;
+ -webkit-box-pack: end;
+ -webkit-box-flex: 0;
+ -webkit-user-select: none;
+ width: 48px;
+ height: 32px;
+ color: white;
+ padding-right: 2px;
+}
+
+audio::-webkit-media-controls-time-remaining-display, video::-webkit-media-controls-time-remaining-display {
+ -webkit-appearance: media-time-remaining-display;
+ display: -webkit-box;
+ -webkit-box-orient: horizontal;
+ -webkit-box-align: center;
+ -webkit-box-pack: end;
+ -webkit-box-flex: 0;
+ -webkit-user-select: none;
+ width: 56px;
+ height: 32px;
+ color: white;
+ padding-right: 2px;
+}
+
+audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline {
+ -webkit-appearance: media-slider;
+ display: -webkit-box;
+ -webkit-box-flex: 1;
+ height: 32px;
+}
+
+audio::-webkit-media-controls-fullscreen-button, video::-webkit-media-controls-fullscreen-button {
+ -webkit-appearance: media-fullscreen-button;
+ display: -webkit-box;
+ width: 32px;
+ height: 32px;
+}
+
+audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button {
+ -webkit-appearance: media-mute-button;
+ display: -webkit-box;
+ width: 32px;
+ height: 32px;
+}
+
+audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-controls-volume-slider-container {
+ -webkit-appearance: media-volume-slider-container;
+ display: -webkit-box;
+ -webkit-box-orient: horizontal;
+ -webkit-box-align: center;
+ -webkit-box-pack: end;
+ -webkit-box-flex: 1;
+ -webkit-user-select: none;
+ height: 128px;
+ width: 32px;
+ position: absolute;
+ right: 0px;
+ background-color: rgba(0, 0, 0, 0.6);
+}
+
+audio::-webkit-media-controls-volume-slider, video::-webkit-media-controls-volume-slider {
+ -webkit-appearance: media-volume-slider;
+ display: -webkit-box;
+ -webkit-box-flex: 1;
+ height: 128px;
+ width: 32px;
+}
+
+audio::-webkit-media-controls-seek-back-button, video::-webkit-media-controls-seek-back-button {
+ -webkit-appearance: media-seek-back-button;
+ display: none;
+}
+
+audio::-webkit-media-controls-seek-forward-button, video::-webkit-media-controls-seek-forward-button {
+ -webkit-appearance: media-seek-forward-button;
+ display: none;
+}
Added: trunk/Source/WebCore/css/themeBlackBerry.css (0 => 111518)
--- trunk/Source/WebCore/css/themeBlackBerry.css (rev 0)
+++ trunk/Source/WebCore/css/themeBlackBerry.css 2012-03-21 10:09:33 UTC (rev 111518)
@@ -0,0 +1,56 @@
+/*
+ * 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;
+}
+
+input, textarea {
+ -webkit-border-radius: 3px;
+}
+
+input[type="datetime"],
+input[type="date"],
+input[type="week"],
+input[type="month"],
+input[type="time"],
+input[type="datetime-local"],
+input[type="number"],
+input[type="color"] {
+ border: solid 2px blue;
+}
+
+select:focus {
+ border: 1px solid black;
+ outline: none;
+}
+
+select[size],
+select[multiple],
+select[size][multiple] {
+ padding: 5px;
+ border-radius: 5px;
+ border: 1px solid rgb(139,139,139);
+}
+
+select[size]:focus,
+select[multiple]:focus,
+select[size][multiple]:focus {
+ border: 1px solid black;
+ outline: none;
+}
