git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: baf9b04)
WebCore:
authoradele@apple.com <adele@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 5 Dec 2007 00:08:37 +0000 (00:08 +0000)
committeradele@apple.com <adele@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 5 Dec 2007 00:08:37 +0000 (00:08 +0000)
        Reviewed by Hyatt.

        Fix for <rdar://problem/5622464> controls should show up for audio element

        * css/html4.css: Added styles for audio controls.  This will need to be refined, since we may want a different look for audio controls.
        * html/HTMLMediaElement.cpp:
        (WebCore::HTMLMediaElement::attributeChanged): When the controls attribute changes detach and reattach if necessary.
        (WebCore::HTMLMediaElement::rendererIsNeeded): Added.
        (WebCore::HTMLMediaElement::createRenderer): Added.  Uses RenderMedia.
        * html/HTMLMediaElement.h:
        * rendering/RenderMedia.cpp: (WebCore::RenderMedia::RenderMedia): Added constructor that doesn't take intrinsic size.
        * rendering/RenderMedia.h:

LayoutTests:

        Reviewed by Hyatt.

        Test for <rdar://problem/5622464> controls should show up for audio element

        * media/audio-controls-rendering.html: Added.
        * platform/mac/media/audio-controls-rendering-expected.checksum: Added.
        * platform/mac/media/audio-controls-rendering-expected.png: Added.
        * platform/mac/media/audio-controls-rendering-expected.txt: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@28417 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog patch | blob | history
LayoutTests/media/audio-controls-rendering.html [new file with mode: 0644] patch | blob
LayoutTests/platform/mac/media/audio-controls-rendering-expected.checksum [new file with mode: 0644] patch | blob
LayoutTests/platform/mac/media/audio-controls-rendering-expected.png [new file with mode: 0644] patch | blob
LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt [new file with mode: 0644] patch | blob
WebCore/ChangeLog patch | blob | history
WebCore/css/html4.css patch | blob | history
WebCore/html/HTMLMediaElement.cpp patch | blob | history
WebCore/html/HTMLMediaElement.h patch | blob | history
WebCore/rendering/RenderMedia.cpp patch | blob | history
WebCore/rendering/RenderMedia.h patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e4548929152e48c2756cacabb5ad09fd0146c28e..c71d1605ff602aad8fb0986017b1dd6720b68faa 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2007-12-04  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Hyatt.
+
+        Test for <rdar://problem/5622464> controls should show up for audio element
+
+        * media/audio-controls-rendering.html: Added.
+        * platform/mac/media/audio-controls-rendering-expected.checksum: Added.
+        * platform/mac/media/audio-controls-rendering-expected.png: Added.
+        * platform/mac/media/audio-controls-rendering-expected.txt: Added.
+
 2007-11-27  Adam Roben  <aroben@apple.com>
 
         Remove a now-passing test from the Windows Skipped file
diff --git a/LayoutTests/media/audio-controls-rendering.html b/LayoutTests/media/audio-controls-rendering.html
new file mode 100644 (file)
index 0000000..42b2735
--- /dev/null
+++ b/LayoutTests/media/audio-controls-rendering.html
@@ -0,0 +1,34 @@
+<html>
+    <head>
+        <style>
+            audio { background-color: blue; } 
+        </style>
+        <script>
+            function test()
+            {
+                if (window.layoutTestController) {
+                    layoutTestController.waitUntilDone();
+                    setTimeout(function() { 
+                        document.body.appendChild(document.createTextNode('FAIL')); 
+                        if (window.layoutTestController)
+                                layoutTestController.notifyDone();
+                    } , 8000);
+                }
+                var count = document.getElementsByTagName('audio').length;
+                document.addEventListener("load", function () {
+                    if (!--count) {
+                        document.body.offsetLeft;
+                        if (window.layoutTestController)
+                            layoutTestController.notifyDone();
+                    }
+                }, true);
+            }
+        </script>
+    </head>
+    <body onload="test()">
+        <p>Test controls placement. </p>
+        <audio controls src="content/test.wav"></audio><br><br>
+        <audio controls src="content/test.wav" style="width: 320px;"></audio><br><br>
+        <audio controls src="content/test.wav" style="position: absolute; width: 320px; height: 100px;"></audio><br>
+    </body>
+</html>
diff --git a/LayoutTests/platform/mac/media/audio-controls-rendering-expected.checksum b/LayoutTests/platform/mac/media/audio-controls-rendering-expected.checksum
new file mode 100644 (file)
index 0000000..6d27669
--- /dev/null
+++ b/LayoutTests/platform/mac/media/audio-controls-rendering-expected.checksum
@@ -0,0 +1 @@
+73ef9fddb8d97b62acaa265d2ed0668b
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/media/audio-controls-rendering-expected.png b/LayoutTests/platform/mac/media/audio-controls-rendering-expected.png
new file mode 100644 (file)
index 0000000..5af30a0
Binary files /dev/null and b/LayoutTests/platform/mac/media/audio-controls-rendering-expected.png differ
diff --git a/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt b/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt
new file mode 100644 (file)
index 0000000..93255da
--- /dev/null
+++ b/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt
@@ -0,0 +1,70 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x18
+        RenderText {#text} at (0,0) size 153x18
+          text run at (0,0) width 153: "Test controls placement."
+      RenderBlock (anonymous) at (0,34) size 784x174
+        RenderMedia {AUDIO} at (0,0) size 234x69 [bgcolor=#0000FF]
+        RenderBR {BR} at (234,69) size 0x0
+        RenderBR {BR} at (0,69) size 0x18
+        RenderMedia {AUDIO} at (0,87) size 320x69 [bgcolor=#0000FF]
+        RenderBR {BR} at (320,156) size 0x0
+        RenderBR {BR} at (0,156) size 0x18
+      RenderBlock (anonymous) at (0,208) size 784x18
+        RenderBR {BR} at (0,0) size 0x18
+layer at (8,42) size 234x69
+  RenderBlock (positioned) {DIV} at (8,42) size 234x69
+layer at (8,42) size 234x69
+  RenderBlock (positioned) {DIV} at (0,0) size 234x69 [bgcolor=#00000099] [border: (2px solid #EEEEEE)]
+layer at (92,49) size 66x40
+  RenderButton {INPUT} at (84,7) size 66x40 [color=#FFFFFF]
+    RenderBlock (anonymous) at (0,0) size 66x40
+      RenderText at (18,0) size 30x38
+        text run at (18,0) width 30: "\x{25B6}"
+layer at (15,88) size 220x16
+  RenderBlock (positioned) {DIV} at (7,46) size 220x16 [bgcolor=#EEEEEE]
+    RenderText {#text} at (165,0) size 50x15
+      text run at (165,0) width 50: "00:00:00"
+layer at (8,129) size 320x69
+  RenderBlock (positioned) {DIV} at (8,129) size 320x69
+layer at (51,129) size 234x69
+  RenderBlock (positioned) {DIV} at (43,0) size 234x69 [bgcolor=#00000099] [border: (2px solid #EEEEEE)]
+layer at (135,136) size 66x40
+  RenderButton {INPUT} at (84,7) size 66x40 [color=#FFFFFF]
+    RenderBlock (anonymous) at (0,0) size 66x40
+      RenderText at (18,0) size 30x38
+        text run at (18,0) width 30: "\x{25B6}"
+layer at (58,175) size 220x16
+  RenderBlock (positioned) {DIV} at (7,46) size 220x16 [bgcolor=#EEEEEE]
+    RenderText {#text} at (165,0) size 50x15
+      text run at (165,0) width 50: "00:00:00"
+layer at (8,216) size 320x100
+  RenderMedia {AUDIO} at (8,216) size 320x100 [bgcolor=#0000FF]
+layer at (8,216) size 320x100
+  RenderBlock (positioned) {DIV} at (0,0) size 320x100
+layer at (51,231) size 234x69
+  RenderBlock (positioned) {DIV} at (43,15) size 234x69 [bgcolor=#00000099] [border: (2px solid #EEEEEE)]
+layer at (135,238) size 66x40
+  RenderButton {INPUT} at (84,7) size 66x40 [color=#FFFFFF]
+    RenderBlock (anonymous) at (0,0) size 66x40
+      RenderText at (18,0) size 30x38
+        text run at (18,0) width 30: "\x{25B6}"
+layer at (58,277) size 220x16
+  RenderBlock (positioned) {DIV} at (7,46) size 220x16 [bgcolor=#EEEEEE]
+    RenderText {#text} at (165,0) size 50x15
+      text run at (165,0) width 50: "00:00:00"
+layer at (20,87) size 142x17
+  RenderSlider zI: 1 {INPUT} at (12,45) size 142x16 [border: (2px solid #FFFFFF)]
+layer at (22,90) size 15x15
+  RenderBlock (relative positioned) {DIV} at (2,2) size 15x15
+layer at (63,174) size 142x17
+  RenderSlider zI: 1 {INPUT} at (12,45) size 142x16 [border: (2px solid #FFFFFF)]
+layer at (65,177) size 15x15
+  RenderBlock (relative positioned) {DIV} at (2,2) size 15x15
+layer at (63,276) size 142x17
+  RenderSlider zI: 1 {INPUT} at (12,45) size 142x16 [border: (2px solid #FFFFFF)]
+layer at (65,279) size 15x15
+  RenderBlock (relative positioned) {DIV} at (2,2) size 15x15
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0dca724fa50725fd280e7795b8d1189d4ec40198..fd811fba3320fe058d53373fa5a4e528288cf792 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2007-12-04  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Hyatt.
+
+        Fix for <rdar://problem/5622464> controls should show up for audio element
+
+        * css/html4.css: Added styles for audio controls.  This will need to be refined, since we may want a different look for audio controls.
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::attributeChanged): When the controls attribute changes detach and reattach if necessary. 
+        (WebCore::HTMLMediaElement::rendererIsNeeded): Added.
+        (WebCore::HTMLMediaElement::createRenderer): Added.  Uses RenderMedia.
+        * html/HTMLMediaElement.h:
+        * rendering/RenderMedia.cpp: (WebCore::RenderMedia::RenderMedia): Added constructor that doesn't take intrinsic size.
+        * rendering/RenderMedia.h:
+
 2007-12-04  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Sam.
diff --git a/WebCore/css/html4.css b/WebCore/css/html4.css
index 1f5db5fd660ccee6456f5b3ac60f1b2ee261853b..1860cb822b6f70f4b27a17468a770280bf14b98d 100644 (file)
--- a/WebCore/css/html4.css
+++ b/WebCore/css/html4.css
@@ -592,11 +592,15 @@ iframe {
 /* media controls */
 /* FIXME this is not the final styling */
 
-video::-webkit-media-controls-panel {
-    display: inline-block;
+audio {
+    width: 234px;
+    height: 69px;
+}
+
+audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel {
     position: absolute;
     left: 0; right: 0; top: 0; bottom: 0;
-    margin: auto auto 10% auto;
+    margin: auto;
     width: 230px;
     height: 65px;
     border: 2px solid #eee;
@@ -605,9 +609,12 @@ video::-webkit-media-controls-panel {
     -webkit-user-select: none;
 }
 
-video::-webkit-media-controls-play-button {
+video::-webkit-media-controls-panel {
+    margin-bottom: 10%;
+}
+
+audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-button {
     -webkit-appearance: none;
-    display: inline-block;
     position: absolute;
     margin: 5px auto auto auto;
     left: 0; right: 0; top: 0; bottom: 0;
@@ -621,7 +628,7 @@ video::-webkit-media-controls-play-button {
     height: 1.2em;
 }
 
-video::-webkit-media-controls-timeline {
+audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline {
     -webkit-appearance: slider-horizontal;
     position: absolute;
     margin: auto auto 5px 10px;
@@ -633,8 +640,7 @@ video::-webkit-media-controls-timeline {
     z-index: 1;
 }
 
-video::-webkit-media-controls-time-display {
-    display: inline-block;
+audio::-webkit-media-controls-time-display, video::-webkit-media-controls-time-display {
     position: absolute;
     margin: auto 5px 5px 5px;
     left: 0; right: 0; top: 0; bottom: 0px;
diff --git a/WebCore/html/HTMLMediaElement.cpp b/WebCore/html/HTMLMediaElement.cpp
index 654ba8108b2aa38a3a7570a3b14ddcbd431f5b1a..d381f4d023f2d1193978c73f3e0119d45da2c87e 100644 (file)
--- a/WebCore/html/HTMLMediaElement.cpp
+++ b/WebCore/html/HTMLMediaElement.cpp
@@ -110,11 +110,25 @@ void HTMLMediaElement::attributeChanged(Attribute* attr, bool preserveDecls)
         if (inDocument() && m_networkState == EMPTY)
             scheduleLoad();
     } if (attrName == controlsAttr) {
+        if (!isVideo() && attached() && (controls() != (renderer() != 0))) {
+            detach();
+            attach();
+        }
         if (renderer())
             renderer()->updateFromElement();
     }
 }
     
+bool HTMLMediaElement::rendererIsNeeded(RenderStyle* style)
+{
+    return controls() ? HTMLElement::rendererIsNeeded(style) : false;
+}
+
+RenderObject* HTMLMediaElement::createRenderer(RenderArena* arena, RenderStyle*)
+{
+    return new (arena) RenderMedia(this);
+}
+ 
 void HTMLMediaElement::insertedIntoDocument()
 {
     HTMLElement::insertedIntoDocument();
diff --git a/WebCore/html/HTMLMediaElement.h b/WebCore/html/HTMLMediaElement.h
index c44286648d2f575ac1c960b492afd8459e781a82..f26343a26c392f2cef3578ca96620e64beaa36ef 100644 (file)
--- a/WebCore/html/HTMLMediaElement.h
+++ b/WebCore/html/HTMLMediaElement.h
@@ -52,7 +52,8 @@ public:
     
     void attributeChanged(Attribute*, bool preserveDecls);
 
-    virtual bool rendererIsNeeded(RenderStyle*) { return false; }
+    virtual bool rendererIsNeeded(RenderStyle*);
+    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
     virtual void insertedIntoDocument();
     virtual void removedFromDocument();
     
diff --git a/WebCore/rendering/RenderMedia.cpp b/WebCore/rendering/RenderMedia.cpp
index 46b4b09b180d0e99a9be6075db8622179a882e87..65f304d8a0dbecb494c566b883da02a19034a72d 100644 (file)
--- a/WebCore/rendering/RenderMedia.cpp
+++ b/WebCore/rendering/RenderMedia.cpp
@@ -190,6 +190,22 @@ void MediaControlTimelineElement::update(bool updateDuration)
 
 // ----------------------------
 
+RenderMedia::RenderMedia(HTMLMediaElement* video)
+    : RenderReplaced(video)
+    , m_controlsShadowRoot(0)
+    , m_panel(0)
+    , m_playButton(0)
+    , m_timeline(0)
+    , m_timeDisplay(0)
+    , m_timeUpdateTimer(this, &RenderMedia::timeUpdateTimerFired)
+    , m_opacityAnimationTimer(this, &RenderMedia::opacityAnimationTimerFired)
+    , m_mouseOver(false)
+    , m_opacityAnimationStartTime(0)
+    , m_opacityAnimationFrom(0)
+    , m_opacityAnimationTo(1.0f)
+{
+}
+
 RenderMedia::RenderMedia(HTMLMediaElement* video, const IntSize& intrinsicSize)
     : RenderReplaced(video, intrinsicSize)
     , m_controlsShadowRoot(0)
diff --git a/WebCore/rendering/RenderMedia.h b/WebCore/rendering/RenderMedia.h
index 67e6c38c47f75f2aa5a094d04cdb2bf98ddaf0dc..a52f04fe54e8cb14133a71391b4ee19558b777c5 100644 (file)
--- a/WebCore/rendering/RenderMedia.h
+++ b/WebCore/rendering/RenderMedia.h
@@ -41,6 +41,7 @@ class Movie;
 
 class RenderMedia : public RenderReplaced {
 public:
+    RenderMedia(HTMLMediaElement*);
     RenderMedia(HTMLMediaElement*, const IntSize& intrinsicSize);
     virtual ~RenderMedia();
     
Mirror of the WebKit open source project from svn.webkit.org.