<!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>[47140] trunk</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/47140">47140</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2009-08-12 12:51:14 -0700 (Wed, 12 Aug 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>As per Eric Carlson's request, revert <a href="http://trac.webkit.org/projects/webkit/changeset/47110">r47110</a> (and the follow-up fixes <a href="http://trac.webkit.org/projects/webkit/changeset/47113">r47113</a> and <a href="http://trac.webkit.org/projects/webkit/changeset/47117">r47117</a>) since it causes ~3000 Qt tests to fail.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediavideocontrolsvisibleaudioonlyhtml">trunk/LayoutTests/media/video-controls-visible-audio-only.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediaaudiocontrolsrenderingexpectedtxt">trunk/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediacontrolsafterreloadexpectedtxt">trunk/LayoutTests/platform/mac/media/controls-after-reload-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediacontrolsstylingexpectedtxt">trunk/LayoutTests/platform/mac/media/controls-styling-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediavideocontrolsrenderingexpectedtxt">trunk/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediavideodisplaytoggleexpectedtxt">trunk/LayoutTests/platform/mac/media/video-display-toggle-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediavideoemptysourceexpectedtxt">trunk/LayoutTests/platform/mac/media/video-empty-source-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediavideozoomcontrolsexpectedtxt">trunk/LayoutTests/platform/mac/media/video-zoom-controls-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacleopardmediaaudiocontrolsrenderingexpectedtxt">trunk/LayoutTests/platform/mac-leopard/media/audio-controls-rendering-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacleopardmediacontrolsafterreloadexpectedtxt">trunk/LayoutTests/platform/mac-leopard/media/controls-after-reload-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacleopardmediacontrolsstylingexpectedtxt">trunk/LayoutTests/platform/mac-leopard/media/controls-styling-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacleopardmediavideoemptysourceexpectedtxt">trunk/LayoutTests/platform/mac-leopard/media/video-empty-source-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacleopardmediavideozoomcontrolsexpectedtxt">trunk/LayoutTests/platform/mac-leopard/media/video-zoom-controls-expected.txt</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreGNUmakefileam">trunk/WebCore/GNUmakefile.am</a></li>
<li><a href="#trunkWebCoreWebCoregypi">trunk/WebCore/WebCore.gypi</a></li>
<li><a href="#trunkWebCoreWebCorepro">trunk/WebCore/WebCore.pro</a></li>
<li><a href="#trunkWebCoreWebCorevcprojWebCorevcproj">trunk/WebCore/WebCore.vcproj/WebCore.vcproj</a></li>
<li><a href="#trunkWebCoreWebCorexcodeprojprojectpbxproj">trunk/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkWebCoreWebCoreSourcesbkl">trunk/WebCore/WebCoreSources.bkl</a></li>
<li><a href="#trunkWebCoreaccessibilityAXObjectCachecpp">trunk/WebCore/accessibility/AXObjectCache.cpp</a></li>
<li><a href="#trunkWebCoreaccessibilityAXObjectCacheh">trunk/WebCore/accessibility/AXObjectCache.h</a></li>
<li><a href="#trunkWebCoreaccessibilityAccessibilityObjectcpp">trunk/WebCore/accessibility/AccessibilityObject.cpp</a></li>
<li><a href="#trunkWebCoreaccessibilityAccessibilityObjecth">trunk/WebCore/accessibility/AccessibilityObject.h</a></li>
<li><a href="#trunkWebCoreaccessibilityAccessibilitySliderh">trunk/WebCore/accessibility/AccessibilitySlider.h</a></li>
<li><a href="#trunkWebCoreaccessibilitymacAccessibilityObjectWrappermm">trunk/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm</a></li>
<li><a href="#trunkWebCoredomNodeh">trunk/WebCore/dom/Node.h</a></li>
<li><a href="#trunkWebCorepagemacWebCoreViewFactoryh">trunk/WebCore/page/mac/WebCoreViewFactory.h</a></li>
<li><a href="#trunkWebCoreplatformLocalizedStringsh">trunk/WebCore/platform/LocalizedStrings.h</a></li>
<li><a href="#trunkWebCoreplatformmacLocalizedStringsMacmm">trunk/WebCore/platform/mac/LocalizedStringsMac.mm</a></li>
<li><a href="#trunkWebCorerenderingMediaControlElementscpp">trunk/WebCore/rendering/MediaControlElements.cpp</a></li>
<li><a href="#trunkWebCorerenderingMediaControlElementsh">trunk/WebCore/rendering/MediaControlElements.h</a></li>
<li><a href="#trunkWebCorerenderingRenderMediacpp">trunk/WebCore/rendering/RenderMedia.cpp</a></li>
<li><a href="#trunkWebCorerenderingRenderMediah">trunk/WebCore/rendering/RenderMedia.h</a></li>
<li><a href="#trunkWebKitChangeLog">trunk/WebKit/ChangeLog</a></li>
<li><a href="#trunkWebKitEnglishlprojLocalizablestrings">trunk/WebKit/English.lproj/Localizable.strings</a></li>
<li><a href="#trunkWebKitmacChangeLog">trunk/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkWebKitmacWebCoreSupportWebViewFactorymm">trunk/WebKit/mac/WebCoreSupport/WebViewFactory.mm</a></li>
<li><a href="#trunkWebKitwinChangeLog">trunk/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkWebKitwinWebCoreLocalizedStringscpp">trunk/WebKit/win/WebCoreLocalizedStrings.cpp</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilitymediaelementhtml">trunk/LayoutTests/accessibility/media-element.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilitymediaelementexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/media-element-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacleopardaccessibilitymediaelementexpectedtxt">trunk/LayoutTests/platform/mac-leopard/accessibility/media-element-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacleopardmediacontrolsstrictexpectedtxt">trunk/LayoutTests/platform/mac-leopard/media/controls-strict-expected.txt</a></li>
<li><a href="#trunkWebCoreaccessibilityAccessibilityMediaControlscpp">trunk/WebCore/accessibility/AccessibilityMediaControls.cpp</a></li>
<li><a href="#trunkWebCoreaccessibilityAccessibilityMediaControlsh">trunk/WebCore/accessibility/AccessibilityMediaControls.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/LayoutTests/ChangeLog        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -33,34 +33,6 @@
</span><span class="cx">         * platform/mac-snowleopard/Skipped:
</span><span class="cx">         * platform/mac/accessibility/string-range-contains-listmarker.html:
</span><span class="cx"> 
</span><del>-2009-08-12  Eric Carlson  &lt;eric.carlson@apple.com&gt;
-
-        Reviewed by Oliver Hunt.
-
-        &lt;video&gt; and &lt;audio&gt; controller should be accessible
-        https://bugs.webkit.org/show_bug.cgi?id=28081
-
-        * accessibility/media-element.html: Added.
-        * platform/mac-leopard/accessibility/media-element-expected.txt:
-        * platform/mac-leopard/media/controls-strict-expected.txt: 
-        * platform/mac/accessibility/media-element-expected.txt:
-            Added.
-
-        * platform/mac-leopard/media/controls-after-reload-expected.txt:
-        * platform/mac-leopard/media/controls-styling-expected.txt:
-        * platform/mac-leopard/media/video-empty-source-expected.txt:
-        * platform/mac-leopard/media/video-zoom-controls-expected.txt:
-        * media/video-controls-visible-audio-only.html:
-        * platform/mac-leopard/media/audio-controls-rendering-expected.txt:
-        * platform/mac/media/audio-controls-rendering-expected.txt:
-        * platform/mac/media/controls-after-reload-expected.txt:
-        * platform/mac/media/controls-styling-expected.txt:
-        * platform/mac/media/video-controls-rendering-expected.txt:
-        * platform/mac/media/video-display-toggle-expected.txt:
-        * platform/mac/media/video-empty-source-expected.txt:
-        * platform/mac/media/video-zoom-controls-expected.txt:
-            Update for controller element tab order change.
-
</del><span class="cx"> 2009-08-12  Brady Eidson  &lt;beidson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         (no review) Disabling a failing test.
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymediaelementhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/accessibility/media-element.html (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/media-element.html        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/LayoutTests/accessibility/media-element.html        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -1,78 +0,0 @@
</span><del>-&lt;html&gt;
-    &lt;head&gt;
-        &lt;link rel=&quot;stylesheet&quot; href=&quot;../fast/js/resources/js-test-style.css&quot;&gt;
-        &lt;script src=&quot;../fast/js/resources/js-test-pre.js&quot;&gt;&lt;/script&gt;
-        &lt;script&gt;
-            var vidAXObject;
-            var indentLevel = 0;
-
-            if (window.layoutTestController) {
-                layoutTestController.dumpAsText();
-                layoutTestController.waitUntilDone();
-            }
-
-            function indent(count)
-            {
-                var spaces = &quot;                                                      &quot;;
-                return spaces.substr(0, count);
-            }
-
-            function dumpObject(axObject)
-            {
-                debug(indent(indentLevel) + &quot;description: &quot; + axObject.description); 
-                debug(indent(indentLevel) + &quot;role: &quot; + axObject.role); 
-                debug(&quot;&lt;br&gt;&quot;);
-            }
-
-            function dumpChildren(axObject)
-            {
-                var count = axObject.childrenCount
-                if (!count)
-                    return;
-
-                indentLevel += 4;
-                for (var ndx = 0; ndx &lt; count; ndx++) {
-                    var childAXObject = axObject.childAtIndex(ndx);
-                    dumpObject(childAXObject);
-                    if (childAXObject.childrenCount) {
-                        // don't bother dumping static text children
-                        if ( childAXObject.role != &quot;AXRole: AXStaticText&quot;)
-                           dumpChildren(childAXObject);
-                    }
-                }
-                indentLevel -= 4;
-            }
-
-            function dumpVideoAX()
-            {
-                debug(&quot;&lt;br&gt;+++++++++++++++++++++++++++++++++++&lt;br&gt;&quot;);
-                debug(&quot;State at '&quot; + event.type + &quot;' event:&lt;br&gt;&quot;);
-
-                if (!window.accessibilityController)
-                    return;
-
-                var body = document.getElementsByTagName(&quot;body&quot;)[0];
-                body.focus();
-
-                var vidAXObject = accessibilityController.focusedElement.childAtIndex(0);
-                
-                dumpChildren(vidAXObject);
-
-                if (window.layoutTestController &amp;&amp; event.type == 'load')
-                    layoutTestController.notifyDone();     
-            }
-        &lt;/script&gt;
-    &lt;/head&gt;
-
-&lt;body&gt;
-
-    &lt;video id=vid src=&quot;../media/content/test.mp4&quot; controls onloadstart=&quot;dumpVideoAX()&quot; onload=&quot;dumpVideoAX()&quot;&gt;
-    &lt;/video&gt;
-
-    &lt;div&gt;Dump &amp;lt;video&amp;gt; element controller accessibility object tree at 'loadstart' and 'load' events.&lt;/div&gt;
-    
-    &lt;div id=console&gt;&lt;/div&gt;
-
-&lt;/body&gt;
-&lt;/html&gt;
-
</del></span></pre></div>
<a id="trunkLayoutTestsmediavideocontrolsvisibleaudioonlyhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/video-controls-visible-audio-only.html (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-controls-visible-audio-only.html        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/LayoutTests/media/video-controls-visible-audio-only.html        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">                     return;
</span><span class="cx"> 
</span><span class="cx">                 // start playback
</span><del>-                eventSender.mouseMoveTo(left + 8, bottom - 8);
</del><ins>+                eventSender.mouseMoveTo(left + 16 + 8, bottom - 8);
</ins><span class="cx">                 eventSender.mouseDown();
</span><span class="cx">                 eventSender.mouseUp();
</span><span class="cx">                 testcondition(&quot;!video.paused&quot;);
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilitymediaelementexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac/accessibility/media-element-expected.txt (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/media-element-expected.txt        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/LayoutTests/platform/mac/accessibility/media-element-expected.txt        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -1,64 +0,0 @@
</span><del>-Dump &lt;video&gt; element controller accessibility object tree at 'loadstart' and 'load' events.
-
-+++++++++++++++++++++++++++++++++++
-
-State at 'loadstart' event:
-
-    description: AXDescription: video element controller
-    role: AXRole: AXToolbar
-
-
-        description: AXDescription: back 30 seconds
-        role: AXRole: AXButton
-
-
-        description: AXDescription: play
-        role: AXRole: AXButton
-
-
-        description: AXDescription: status
-        role: AXRole: AXStaticText
-
-
-        description: AXDescription: mute
-        role: AXRole: AXButton
-
-
-
-+++++++++++++++++++++++++++++++++++
-
-State at 'load' event:
-
-    description: AXDescription: video element controller
-    role: AXRole: AXToolbar
-
-
-        description: AXDescription: back 30 seconds
-        role: AXRole: AXButton
-
-
-        description: AXDescription: play
-        role: AXRole: AXButton
-
-
-        description: AXDescription: elapsed time
-        role: AXRole: AXStaticText
-
-
-        description: AXDescription: 
-        role: AXRole: AXSlider
-
-
-            description: AXDescription: 
-            role: AXRole: AXValueIndicator
-
-
-        description: AXDescription: remaining time
-        role: AXRole: AXStaticText
-
-
-        description: AXDescription: mute
-        role: AXRole: AXButton
-
-
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacmediaaudiocontrolsrenderingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -19,21 +19,21 @@
</span><span class="cx"> layer at (8,42) size 200x25
</span><span class="cx">   RenderFlexibleBox (positioned) {DIV} at (0,0) size 200x25
</span><span class="cx">     RenderButton {INPUT} at (6,3) size 18x18
</span><ins>+    RenderButton {INPUT} at (177,5) size 15x14
</ins><span class="cx">     RenderButton {INPUT} at (32,4) size 16x16
</span><span class="cx">     RenderFlexibleBox {DIV} at (49,1) size 126x22
</span><span class="cx">       RenderSlider {INPUT} at (0,5) size 126x13
</span><span class="cx">         RenderBlock {DIV} at (0,1) size 12x10
</span><del>-    RenderButton {INPUT} at (177,5) size 15x14
</del><span class="cx"> layer at (8,85) size 320x25
</span><span class="cx">   RenderBlock (relative positioned) {DIV} at (0,0) size 320x25
</span><span class="cx"> layer at (8,85) size 320x25
</span><span class="cx">   RenderFlexibleBox (positioned) {DIV} at (0,0) size 320x25
</span><span class="cx">     RenderButton {INPUT} at (6,3) size 18x18
</span><ins>+    RenderButton {INPUT} at (297,5) size 15x14
</ins><span class="cx">     RenderButton {INPUT} at (32,4) size 16x16
</span><span class="cx">     RenderFlexibleBox {DIV} at (49,5) size 246x15
</span><span class="cx">       RenderSlider {INPUT} at (45,2) size 156x13
</span><span class="cx">         RenderBlock {DIV} at (0,1) size 12x10
</span><del>-    RenderButton {INPUT} at (297,5) size 15x14
</del><span class="cx"> layer at (57,92) size 45x11 scrollHeight 13
</span><span class="cx">   RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
</span><span class="cx">     RenderBlock (anonymous) at (9,0) size 26x11
</span><span class="lines">@@ -51,11 +51,11 @@
</span><span class="cx"> layer at (8,203) size 320x25
</span><span class="cx">   RenderFlexibleBox (positioned) {DIV} at (0,75) size 320x25
</span><span class="cx">     RenderButton {INPUT} at (6,3) size 18x18
</span><ins>+    RenderButton {INPUT} at (297,5) size 15x14
</ins><span class="cx">     RenderButton {INPUT} at (32,4) size 16x16
</span><span class="cx">     RenderFlexibleBox {DIV} at (49,5) size 246x15
</span><span class="cx">       RenderSlider {INPUT} at (45,2) size 156x13
</span><span class="cx">         RenderBlock {DIV} at (0,1) size 12x10
</span><del>-    RenderButton {INPUT} at (297,5) size 15x14
</del><span class="cx"> layer at (57,210) size 45x11 scrollHeight 13
</span><span class="cx">   RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
</span><span class="cx">     RenderBlock (anonymous) at (9,0) size 26x11
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmediacontrolsafterreloadexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/media/controls-after-reload-expected.txt (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/media/controls-after-reload-expected.txt        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/LayoutTests/platform/mac/media/controls-after-reload-expected.txt        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -17,11 +17,11 @@
</span><span class="cx"> layer at (8,257) size 320x25
</span><span class="cx">   RenderFlexibleBox (positioned) {DIV} at (0,215) size 320x25
</span><span class="cx">     RenderButton {INPUT} at (6,3) size 18x18
</span><ins>+    RenderButton {INPUT} at (297,5) size 15x14
</ins><span class="cx">     RenderButton {INPUT} at (32,4) size 16x16
</span><span class="cx">     RenderFlexibleBox {DIV} at (49,5) size 246x15
</span><span class="cx">       RenderSlider {INPUT} at (45,2) size 156x13
</span><span class="cx">         RenderBlock {DIV} at (0,1) size 12x10
</span><del>-    RenderButton {INPUT} at (297,5) size 15x14
</del><span class="cx"> layer at (57,264) size 45x11 scrollHeight 13
</span><span class="cx">   RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
</span><span class="cx">     RenderBlock (anonymous) at (9,0) size 26x11
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmediacontrolsstylingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/media/controls-styling-expected.txt (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/media/controls-styling-expected.txt        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/LayoutTests/platform/mac/media/controls-styling-expected.txt        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -21,11 +21,11 @@
</span><span class="cx"> layer at (18,257) size 320x25
</span><span class="cx">   RenderFlexibleBox (positioned) {DIV} at (0,215) size 320x25
</span><span class="cx">     RenderButton {INPUT} at (6,3) size 18x18
</span><ins>+    RenderButton {INPUT} at (297,5) size 15x14
</ins><span class="cx">     RenderButton {INPUT} at (32,4) size 16x16
</span><span class="cx">     RenderFlexibleBox {DIV} at (49,5) size 246x15
</span><span class="cx">       RenderSlider {INPUT} at (45,2) size 156x13
</span><span class="cx">         RenderBlock {DIV} at (0,1) size 12x10
</span><del>-    RenderButton {INPUT} at (297,5) size 15x14
</del><span class="cx"> layer at (67,264) size 45x11 scrollHeight 13
</span><span class="cx">   RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
</span><span class="cx">     RenderBlock (anonymous) at (9,0) size 26x11
</span><span class="lines">@@ -41,11 +41,11 @@
</span><span class="cx"> layer at (8,497) size 320x25
</span><span class="cx">   RenderFlexibleBox (positioned) {DIV} at (0,215) size 320x25
</span><span class="cx">     RenderButton {INPUT} at (6,3) size 18x18
</span><ins>+    RenderButton {INPUT} at (297,5) size 15x14
</ins><span class="cx">     RenderButton {INPUT} at (32,4) size 16x16
</span><span class="cx">     RenderFlexibleBox {DIV} at (49,5) size 246x15
</span><span class="cx">       RenderSlider {INPUT} at (45,2) size 156x13
</span><span class="cx">         RenderBlock {DIV} at (0,1) size 12x10
</span><del>-    RenderButton {INPUT} at (297,5) size 15x14
</del><span class="cx"> layer at (57,504) size 45x11 scrollHeight 13
</span><span class="cx">   RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
</span><span class="cx">     RenderBlock (anonymous) at (9,0) size 26x11
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmediavideocontrolsrenderingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -20,10 +20,10 @@
</span><span class="cx"> layer at (8,266) size 320x16
</span><span class="cx">   RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
</span><span class="cx">     RenderButton {INPUT} at (0,0) size 16x16
</span><del>-    RenderFlexibleBox {DIV} at (16,0) size 256x16
</del><ins>+    RenderButton {INPUT} at (16,0) size 16x16
+    RenderFlexibleBox {DIV} at (32,0) size 256x16
</ins><span class="cx">       RenderSlider {INPUT} at (0,0) size 256x16
</span><span class="cx">         RenderBlock {DIV} at (2,1) size 13x14
</span><del>-    RenderButton {INPUT} at (272,0) size 16x16
</del><span class="cx">     RenderButton {INPUT} at (288,0) size 16x16
</span><span class="cx">     RenderButton {INPUT} at (304,0) size 16x16
</span><span class="cx"> layer at (8,282) size 320x240
</span><span class="lines">@@ -31,10 +31,10 @@
</span><span class="cx"> layer at (8,506) size 320x16
</span><span class="cx">   RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
</span><span class="cx">     RenderButton {INPUT} at (0,0) size 16x16
</span><del>-    RenderFlexibleBox {DIV} at (16,0) size 256x16
</del><ins>+    RenderButton {INPUT} at (16,0) size 16x16
+    RenderFlexibleBox {DIV} at (32,0) size 256x16
</ins><span class="cx">       RenderSlider {INPUT} at (0,0) size 256x16
</span><span class="cx">         RenderBlock {DIV} at (2,1) size 13x14
</span><del>-    RenderButton {INPUT} at (272,0) size 16x16
</del><span class="cx">     RenderButton {INPUT} at (288,0) size 16x16
</span><span class="cx">     RenderButton {INPUT} at (304,0) size 16x16
</span><span class="cx"> layer at (8,522) size 320x240
</span><span class="lines">@@ -44,9 +44,9 @@
</span><span class="cx"> layer at (8,746) size 320x16
</span><span class="cx">   RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
</span><span class="cx">     RenderButton {INPUT} at (0,0) size 16x16
</span><del>-    RenderFlexibleBox {DIV} at (16,0) size 256x16
</del><ins>+    RenderButton {INPUT} at (16,0) size 16x16
+    RenderFlexibleBox {DIV} at (32,0) size 256x16
</ins><span class="cx">       RenderSlider {INPUT} at (0,0) size 256x16
</span><span class="cx">         RenderBlock {DIV} at (2,1) size 13x14
</span><del>-    RenderButton {INPUT} at (272,0) size 16x16
</del><span class="cx">     RenderButton {INPUT} at (288,0) size 16x16
</span><span class="cx">     RenderButton {INPUT} at (304,0) size 16x16
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmediavideodisplaytoggleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/media/video-display-toggle-expected.txt (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/media/video-display-toggle-expected.txt        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/LayoutTests/platform/mac/media/video-display-toggle-expected.txt        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -16,9 +16,9 @@
</span><span class="cx"> layer at (8,250) size 320x16
</span><span class="cx">   RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
</span><span class="cx">     RenderButton {INPUT} at (0,0) size 16x16
</span><del>-    RenderFlexibleBox {DIV} at (16,0) size 256x16
</del><ins>+    RenderButton {INPUT} at (16,0) size 16x16
+    RenderFlexibleBox {DIV} at (32,0) size 256x16
</ins><span class="cx">       RenderSlider {INPUT} at (0,0) size 256x16
</span><span class="cx">         RenderBlock {DIV} at (2,1) size 13x14
</span><del>-    RenderButton {INPUT} at (272,0) size 16x16
</del><span class="cx">     RenderButton {INPUT} at (288,0) size 16x16
</span><span class="cx">     RenderButton {INPUT} at (304,0) size 16x16
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmediavideoemptysourceexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/media/video-empty-source-expected.txt (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/media/video-empty-source-expected.txt        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/LayoutTests/platform/mac/media/video-empty-source-expected.txt        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -17,5 +17,5 @@
</span><span class="cx"> layer at (9,168) size 300x25
</span><span class="cx">   RenderFlexibleBox (positioned) {DIV} at (0,125) size 300x25
</span><span class="cx">     RenderButton {INPUT} at (6,3) size 18x18
</span><ins>+    RenderButton {INPUT} at (277,5) size 15x14
</ins><span class="cx">     RenderButton {INPUT} at (32,4) size 16x16
</span><del>-    RenderButton {INPUT} at (277,5) size 15x14
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacmediavideozoomcontrolsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/media/video-zoom-controls-expected.txt (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/media/video-zoom-controls-expected.txt        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/LayoutTests/platform/mac/media/video-zoom-controls-expected.txt        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -13,11 +13,11 @@
</span><span class="cx"> layer at (57,228) size 240x37
</span><span class="cx">   RenderFlexibleBox (positioned) {DIV} at (0,143) size 240x37
</span><span class="cx">     RenderButton {INPUT} at (9,4) size 27x27
</span><ins>+    RenderButton {INPUT} at (206,8) size 22x21
</ins><span class="cx">     RenderButton {INPUT} at (48,6) size 24x24
</span><span class="cx">     RenderFlexibleBox {DIV} at (73,1) size 130x34
</span><span class="cx">       RenderSlider {INPUT} at (0,9) size 130x19
</span><span class="cx">         RenderBlock {DIV} at (0,2) size 18x15
</span><del>-    RenderButton {INPUT} at (206,8) size 22x21
</del><span class="cx"> layer at (57,310) size 240x180
</span><span class="cx">   RenderVideo {VIDEO} at (45,298) size 240x180
</span><span class="cx"> layer at (57,310) size 240x180
</span><span class="lines">@@ -25,8 +25,8 @@
</span><span class="cx"> layer at (57,453) size 240x37
</span><span class="cx">   RenderFlexibleBox (positioned) {DIV} at (0,143) size 240x37
</span><span class="cx">     RenderButton {INPUT} at (9,4) size 27x27
</span><ins>+    RenderButton {INPUT} at (206,8) size 22x21
</ins><span class="cx">     RenderButton {INPUT} at (48,6) size 24x24
</span><span class="cx">     RenderFlexibleBox {DIV} at (73,1) size 130x34
</span><span class="cx">       RenderSlider {INPUT} at (0,9) size 130x19
</span><span class="cx">         RenderBlock {DIV} at (0,2) size 18x15
</span><del>-    RenderButton {INPUT} at (206,8) size 22x21
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacleopardaccessibilitymediaelementexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac-leopard/accessibility/media-element-expected.txt (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-leopard/accessibility/media-element-expected.txt        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/LayoutTests/platform/mac-leopard/accessibility/media-element-expected.txt        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -1,68 +0,0 @@
</span><del>-Dump &lt;video&gt; element controller accessibility object tree at 'loadstart' and 'load' events.
-
-+++++++++++++++++++++++++++++++++++
-
-State at 'loadstart' event:
-
-    description: AXDescription: video element controller
-    role: AXRole: AXToolbar
-
-
-        description: AXDescription: play
-        role: AXRole: AXButton
-
-
-        description: AXDescription: 
-        role: AXRole: AXSlider
-
-
-            description: AXDescription: 
-            role: AXRole: AXValueIndicator
-
-
-        description: AXDescription: fast reverse
-        role: AXRole: AXButton
-
-
-        description: AXDescription: fast forward
-        role: AXRole: AXButton
-
-
-        description: AXDescription: mute
-        role: AXRole: AXButton
-
-
-
-+++++++++++++++++++++++++++++++++++
-
-State at 'load' event:
-
-    description: AXDescription: video element controller
-    role: AXRole: AXToolbar
-
-
-        description: AXDescription: play
-        role: AXRole: AXButton
-
-
-        description: AXDescription: 
-        role: AXRole: AXSlider
-
-
-            description: AXDescription: 
-            role: AXRole: AXValueIndicator
-
-
-        description: AXDescription: fast reverse
-        role: AXRole: AXButton
-
-
-        description: AXDescription: fast forward
-        role: AXRole: AXButton
-
-
-        description: AXDescription: mute
-        role: AXRole: AXButton
-
-
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacleopardmediaaudiocontrolsrenderingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-leopard/media/audio-controls-rendering-expected.txt (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-leopard/media/audio-controls-rendering-expected.txt        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/LayoutTests/platform/mac-leopard/media/audio-controls-rendering-expected.txt        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -19,10 +19,10 @@
</span><span class="cx"> layer at (8,42) size 200x16
</span><span class="cx">   RenderFlexibleBox (positioned) {DIV} at (0,0) size 200x16
</span><span class="cx">     RenderButton {INPUT} at (0,0) size 16x16
</span><del>-    RenderFlexibleBox {DIV} at (16,0) size 136x16
</del><ins>+    RenderButton {INPUT} at (16,0) size 16x16
+    RenderFlexibleBox {DIV} at (32,0) size 136x16
</ins><span class="cx">       RenderSlider {INPUT} at (0,0) size 136x16
</span><span class="cx">         RenderBlock {DIV} at (2,1) size 13x14
</span><del>-    RenderButton {INPUT} at (152,0) size 16x16
</del><span class="cx">     RenderButton {INPUT} at (168,0) size 16x16
</span><span class="cx">     RenderButton {INPUT} at (184,0) size 16x16
</span><span class="cx"> layer at (8,76) size 320x16
</span><span class="lines">@@ -30,10 +30,10 @@
</span><span class="cx"> layer at (8,76) size 320x16
</span><span class="cx">   RenderFlexibleBox (positioned) {DIV} at (0,0) size 320x16
</span><span class="cx">     RenderButton {INPUT} at (0,0) size 16x16
</span><del>-    RenderFlexibleBox {DIV} at (16,0) size 256x16
</del><ins>+    RenderButton {INPUT} at (16,0) size 16x16
+    RenderFlexibleBox {DIV} at (32,0) size 256x16
</ins><span class="cx">       RenderSlider {INPUT} at (0,0) size 256x16
</span><span class="cx">         RenderBlock {DIV} at (2,1) size 13x14
</span><del>-    RenderButton {INPUT} at (272,0) size 16x16
</del><span class="cx">     RenderButton {INPUT} at (288,0) size 16x16
</span><span class="cx">     RenderButton {INPUT} at (304,0) size 16x16
</span><span class="cx"> layer at (8,110) size 320x100
</span><span class="lines">@@ -43,9 +43,9 @@
</span><span class="cx"> layer at (8,194) size 320x16
</span><span class="cx">   RenderFlexibleBox (positioned) {DIV} at (0,84) size 320x16
</span><span class="cx">     RenderButton {INPUT} at (0,0) size 16x16
</span><del>-    RenderFlexibleBox {DIV} at (16,0) size 256x16
</del><ins>+    RenderButton {INPUT} at (16,0) size 16x16
+    RenderFlexibleBox {DIV} at (32,0) size 256x16
</ins><span class="cx">       RenderSlider {INPUT} at (0,0) size 256x16
</span><span class="cx">         RenderBlock {DIV} at (2,1) size 13x14
</span><del>-    RenderButton {INPUT} at (272,0) size 16x16
</del><span class="cx">     RenderButton {INPUT} at (288,0) size 16x16
</span><span class="cx">     RenderButton {INPUT} at (304,0) size 16x16
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacleopardmediacontrolsafterreloadexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-leopard/media/controls-after-reload-expected.txt (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-leopard/media/controls-after-reload-expected.txt        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/LayoutTests/platform/mac-leopard/media/controls-after-reload-expected.txt        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -17,9 +17,9 @@
</span><span class="cx"> layer at (8,266) size 320x16
</span><span class="cx">   RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
</span><span class="cx">     RenderButton {INPUT} at (0,0) size 16x16
</span><del>-    RenderFlexibleBox {DIV} at (16,0) size 256x16
</del><ins>+    RenderButton {INPUT} at (16,0) size 16x16
+    RenderFlexibleBox {DIV} at (32,0) size 256x16
</ins><span class="cx">       RenderSlider {INPUT} at (0,0) size 256x16
</span><span class="cx">         RenderBlock {DIV} at (2,1) size 13x14
</span><del>-    RenderButton {INPUT} at (272,0) size 16x16
</del><span class="cx">     RenderButton {INPUT} at (288,0) size 16x16
</span><span class="cx">     RenderButton {INPUT} at (304,0) size 16x16
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacleopardmediacontrolsstrictexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac-leopard/media/controls-strict-expected.txt (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-leopard/media/controls-strict-expected.txt        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/LayoutTests/platform/mac-leopard/media/controls-strict-expected.txt        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -1,25 +0,0 @@
</span><del>-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x302
-  RenderBlock {HTML} at (0,0) size 800x302
-    RenderBody {BODY} at (8,16) size 784x278
-      RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 226x18
-          text run at (0,0) width 226: &quot;Drawing the controls in strict mode.&quot;
-      RenderBlock (anonymous) at (0,34) size 784x244
-        RenderText {#text} at (0,0) size 0x0
-        RenderText {#text} at (0,0) size 0x0
-        RenderText {#text} at (0,0) size 0x0
-layer at (8,50) size 320x240
-  RenderVideo {VIDEO} at (0,0) size 320x240
-layer at (8,50) size 320x240
-  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
-layer at (8,274) size 320x16
-  RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
-    RenderButton {INPUT} at (0,0) size 16x16
-    RenderFlexibleBox {DIV} at (16,0) size 256x16
-      RenderSlider {INPUT} at (0,0) size 256x16
-        RenderBlock {DIV} at (2,1) size 13x14
-    RenderButton {INPUT} at (272,0) size 16x16
-    RenderButton {INPUT} at (288,0) size 16x16
-    RenderButton {INPUT} at (304,0) size 16x16
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacleopardmediacontrolsstylingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-leopard/media/controls-styling-expected.txt (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-leopard/media/controls-styling-expected.txt        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/LayoutTests/platform/mac-leopard/media/controls-styling-expected.txt        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -21,10 +21,10 @@
</span><span class="cx"> layer at (18,266) size 320x16
</span><span class="cx">   RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
</span><span class="cx">     RenderButton {INPUT} at (0,0) size 16x16
</span><del>-    RenderFlexibleBox {DIV} at (16,0) size 256x16
</del><ins>+    RenderButton {INPUT} at (16,0) size 16x16
+    RenderFlexibleBox {DIV} at (32,0) size 256x16
</ins><span class="cx">       RenderSlider {INPUT} at (0,0) size 256x16
</span><span class="cx">         RenderBlock {DIV} at (2,1) size 13x14
</span><del>-    RenderButton {INPUT} at (272,0) size 16x16
</del><span class="cx">     RenderButton {INPUT} at (288,0) size 16x16
</span><span class="cx">     RenderButton {INPUT} at (304,0) size 16x16
</span><span class="cx"> layer at (8,282) size 320x240
</span><span class="lines">@@ -32,9 +32,9 @@
</span><span class="cx"> layer at (8,506) size 320x16
</span><span class="cx">   RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
</span><span class="cx">     RenderButton {INPUT} at (0,0) size 16x16
</span><del>-    RenderFlexibleBox {DIV} at (16,0) size 256x16
</del><ins>+    RenderButton {INPUT} at (16,0) size 16x16
+    RenderFlexibleBox {DIV} at (32,0) size 256x16
</ins><span class="cx">       RenderSlider {INPUT} at (0,0) size 256x16
</span><span class="cx">         RenderBlock {DIV} at (2,1) size 13x14
</span><del>-    RenderButton {INPUT} at (272,0) size 16x16
</del><span class="cx">     RenderButton {INPUT} at (288,0) size 16x16
</span><span class="cx">     RenderButton {INPUT} at (304,0) size 16x16
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacleopardmediavideoemptysourceexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-leopard/media/video-empty-source-expected.txt (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-leopard/media/video-empty-source-expected.txt        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/LayoutTests/platform/mac-leopard/media/video-empty-source-expected.txt        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -17,9 +17,9 @@
</span><span class="cx"> layer at (9,177) size 300x16
</span><span class="cx">   RenderFlexibleBox (positioned) {DIV} at (0,134) size 300x16
</span><span class="cx">     RenderButton {INPUT} at (0,0) size 16x16
</span><del>-    RenderFlexibleBox {DIV} at (16,0) size 236x16
</del><ins>+    RenderButton {INPUT} at (16,0) size 16x16
+    RenderFlexibleBox {DIV} at (32,0) size 236x16
</ins><span class="cx">       RenderSlider {INPUT} at (0,0) size 236x16
</span><span class="cx">         RenderBlock {DIV} at (2,1) size 13x14
</span><del>-    RenderButton {INPUT} at (252,0) size 16x16
</del><span class="cx">     RenderButton {INPUT} at (268,0) size 16x16
</span><span class="cx">     RenderButton {INPUT} at (284,0) size 16x16
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacleopardmediavideozoomcontrolsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-leopard/media/video-zoom-controls-expected.txt (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-leopard/media/video-zoom-controls-expected.txt        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/LayoutTests/platform/mac-leopard/media/video-zoom-controls-expected.txt        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -13,10 +13,10 @@
</span><span class="cx"> layer at (57,241) size 240x24
</span><span class="cx">   RenderFlexibleBox (positioned) {DIV} at (0,156) size 240x24
</span><span class="cx">     RenderButton {INPUT} at (0,0) size 24x24
</span><del>-    RenderFlexibleBox {DIV} at (24,0) size 144x24
</del><ins>+    RenderButton {INPUT} at (24,0) size 24x24
+    RenderFlexibleBox {DIV} at (48,0) size 144x24
</ins><span class="cx">       RenderSlider {INPUT} at (0,0) size 144x24
</span><span class="cx">         RenderBlock {DIV} at (3,1) size 19x21
</span><del>-    RenderButton {INPUT} at (168,0) size 24x24
</del><span class="cx">     RenderButton {INPUT} at (192,0) size 24x24
</span><span class="cx">     RenderButton {INPUT} at (216,0) size 24x24
</span><span class="cx"> layer at (57,310) size 240x180
</span><span class="lines">@@ -26,9 +26,9 @@
</span><span class="cx"> layer at (57,466) size 240x24
</span><span class="cx">   RenderFlexibleBox (positioned) {DIV} at (0,156) size 240x24
</span><span class="cx">     RenderButton {INPUT} at (0,0) size 24x24
</span><del>-    RenderFlexibleBox {DIV} at (24,0) size 144x24
</del><ins>+    RenderButton {INPUT} at (24,0) size 24x24
+    RenderFlexibleBox {DIV} at (48,0) size 144x24
</ins><span class="cx">       RenderSlider {INPUT} at (0,0) size 144x24
</span><span class="cx">         RenderBlock {DIV} at (3,1) size 19x21
</span><del>-    RenderButton {INPUT} at (168,0) size 24x24
</del><span class="cx">     RenderButton {INPUT} at (192,0) size 24x24
</span><span class="cx">     RenderButton {INPUT} at (216,0) size 24x24
</span></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/WebCore/ChangeLog        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -181,13 +181,6 @@
</span><span class="cx">         * platform/qt/FileSystemQt.cpp:
</span><span class="cx">         (WebCore::pathByAppendingComponent):
</span><span class="cx"> 
</span><del>-2009-08-12  Eric Carlson  &lt;eric.carlson@apple.com&gt;
-
-        Tiger build fix.
-
-        * accessibility/mac/AccessibilityObjectWrapper.mm: 
-            Define NSAccessibilityTimelineSubrole for Tiger.
-
</del><span class="cx"> 2009-08-12  Dirk Schulze  &lt;krit@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Ariya Hidayat.
</span><span class="lines">@@ -198,93 +191,6 @@
</span><span class="cx">         * platform/graphics/filters/FEColorMatrix.cpp:
</span><span class="cx">         (WebCore::FEColorMatrix::apply):
</span><span class="cx"> 
</span><del>-2009-08-12  Eric Carlson  &lt;eric.carlson@apple.com&gt;
-
-        Reviewed by Oliver Hunt.
-
-        &lt;video&gt; and &lt;audio&gt; controller should be accessible
-        https://bugs.webkit.org/show_bug.cgi?id=28081
-
-        Test: accessibility/media-element.html
-
-        * GNUmakefile.am:
-        * WebCore.gypi:
-        * WebCore.pro:
-        * WebCore.vcproj/WebCore.vcproj:
-        * WebCore.xcodeproj/project.pbxproj:
-        * WebCoreSources.bkl:
-            Add AccessibilityMediaControls.cpp/.h
-
-        * accessibility/AXObjectCache.cpp:
-        * accessibility/AXObjectCache.h:
-        (WebCore::AXObjectCache::getOrCreate):
-            Create AccessibilityMediaControl. Update Copyright
-
-        * accessibility/AccessibilityMediaControls.cpp:
-        * accessibility/AccessibilityMediaControls.h:
-            Added.
-
-        * accessibility/AccessibilityObject.cpp:
-        * accessibility/AccessibilityObject.h:
-            Add isMediaTimeline. Update Copyright.
-
-        * accessibility/AccessibilitySlider.h:
-            Make constructor protected instead of private so AccessibilityMediaTimeline can
-            call it.
-
-        * accessibility/mac/AccessibilityObjectWrapper.mm:
-        (-[AccessibilityObjectWrapper accessibilityAttributeNames]):
-            Add NSAccessibilityValueDescriptionAttribute to range attributes. 
-        (-[AccessibilityObjectWrapper subrole]):
-            Return NSAccessibilityTimelineSubrole for AccessibilityMediaTimeline.
-
-        * dom/Node.h:
-            add isMediaControlElement.
-
-        * page/mac/WebCoreViewFactory.h:
-        * platform/LocalizedStrings.h:
-        * platform/mac/LocalizedStringsMac.mm:
-        (WebCore::localizedMediaControlElementString): 
-        (WebCore::localizedMediaControlElementHelpText):
-        (WebCore::localizedMediaTimeDescription): 
-            New, return localized media controller strings.
-
-        * rendering/MediaControlElements.cpp:
-        (WebCore::MediaControlElement::MediaControlElement):
-            Initialize m_displayType.
-        (WebCore::MediaControlElement::MediaControlElement):
-        (WebCore::MediaControlStatusDisplayElement::MediaControlStatusDisplayElement):
-            Fix style.
-        (WebCore::MediaControlInputElement::MediaControlInputElement):
-            Set m_displayType based on pseudo style ID.
-        (WebCore::MediaControlInputElement::MediaControlInputElement):
-            rename local &quot;o&quot; to &quot;object&quot;.
-        (WebCore::MediaControlMuteButtonElement::MediaControlMuteButtonElement):
-        (WebCore::MediaControlPlayButtonElement::MediaControlPlayButtonElement):
-        (WebCore::MediaControlSeekButtonElement::MediaControlSeekButtonElement):
-        (WebCore::MediaControlRewindButtonElement::MediaControlRewindButtonElement):
-        (WebCore::MediaControlReturnToRealtimeButtonElement::MediaControlReturnToRealtimeButtonElement):
-        (WebCore::MediaControlTimelineElement::MediaControlTimelineElement):
-        (WebCore::MediaControlFullscreenButtonElement::MediaControlFullscreenButtonElement):
-        (WebCore::MediaControlTimelineElement::MediaControlTimelineElement):
-        (WebCore::MediaControlTimelineElement::MediaControlTimelineElement):
-        (WebCore::MediaControlTimelineElement::MediaControlTimelineElement):
-            Update for MediaControlInputElement constructor change.
-        (WebCore::MediaControlTimeDisplayElement::formatTime):
-            New, moved here from RenderMedia so AccessibilityMediaTimeDisplay can use it.
-        (WebCore::MediaControlTimeDisplayElement::setCurrentValue):
-            New, set text to current time.
-        * rendering/MediaControlElements.h:
-
-        * rendering/RenderMedia.cpp:
-        (WebCore::RenderMedia::updateControls):
-            Create controls in tab order.
-        (WebCore::RenderMedia::formatTime):
-            Moved to MediaControlTimeDisplayElement::formatTime.
-        (WebCore::RenderMedia::updateTimeDisplay):
-            Call MediaControlTimeDisplayElement::setCurrentValue.
-        * rendering/RenderMedia.h:
-
</del><span class="cx"> 2009-08-12  Viet-Trung Luu  &lt;viettrungluu@gmail.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Dimitri Glazkov.
</span></span></pre></div>
<a id="trunkWebCoreGNUmakefileam"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/GNUmakefile.am (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/GNUmakefile.am        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/WebCore/GNUmakefile.am        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -288,8 +288,6 @@
</span><span class="cx">         WebCore/accessibility/AccessibilityListBox.h \
</span><span class="cx">         WebCore/accessibility/AccessibilityListBoxOption.cpp \
</span><span class="cx">         WebCore/accessibility/AccessibilityListBoxOption.h \
</span><del>-        WebCore/accessibility/AccessibilityMediaControls.cpp \
-        WebCore/accessibility/AccessibilityMediaControls.h \
</del><span class="cx">         WebCore/accessibility/AccessibilityObject.cpp \
</span><span class="cx">         WebCore/accessibility/AccessibilityObject.h \
</span><span class="cx">         WebCore/accessibility/AccessibilityRenderObject.cpp \
</span></span></pre></div>
<a id="trunkWebCoreWebCoregypi"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/WebCore.gypi (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/WebCore.gypi        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/WebCore/WebCore.gypi        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -369,8 +369,6 @@
</span><span class="cx">             'accessibility/AccessibilityListBox.h',
</span><span class="cx">             'accessibility/AccessibilityListBoxOption.cpp',
</span><span class="cx">             'accessibility/AccessibilityListBoxOption.h',
</span><del>-            'accessibility/AccessibilityMediaControls.cpp',
-            'accessibility/AccessibilityMediaControls.h',
</del><span class="cx">             'accessibility/AccessibilityObject.cpp',
</span><span class="cx">             'accessibility/AccessibilityObject.h',
</span><span class="cx">             'accessibility/AccessibilityRenderObject.cpp',
</span></span></pre></div>
<a id="trunkWebCoreWebCorepro"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/WebCore.pro (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/WebCore.pro        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/WebCore/WebCore.pro        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -607,7 +607,6 @@
</span><span class="cx"> 
</span><span class="cx"> SOURCES += \
</span><span class="cx">     accessibility/AccessibilityImageMapLink.cpp \
</span><del>-    accessibility/AccessibilityMediaControls.cpp \    
</del><span class="cx">     accessibility/AccessibilityObject.cpp \    
</span><span class="cx">     accessibility/AccessibilityList.cpp \    
</span><span class="cx">     accessibility/AccessibilityListBox.cpp \    
</span><span class="lines">@@ -1295,7 +1294,6 @@
</span><span class="cx">     accessibility/AccessibilityListBox.h \
</span><span class="cx">     accessibility/AccessibilityListBoxOption.h \
</span><span class="cx">     accessibility/AccessibilityList.h \
</span><del>-    accessibility/AccessibilityMediaControls.h \
</del><span class="cx">     accessibility/AccessibilityObject.h \
</span><span class="cx">     accessibility/AccessibilityRenderObject.h \
</span><span class="cx">     accessibility/AccessibilitySlider.h \
</span></span></pre></div>
<a id="trunkWebCoreWebCorevcprojWebCorevcproj"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/WebCore.vcproj/WebCore.vcproj (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/WebCore.vcproj/WebCore.vcproj        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/WebCore/WebCore.vcproj/WebCore.vcproj        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -16585,14 +16585,6 @@
</span><span class="cx">                                 &gt;
</span><span class="cx">                         &lt;/File&gt;
</span><span class="cx">                         &lt;File
</span><del>-                                RelativePath=&quot;..\accessibility\AccessibilityMediaControls.cpp&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\accessibility\AccessibilityMediaControls.h&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
</del><span class="cx">                                 RelativePath=&quot;..\accessibility\AccessibilityObject.cpp&quot;
</span><span class="cx">                                 &gt;
</span><span class="cx">                         &lt;/File&gt;
</span></span></pre></div>
<a id="trunkWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/WebCore.xcodeproj/project.pbxproj (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/WebCore.xcodeproj/project.pbxproj        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/WebCore/WebCore.xcodeproj/project.pbxproj        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -38,8 +38,6 @@
</span><span class="cx">                 0709FC4C1025DED80059CDBA /* AccessibilitySlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0709FC4B1025DED80059CDBA /* AccessibilitySlider.cpp */; };
</span><span class="cx">                 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */ = {isa = PBXBuildFile; fileRef = 0709FC4D1025DEE30059CDBA /* AccessibilitySlider.h */; };
</span><span class="cx">                 0735EE6A0F40C5E4004A2604 /* MediaPlayerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 0735EE690F40C5E4004A2604 /* MediaPlayerProxy.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>-                07B0113D1032241900FBDC33 /* AccessibilityMediaControls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07B0113C1032241900FBDC33 /* AccessibilityMediaControls.cpp */; };
-                07B0113F1032242200FBDC33 /* AccessibilityMediaControls.h in Headers */ = {isa = PBXBuildFile; fileRef = 07B0113E1032242200FBDC33 /* AccessibilityMediaControls.h */; };
</del><span class="cx">                 080081960ED3B2DD00C53BC0 /* WMLAnchorElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 080081940ED3B2DD00C53BC0 /* WMLAnchorElement.cpp */; };
</span><span class="cx">                 080081970ED3B2DD00C53BC0 /* WMLAnchorElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 080081950ED3B2DD00C53BC0 /* WMLAnchorElement.h */; };
</span><span class="cx">                 0804BF6E0EE09C3B0006C000 /* WMLDoElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0804BF6C0EE09C3B0006C000 /* WMLDoElement.cpp */; };
</span><span class="lines">@@ -646,6 +644,7 @@
</span><span class="cx">                 33503CC71017A1B1003B47E1 /* Notification.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33503CC61017A1B1003B47E1 /* Notification.cpp */; };
</span><span class="cx">                 3390CA550FFC157B00921962 /* NotificationCenter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3390CA510FFC157B00921962 /* NotificationCenter.cpp */; };
</span><span class="cx">                 3390CA560FFC157B00921962 /* NotificationCenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 3390CA520FFC157B00921962 /* NotificationCenter.h */; };
</span><ins>+                3390CA570FFC157B00921962 /* NotificationCenter.idl in Resources */ = {isa = PBXBuildFile; fileRef = 3390CA530FFC157B00921962 /* NotificationCenter.idl */; };
</ins><span class="cx">                 3390CA580FFC157B00921962 /* NotificationContents.h in Headers */ = {isa = PBXBuildFile; fileRef = 3390CA540FFC157B00921962 /* NotificationContents.h */; };
</span><span class="cx">                 371F4F400D25B9AF00ECE0D5 /* FontData.h in Headers */ = {isa = PBXBuildFile; fileRef = 371F4F3E0D25B9AF00ECE0D5 /* FontData.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">                 371F4F410D25B9AF00ECE0D5 /* FontData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 371F4F3F0D25B9AF00ECE0D5 /* FontData.cpp */; };
</span><span class="lines">@@ -5009,8 +5008,6 @@
</span><span class="cx">                 0735EE690F40C5E4004A2604 /* MediaPlayerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlayerProxy.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 079F5E4B0F3BEBEA005E0782 /* MediaPlayerPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlayerPrivate.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 07AFE5900F1446BD00841617 /* mediaControlsQT.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mediaControlsQT.css; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><del>-                07B0113C1032241900FBDC33 /* AccessibilityMediaControls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilityMediaControls.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
-                07B0113E1032242200FBDC33 /* AccessibilityMediaControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityMediaControls.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</del><span class="cx">                 080081940ED3B2DD00C53BC0 /* WMLAnchorElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WMLAnchorElement.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 080081950ED3B2DD00C53BC0 /* WMLAnchorElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMLAnchorElement.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 0804BF6C0EE09C3B0006C000 /* WMLDoElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WMLDoElement.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="lines">@@ -9987,8 +9984,6 @@
</span><span class="cx">                                 29A812250FBB9C1D00510293 /* AccessibilityListBox.h */,
</span><span class="cx">                                 29A8121F0FBB9C1D00510293 /* AccessibilityListBoxOption.cpp */,
</span><span class="cx">                                 29A812240FBB9C1D00510293 /* AccessibilityListBoxOption.h */,
</span><del>-                                07B0113C1032241900FBDC33 /* AccessibilityMediaControls.cpp */,
-                                07B0113E1032242200FBDC33 /* AccessibilityMediaControls.h */,
</del><span class="cx">                                 29A8121E0FBB9C1D00510293 /* AccessibilityObject.cpp */,
</span><span class="cx">                                 29A812180FBB9C1D00510293 /* AccessibilityObject.h */,
</span><span class="cx">                                 29A812080FBB9C1D00510293 /* AccessibilityRenderObject.cpp */,
</span><span class="lines">@@ -17252,7 +17247,6 @@
</span><span class="cx">                                 49484FCB102CF23C00187DD3 /* CanvasRenderingContext2D.h in Headers */,
</span><span class="cx">                                 49484FCE102CF23C00187DD3 /* CanvasStyle.h in Headers */,
</span><span class="cx">                                 416E29A6102FA962007FC14E /* WorkerReportingProxy.h in Headers */,
</span><del>-                                07B0113F1032242200FBDC33 /* AccessibilityMediaControls.h in Headers */,
</del><span class="cx">                         );
</span><span class="cx">                         runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx">                 };
</span><span class="lines">@@ -19309,7 +19303,6 @@
</span><span class="cx">                                 49484FC7102CF23C00187DD3 /* CanvasPixelArray.cpp in Sources */,
</span><span class="cx">                                 49484FCA102CF23C00187DD3 /* CanvasRenderingContext2D.cpp in Sources */,
</span><span class="cx">                                 49484FCD102CF23C00187DD3 /* CanvasStyle.cpp in Sources */,
</span><del>-                                07B0113D1032241900FBDC33 /* AccessibilityMediaControls.cpp in Sources */,
</del><span class="cx">                         );
</span><span class="cx">                         runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx">                 };
</span></span></pre></div>
<a id="trunkWebCoreWebCoreSourcesbkl"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/WebCoreSources.bkl (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/WebCoreSources.bkl        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/WebCore/WebCoreSources.bkl        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx">         accessibility/AccessibilityARIAGridCell.cpp
</span><span class="cx">         accessibility/AccessibilityARIAGridRow.cpp
</span><span class="cx">         accessibility/AccessibilityImageMapLink.cpp
</span><del>-        accessibility/AccessibilityMediaControls.cpp
</del><span class="cx">         accessibility/AccessibilityObject.cpp
</span><span class="cx">         accessibility/AccessibilityList.cpp
</span><span class="cx">         accessibility/AccessibilityListBox.cpp
</span></span></pre></div>
<a id="trunkWebCoreaccessibilityAXObjectCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/accessibility/AXObjectCache.cpp (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/accessibility/AXObjectCache.cpp        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/WebCore/accessibility/AXObjectCache.cpp        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2008 Apple Inc. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> #include &quot;AccessibilityListBox.h&quot;
</span><span class="cx"> #include &quot;AccessibilityListBoxOption.h&quot;
</span><span class="cx"> #include &quot;AccessibilityImageMapLink.h&quot;
</span><del>-#include &quot;AccessibilityMediaControls.h&quot;
</del><span class="cx"> #include &quot;AccessibilityRenderObject.h&quot;
</span><span class="cx"> #include &quot;AccessibilitySlider.h&quot;
</span><span class="cx"> #include &quot;AccessibilityTable.h&quot;
</span><span class="lines">@@ -46,9 +45,6 @@
</span><span class="cx"> #include &quot;AccessibilityTableRow.h&quot;
</span><span class="cx"> #include &quot;InputElement.h&quot;
</span><span class="cx"> #include &quot;HTMLNames.h&quot;
</span><del>-#if ENABLE(VIDEO)
-#include &quot;MediaControlElements.h&quot;
-#endif
</del><span class="cx"> #include &quot;RenderObject.h&quot;
</span><span class="cx"> #include &quot;RenderView.h&quot;
</span><span class="cx"> 
</span><span class="lines">@@ -131,12 +127,6 @@
</span><span class="cx">         else if (renderer-&gt;isTableCell())
</span><span class="cx">             newObj = AccessibilityTableCell::create(renderer);
</span><span class="cx"> 
</span><del>-#if ENABLE(VIDEO)
-        // media controls
-        else if (renderer-&gt;node() &amp;&amp; renderer-&gt;node()-&gt;isMediaControlElement())
-            newObj = AccessibilityMediaControl::create(renderer);
-#endif
-
</del><span class="cx">         // input type=range
</span><span class="cx">         else if (renderer-&gt;isSlider())
</span><span class="cx">             newObj = AccessibilitySlider::create(renderer);
</span></span></pre></div>
<a id="trunkWebCoreaccessibilityAXObjectCacheh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/accessibility/AXObjectCache.h (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/accessibility/AXObjectCache.h        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/WebCore/accessibility/AXObjectCache.h        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2003, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2003, 2006, 2007, 2008 Apple Inc. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span></span></pre></div>
<a id="trunkWebCoreaccessibilityAccessibilityMediaControlscpp"></a>
<div class="delfile"><h4>Deleted: trunk/WebCore/accessibility/AccessibilityMediaControls.cpp (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/accessibility/AccessibilityMediaControls.cpp        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/WebCore/accessibility/AccessibilityMediaControls.cpp        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -1,319 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009 Apple Inc. 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.
- * 3.  Neither the name of Apple Computer, Inc. (&quot;Apple&quot;) nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS &quot;AS IS&quot; 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 OR ITS 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 &quot;config.h&quot;
-
-#if ENABLE(VIDEO)
-
-#include &quot;AccessibilityMediaControls.h&quot;
-
-#include &quot;AXObjectCache.h&quot;
-#include &quot;HTMLInputElement.h&quot;
-#include &quot;HTMLNames.h&quot;
-#include &quot;LocalizedStrings.h&quot;
-#include &quot;MediaControlElements.h&quot;
-#include &quot;RenderObject.h&quot;
-#include &quot;RenderSlider.h&quot;
-
-namespace WebCore {
-
-using namespace HTMLNames;
-
-
-AccessibilityMediaControl::AccessibilityMediaControl(RenderObject* renderer)
-    : AccessibilityRenderObject(renderer)
-{
-}
-
-PassRefPtr&lt;AccessibilityObject&gt; AccessibilityMediaControl::create(RenderObject* renderer)
-{
-    ASSERT(renderer-&gt;node() &amp;&amp; renderer-&gt;node()-&gt;isMediaControlElement());
-
-    Node* node = renderer-&gt;node();
-    MediaControlElementType controlType;
-
-    if (node-&gt;hasTagName(inputTag))
-        controlType = static_cast&lt;MediaControlInputElement*&gt;(node)-&gt;displayType();
-    else
-        controlType = static_cast&lt;MediaControlElement*&gt;(node)-&gt;displayType();
-
-    PassRefPtr&lt;AccessibilityObject&gt; obj;
-    switch (controlType) {
-    case MediaSlider:
-        obj = AccessibilityMediaTimeline::create(renderer);
-        break;
-
-    case MediaCurrentTimeDisplay:
-    case MediaTimeRemainingDisplay:
-        obj = AccessibilityMediaTimeDisplay::create(renderer);
-        break;
-
-    case MediaControlsPanel:
-        obj = AccessibilityMediaControlsContainer::create(renderer);
-        break;
-
-    default:
-        obj = adoptRef(new AccessibilityMediaControl(renderer));
-        break;
-    }
-
-    return obj;
-}
-
-MediaControlElementType AccessibilityMediaControl::controlType() const
-{
-    if (!renderer() || !renderer()-&gt;node())
-        return MediaTimelineContainer;  // Timeline container is not accessible.
-
-    Node* node = renderer()-&gt;node();
-
-    if (node-&gt;hasTagName(inputTag))
-        return static_cast&lt;MediaControlInputElement*&gt;(node)-&gt;displayType();
-
-    return static_cast&lt;MediaControlElement*&gt;(node)-&gt;displayType();
-}
-
-String AccessibilityMediaControl::controlTypeName() const
-{
-    DEFINE_STATIC_LOCAL(const String, mediaMuteButtonName, (&quot;MuteButton&quot;));
-    DEFINE_STATIC_LOCAL(const String, mediaPlayButtonName, (&quot;PlayButton&quot;));
-    DEFINE_STATIC_LOCAL(const String, mediaSeekBackButtonName, (&quot;SeekBackButton&quot;));
-    DEFINE_STATIC_LOCAL(const String, mediaSeekForwardButtonName, (&quot;SeekForwardButton&quot;));
-    DEFINE_STATIC_LOCAL(const String, mediaRewindButtonName, (&quot;RewindButton&quot;));
-    DEFINE_STATIC_LOCAL(const String, mediaReturnToRealtimeButtonName, (&quot;ReturnToRealtimeButton&quot;));
-    DEFINE_STATIC_LOCAL(const String, mediaUnMuteButtonName, (&quot;UnMuteButton&quot;));
-    DEFINE_STATIC_LOCAL(const String, mediaPauseButtonName, (&quot;PauseButton&quot;));
-    DEFINE_STATIC_LOCAL(const String, mediaStatusDisplayName, (&quot;StatusDisplay&quot;));
-    DEFINE_STATIC_LOCAL(const String, mediaCurrentTimeDisplay, (&quot;CurrentTimeDisplay&quot;));
-    DEFINE_STATIC_LOCAL(const String, mediaTimeRemainingDisplay, (&quot;TimeRemainingDisplay&quot;));
-
-    switch (controlType()) {
-    case MediaMuteButton:
-        return mediaMuteButtonName;
-    case MediaPlayButton:
-        return mediaPlayButtonName;
-    case MediaSeekBackButton:
-        return mediaSeekBackButtonName;
-    case MediaSeekForwardButton:
-        return mediaSeekForwardButtonName;
-    case MediaRewindButton:
-        return mediaRewindButtonName;
-    case MediaReturnToRealtimeButton:
-        return mediaReturnToRealtimeButtonName;
-    case MediaUnMuteButton:
-        return mediaUnMuteButtonName;
-    case MediaPauseButton:
-        return mediaPauseButtonName;
-    case MediaStatusDisplay:
-        return mediaStatusDisplayName;
-    case MediaCurrentTimeDisplay:
-        return mediaCurrentTimeDisplay;
-    case MediaTimeRemainingDisplay:
-        return mediaTimeRemainingDisplay;
-
-    default:
-        break;
-    }
-
-    return String();
-}
-
-String AccessibilityMediaControl::title() const
-{
-    DEFINE_STATIC_LOCAL(const String, controlsPanel, (&quot;ControlsPanel&quot;));
-
-    if (controlType() == MediaControlsPanel)
-        return localizedMediaControlElementString(controlsPanel);
-
-    return AccessibilityRenderObject::title();
-}
-
-String AccessibilityMediaControl::accessibilityDescription() const
-{
-    return localizedMediaControlElementString(controlTypeName());
-}
-
-String AccessibilityMediaControl::helpText() const
-{
-    return localizedMediaControlElementHelpText(controlTypeName());
-}
-
-bool AccessibilityMediaControl::accessibilityIsIgnored() const
-{
-    if (!m_renderer || !m_renderer-&gt;style() || m_renderer-&gt;style()-&gt;visibility() != VISIBLE || controlType() == MediaTimelineContainer)
-        return true;
-
-    return false;
-}
-
-AccessibilityRole AccessibilityMediaControl::roleValue() const
-{
-    switch (controlType()) {
-    case MediaFullscreenButton:
-    case MediaMuteButton:
-    case MediaPlayButton:
-    case MediaSeekBackButton:
-    case MediaSeekForwardButton:
-    case MediaRewindButton:
-    case MediaReturnToRealtimeButton:
-    case MediaUnMuteButton:
-    case MediaPauseButton:
-        return ButtonRole;
-
-    case MediaStatusDisplay:
-        return StaticTextRole;
-
-    case MediaTimelineContainer:
-        return GroupRole;
-
-    default:
-        break;
-    }
-
-    return UnknownRole;
-}
-
-
-
-//
-// AccessibilityMediaControlsContainer
-
-AccessibilityMediaControlsContainer::AccessibilityMediaControlsContainer(RenderObject* renderer)
-    : AccessibilityMediaControl(renderer)
-{
-}
-
-PassRefPtr&lt;AccessibilityObject&gt; AccessibilityMediaControlsContainer::create(RenderObject* renderer)
-{
-    return adoptRef(new AccessibilityMediaControlsContainer(renderer));
-}
-
-String AccessibilityMediaControlsContainer::accessibilityDescription() const
-{
-    return localizedMediaControlElementString(elementTypeName());
-}
-
-String AccessibilityMediaControlsContainer::helpText() const
-{
-    return localizedMediaControlElementHelpText(elementTypeName());
-}
-
-bool AccessibilityMediaControlsContainer::controllingVideoElement() const
-{
-    if (!m_renderer-&gt;node())
-        return true;
-
-    MediaControlTimeDisplayElement* element = static_cast&lt;MediaControlTimeDisplayElement*&gt;(m_renderer-&gt;node());
-
-    return element-&gt;mediaElement()-&gt;isVideo();
-}
-
-const String AccessibilityMediaControlsContainer::elementTypeName() const
-{
-    DEFINE_STATIC_LOCAL(const String, videoElement, (&quot;VideoElement&quot;));
-    DEFINE_STATIC_LOCAL(const String, audioElement, (&quot;AudioElement&quot;));
-
-    if (controllingVideoElement())
-        return videoElement;
-    return audioElement;
-}
-
-
-//
-// AccessibilityMediaTimeline
-
-AccessibilityMediaTimeline::AccessibilityMediaTimeline(RenderObject* renderer)
-    : AccessibilitySlider(renderer)
-{
-}
-
-PassRefPtr&lt;AccessibilityObject&gt; AccessibilityMediaTimeline::create(RenderObject* renderer)
-{
-    return adoptRef(new AccessibilityMediaTimeline(renderer));
-}
-
-String AccessibilityMediaTimeline::valueDescription() const
-{
-    float time = static_cast&lt;HTMLInputElement*&gt;(m_renderer-&gt;node())-&gt;value().toFloat();
-    String value = localizedMediaTimeDescription(time);
-    return value;
-}
-
-String AccessibilityMediaTimeline::helpText() const
-{
-    DEFINE_STATIC_LOCAL(const String, slider, (&quot;Slider&quot;));
-    return localizedMediaControlElementHelpText(slider);
-}
-
-
-//
-// AccessibilityMediaTimeDisplay
-
-AccessibilityMediaTimeDisplay::AccessibilityMediaTimeDisplay(RenderObject* renderer)
-    : AccessibilityMediaControl(renderer)
-{
-}
-
-PassRefPtr&lt;AccessibilityObject&gt; AccessibilityMediaTimeDisplay::create(RenderObject* renderer)
-{
-    return adoptRef(new AccessibilityMediaTimeDisplay(renderer));
-}
-
-bool AccessibilityMediaTimeDisplay::accessibilityIsIgnored() const
-{
-    if (!m_renderer || !m_renderer-&gt;style() || m_renderer-&gt;style()-&gt;visibility() != VISIBLE)
-        return true;
-
-    return !m_renderer-&gt;style()-&gt;width().value();
-}
-
-String AccessibilityMediaTimeDisplay::accessibilityDescription() const
-{
-    DEFINE_STATIC_LOCAL(const String, currentTimeDisplay, (&quot;CurrentTimeDisplay&quot;));
-    DEFINE_STATIC_LOCAL(const String, timeRemainingDisplay, (&quot;TimeRemainingDisplay&quot;));
-
-    if (controlType() == MediaCurrentTimeDisplay)
-        return localizedMediaControlElementString(currentTimeDisplay);
-
-    return localizedMediaControlElementString(timeRemainingDisplay);
-}
-
-String AccessibilityMediaTimeDisplay::stringValue() const
-{
-    if (!m_renderer || !m_renderer-&gt;node())
-        return String();
-
-    MediaControlTimeDisplayElement* element = static_cast&lt;MediaControlTimeDisplayElement*&gt;(m_renderer-&gt;node());
-    float time = element-&gt;currentValue();
-    return localizedMediaTimeDescription(fabsf(time));
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(VIDEO)
</del></span></pre></div>
<a id="trunkWebCoreaccessibilityAccessibilityMediaControlsh"></a>
<div class="delfile"><h4>Deleted: trunk/WebCore/accessibility/AccessibilityMediaControls.h (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/accessibility/AccessibilityMediaControls.h        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/WebCore/accessibility/AccessibilityMediaControls.h        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -1,117 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009 Apple Inc. 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.
- * 3.  Neither the name of Apple Computer, Inc. (&quot;Apple&quot;) nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS &quot;AS IS&quot; 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 OR ITS 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 AccessibilityMediaControls_h
-#define AccessibilityMediaControls_h
-
-#if ENABLE(VIDEO)
-
-#include &quot;AccessibilitySlider.h&quot;
-#include &quot;MediaControlElements.h&quot;
-
-namespace WebCore {
-
-    class AccessibilityMediaControl : public AccessibilityRenderObject {
-
-    public:
-        static PassRefPtr&lt;AccessibilityObject&gt; create(RenderObject*);
-        virtual ~AccessibilityMediaControl() { }
-
-        virtual AccessibilityRole roleValue() const;
-        virtual bool accessibilityIsIgnored() const;
-
-        virtual String title() const;
-        virtual String accessibilityDescription() const;
-        virtual String helpText() const;
-
-    protected:
-        AccessibilityMediaControl(RenderObject*);
-        MediaControlElementType controlType() const;
-        String controlTypeName() const;
-    };
-
-
-    class AccessibilityMediaTimeline : public AccessibilitySlider {
-
-    public:
-        static PassRefPtr&lt;AccessibilityObject&gt; create(RenderObject*);
-        virtual ~AccessibilityMediaTimeline() { }
-
-        virtual bool isMediaTimeline() const { return true; }
-
-        virtual String helpText() const;
-        virtual String valueDescription() const;
-        const AtomicString&amp; getAttribute(const QualifiedName&amp; attribute) const;
-
-    private:
-        AccessibilityMediaTimeline(RenderObject*);
-    };
-
-
-    class AccessibilityMediaControlsContainer : public AccessibilityMediaControl {
-
-    public:
-        static PassRefPtr&lt;AccessibilityObject&gt; create(RenderObject*);
-        virtual ~AccessibilityMediaControlsContainer() { }
-
-        virtual AccessibilityRole roleValue() const { return ToolbarRole; }
-        virtual bool accessibilityIsIgnored() const { return false; }
-
-        virtual String helpText() const;
-        virtual String accessibilityDescription() const;
-
-    private:
-        AccessibilityMediaControlsContainer(RenderObject*);
-        bool controllingVideoElement() const;
-        const String elementTypeName() const;
-    };
-
-
-    class AccessibilityMediaTimeDisplay : public AccessibilityMediaControl {
-
-    public:
-        static PassRefPtr&lt;AccessibilityObject&gt; create(RenderObject*);
-        virtual ~AccessibilityMediaTimeDisplay() { }
-
-        virtual AccessibilityRole roleValue() const { return StaticTextRole; }
-        virtual bool accessibilityIsIgnored() const;
-
-        virtual String stringValue() const;
-        virtual String accessibilityDescription() const;
-
-    private:
-        AccessibilityMediaTimeDisplay(RenderObject*);
-    };
-
-
-} // namespace WebCore
-
-#endif // ENABLE(VIDEO)
-
-#endif // AccessibilityMediaControls_h
</del></span></pre></div>
<a id="trunkWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/accessibility/AccessibilityObject.cpp (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/accessibility/AccessibilityObject.cpp        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/WebCore/accessibility/AccessibilityObject.cpp        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2008 Apple Inc. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span></span></pre></div>
<a id="trunkWebCoreaccessibilityAccessibilityObjecth"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/accessibility/AccessibilityObject.h (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/accessibility/AccessibilityObject.h        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/WebCore/accessibility/AccessibilityObject.h        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2008 Apple Inc. All rights reserved.
</ins><span class="cx">  * Copyright (C) 2008 Nuanti Ltd.
</span><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -221,7 +221,6 @@
</span><span class="cx">     virtual bool isWebArea() const { return false; };
</span><span class="cx">     virtual bool isCheckboxOrRadio() const { return false; };
</span><span class="cx">     virtual bool isListBox() const { return roleValue() == ListBoxRole; };
</span><del>-    virtual bool isMediaTimeline() const { return false; }
</del><span class="cx">     virtual bool isMenuRelated() const { return false; }
</span><span class="cx">     virtual bool isMenu() const { return false; }
</span><span class="cx">     virtual bool isMenuBar() const { return false; }
</span></span></pre></div>
<a id="trunkWebCoreaccessibilityAccessibilitySliderh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/accessibility/AccessibilitySlider.h (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/accessibility/AccessibilitySlider.h        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/WebCore/accessibility/AccessibilitySlider.h        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -61,10 +61,8 @@
</span><span class="cx">         virtual void increment();
</span><span class="cx">         virtual void decrement();
</span><span class="cx"> 
</span><del>-    protected:
-        AccessibilitySlider(RenderObject*);
-
</del><span class="cx">     private:
</span><ins>+        AccessibilitySlider(RenderObject*);
</ins><span class="cx">         void changeValue(float /*percentChange*/);
</span><span class="cx">         HTMLInputElement* element() const;
</span><span class="cx">     };
</span></span></pre></div>
<a id="trunkWebCoreaccessibilitymacAccessibilityObjectWrappermm"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2008 Apple Inc. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -122,7 +122,6 @@
</span><span class="cx"> #ifdef BUILDING_ON_TIGER
</span><span class="cx"> typedef unsigned NSUInteger;
</span><span class="cx"> #define NSAccessibilityValueDescriptionAttribute @&quot;AXValueDescription&quot;
</span><del>-#define NSAccessibilityTimelineSubrole @&quot;AXTimeline&quot;
</del><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> @interface NSObject (WebKitAccessibilityArrayCategory)
</span><span class="lines">@@ -679,7 +678,6 @@
</span><span class="cx">         [tempArray addObject:NSAccessibilityMinValueAttribute];
</span><span class="cx">         [tempArray addObject:NSAccessibilityMaxValueAttribute];
</span><span class="cx">         [tempArray addObject:NSAccessibilityOrientationAttribute];
</span><del>-        [tempArray addObject:NSAccessibilityValueDescriptionAttribute];
</del><span class="cx">         rangeAttrs = [[NSArray alloc] initWithArray:tempArray];
</span><span class="cx">         [tempArray release];
</span><span class="cx">     }
</span><span class="lines">@@ -981,7 +979,9 @@
</span><span class="cx">         { DefinitionListDefinitionRole, NSAccessibilityGroupRole },
</span><span class="cx">         { DefinitionListTermRole, NSAccessibilityGroupRole },
</span><span class="cx">         
</span><del>-        { SliderThumbRole, NSAccessibilityValueIndicatorRole }
</del><ins>+        { SliderThumbRole, NSAccessibilityValueIndicatorRole },
+        
+
</ins><span class="cx">     };
</span><span class="cx">     AccessibilityRoleMap&amp; roleMap = *new AccessibilityRoleMap;
</span><span class="cx">     
</span><span class="lines">@@ -1028,9 +1028,6 @@
</span><span class="cx">             return NSAccessibilityDefinitionListSubrole;
</span><span class="cx">     }
</span><span class="cx">     
</span><del>-    if (m_object-&gt;isMediaTimeline())
-        return NSAccessibilityTimelineSubrole;
-
</del><span class="cx">     return nil;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -1122,7 +1119,7 @@
</span><span class="cx">     
</span><span class="cx">     if ([axRole isEqualToString:NSAccessibilityToolbarRole])
</span><span class="cx">         return NSAccessibilityRoleDescription(NSAccessibilityToolbarRole, [self subrole]);
</span><del>-    
</del><ins>+
</ins><span class="cx">     return NSAccessibilityRoleDescription(NSAccessibilityUnknownRole, nil);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -1256,7 +1253,7 @@
</span><span class="cx">         }
</span><span class="cx">         return m_object-&gt;accessibilityDescription();
</span><span class="cx">     }
</span><del>-
</del><ins>+    
</ins><span class="cx">     if ([attributeName isEqualToString: NSAccessibilityValueAttribute]) {
</span><span class="cx">         if (m_object-&gt;isAttachment()) {
</span><span class="cx">             if ([[[self attachmentView] accessibilityAttributeNames] containsObject:NSAccessibilityValueAttribute]) 
</span></span></pre></div>
<a id="trunkWebCoredomNodeh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/dom/Node.h (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/dom/Node.h        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/WebCore/dom/Node.h        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -182,7 +182,6 @@
</span><span class="cx">     static bool isWMLElement() { return false; }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    virtual bool isMediaControlElement() const { return false; }
</del><span class="cx">     virtual bool isStyledElement() const { return false; }
</span><span class="cx">     virtual bool isFrameOwnerElement() const { return false; }
</span><span class="cx">     virtual bool isAttributeNode() const { return false; }
</span></span></pre></div>
<a id="trunkWebCorepagemacWebCoreViewFactoryh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/mac/WebCoreViewFactory.h (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/mac/WebCoreViewFactory.h        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/WebCore/page/mac/WebCoreViewFactory.h        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2003, 2005, 2009 Apple Computer, Inc.  All rights reserved.
</del><ins>+ * Copyright (C) 2003, 2005 Apple Computer, Inc.  All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -143,11 +143,7 @@
</span><span class="cx"> 
</span><span class="cx"> - (NSString *)mediaElementLoadingStateText;
</span><span class="cx"> - (NSString *)mediaElementLiveBroadcastStateText;
</span><del>-- (NSString*)localizedMediaControlElementString:(NSString*)name;
-- (NSString*)localizedMediaControlElementHelpText:(NSString*)name;
-- (NSString*)localizedMediaTimeDescription:(float)time;
</del><span class="cx"> 
</span><del>-
</del><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> @interface WebCoreViewFactory : NSObject
</span></span></pre></div>
<a id="trunkWebCoreplatformLocalizedStringsh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/LocalizedStrings.h (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/LocalizedStrings.h        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/WebCore/platform/LocalizedStrings.h        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2003, 2006, 2009 Apple Computer, Inc.  All rights reserved.
</del><ins>+ * Copyright (C) 2003, 2006 Apple Computer, Inc.  All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -135,9 +135,6 @@
</span><span class="cx"> 
</span><span class="cx">     String mediaElementLoadingStateText();
</span><span class="cx">     String mediaElementLiveBroadcastStateText();
</span><del>-    String localizedMediaControlElementString(const String&amp;);
-    String localizedMediaControlElementHelpText(const String&amp;);
-    String localizedMediaTimeDescription(float);
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkWebCoreplatformmacLocalizedStringsMacmm"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/mac/LocalizedStringsMac.mm (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/mac/LocalizedStringsMac.mm        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/WebCore/platform/mac/LocalizedStringsMac.mm        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2003, 2006, 2009 Apple Computer, Inc.  All rights reserved.
</del><ins>+ * Copyright (C) 2003, 2006 Apple Computer, Inc.  All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -713,29 +713,4 @@
</span><span class="cx">     return String();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-String localizedMediaControlElementString(const String&amp; controlName)
-{
-    BEGIN_BLOCK_OBJC_EXCEPTIONS;
-    return [[WebCoreViewFactory sharedFactory] localizedMediaControlElementString:controlName];
-    END_BLOCK_OBJC_EXCEPTIONS;
-    return String();
</del><span class="cx"> }
</span><del>-
-String localizedMediaControlElementHelpText(const String&amp; controlName)
-{
-    BEGIN_BLOCK_OBJC_EXCEPTIONS;
-    return [[WebCoreViewFactory sharedFactory] localizedMediaControlElementHelpText:controlName];
-    END_BLOCK_OBJC_EXCEPTIONS;
-    return String();
-}
-
-String localizedMediaTimeDescription(float time)
-{
-    BEGIN_BLOCK_OBJC_EXCEPTIONS;
-    return [[WebCoreViewFactory sharedFactory] localizedMediaTimeDescription:time];
-    END_BLOCK_OBJC_EXCEPTIONS;
-    return String();
-}
-
-
-}
</del></span></pre></div>
<a id="trunkWebCorerenderingMediaControlElementscpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/MediaControlElements.cpp (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/MediaControlElements.cpp        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/WebCore/rendering/MediaControlElements.cpp        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -32,11 +32,11 @@
</span><span class="cx"> 
</span><span class="cx"> #include &quot;MediaControlElements.h&quot;
</span><span class="cx"> 
</span><ins>+#include &quot;LocalizedStrings.h&quot;
</ins><span class="cx"> #include &quot;EventNames.h&quot;
</span><span class="cx"> #include &quot;FloatConversion.h&quot;
</span><span class="cx"> #include &quot;Frame.h&quot;
</span><span class="cx"> #include &quot;HTMLNames.h&quot;
</span><del>-#include &quot;LocalizedStrings.h&quot;
</del><span class="cx"> #include &quot;MouseEvent.h&quot;
</span><span class="cx"> #include &quot;RenderMedia.h&quot;
</span><span class="cx"> #include &quot;RenderSlider.h&quot;
</span><span class="lines">@@ -78,32 +78,12 @@
</span><span class="cx"> // ----------------------------
</span><span class="cx">     
</span><span class="cx"> 
</span><del>-MediaControlElement::MediaControlElement(Document* doc, PseudoId pseudo, HTMLMediaElement* mediaElement)
</del><ins>+MediaControlElement::MediaControlElement(Document* doc, PseudoId pseudo, HTMLMediaElement* mediaElement) 
</ins><span class="cx">     : HTMLDivElement(divTag, doc)
</span><span class="cx">     , m_mediaElement(mediaElement)
</span><span class="cx">     , m_pseudoStyleId(pseudo)
</span><span class="cx"> {
</span><span class="cx">     setInDocument(true);
</span><del>-    switch (pseudo) {
-    case MEDIA_CONTROLS_CURRENT_TIME_DISPLAY:
-        m_displayType = MediaCurrentTimeDisplay;
-        break;
-    case MEDIA_CONTROLS_TIME_REMAINING_DISPLAY:
-        m_displayType = MediaTimeRemainingDisplay;
-        break;
-    case MEDIA_CONTROLS_TIMELINE_CONTAINER:
-        m_displayType = MediaTimelineContainer;
-        break;
-    case MEDIA_CONTROLS_STATUS_DISPLAY:
-        m_displayType = MediaStatusDisplay;
-        break;
-    case MEDIA_CONTROLS_PANEL:
-        m_displayType = MediaControlsPanel;
-        break;
-    default:
-        ASSERT_NOT_REACHED();
-        break;
-    }
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void MediaControlElement::attachToParent(Element* parent)
</span><span class="lines">@@ -186,7 +166,7 @@
</span><span class="cx"> // ----------------------------
</span><span class="cx"> 
</span><span class="cx"> MediaControlTimelineContainerElement::MediaControlTimelineContainerElement(Document* doc, HTMLMediaElement* element)
</span><del>-    : MediaControlElement(doc, MEDIA_CONTROLS_TIMELINE_CONTAINER, element)
</del><ins>+: MediaControlElement(doc, MEDIA_CONTROLS_TIMELINE_CONTAINER, element)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -209,8 +189,8 @@
</span><span class="cx"> // ----------------------------
</span><span class="cx"> 
</span><span class="cx"> MediaControlStatusDisplayElement::MediaControlStatusDisplayElement(Document* doc, HTMLMediaElement* element)
</span><del>-    : MediaControlElement(doc, MEDIA_CONTROLS_STATUS_DISPLAY, element)
-    , m_stateBeingDisplayed(Nothing)
</del><ins>+: MediaControlElement(doc, MEDIA_CONTROLS_STATUS_DISPLAY, element)
+, m_stateBeingDisplayed(Nothing)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -255,43 +235,14 @@
</span><span class="cx"> 
</span><span class="cx"> // ----------------------------
</span><span class="cx">     
</span><del>-MediaControlInputElement::MediaControlInputElement(Document* doc, PseudoId pseudo, const String&amp; type, HTMLMediaElement* mediaElement)
</del><ins>+MediaControlInputElement::MediaControlInputElement(Document* doc, PseudoId pseudo, const String&amp; type, HTMLMediaElement* mediaElement, MediaControlElementType displayType) 
</ins><span class="cx">     : HTMLInputElement(inputTag, doc)
</span><span class="cx">     , m_mediaElement(mediaElement)
</span><span class="cx">     , m_pseudoStyleId(pseudo)
</span><ins>+    , m_displayType(displayType)
</ins><span class="cx"> {
</span><span class="cx">     setInputType(type);
</span><span class="cx">     setInDocument(true);
</span><del>-
-    switch (pseudo) {
-    case MEDIA_CONTROLS_MUTE_BUTTON:
-        m_displayType = MediaMuteButton;
-        break;
-    case MEDIA_CONTROLS_PLAY_BUTTON:
-        m_displayType = MediaPlayButton;
-        break;
-    case MEDIA_CONTROLS_SEEK_FORWARD_BUTTON:
-        m_displayType = MediaSeekForwardButton;
-        break;
-    case MEDIA_CONTROLS_SEEK_BACK_BUTTON:
-        m_displayType = MediaSeekBackButton;
-        break;
-    case MEDIA_CONTROLS_FULLSCREEN_BUTTON:
-        m_displayType = MediaFullscreenButton;
-        break;
-    case MEDIA_CONTROLS_TIMELINE:
-        m_displayType = MediaSlider;
-        break;
-    case MEDIA_CONTROLS_RETURN_TO_REALTIME_BUTTON:
-        m_displayType = MediaReturnToRealtimeButton;
-        break;
-    case MEDIA_CONTROLS_REWIND_BUTTON:
-        m_displayType = MediaRewindButton;
-        break;
-    default:
-        ASSERT_NOT_REACHED();
-        break;
-    }
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void MediaControlInputElement::attachToParent(Element* parent)
</span><span class="lines">@@ -373,14 +324,14 @@
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     m_displayType = displayType;
</span><del>-    if (RenderObject* object = renderer())
-        object-&gt;repaint();
</del><ins>+    if (RenderObject* o = renderer())
+        o-&gt;repaint();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> // ----------------------------
</span><span class="cx"> 
</span><span class="cx"> MediaControlMuteButtonElement::MediaControlMuteButtonElement(Document* doc, HTMLMediaElement* element)
</span><del>-    : MediaControlInputElement(doc, MEDIA_CONTROLS_MUTE_BUTTON, &quot;button&quot;, element)
</del><ins>+    : MediaControlInputElement(doc, MEDIA_CONTROLS_MUTE_BUTTON, &quot;button&quot;, element, element-&gt;muted() ? MediaUnMuteButton : MediaMuteButton)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -401,7 +352,7 @@
</span><span class="cx"> // ----------------------------
</span><span class="cx"> 
</span><span class="cx"> MediaControlPlayButtonElement::MediaControlPlayButtonElement(Document* doc, HTMLMediaElement* element)
</span><del>-    : MediaControlInputElement(doc, MEDIA_CONTROLS_PLAY_BUTTON, &quot;button&quot;, element)
</del><ins>+    : MediaControlInputElement(doc, MEDIA_CONTROLS_PLAY_BUTTON, &quot;button&quot;, element, element-&gt;canPlay() ? MediaPlayButton : MediaPauseButton)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -423,7 +374,7 @@
</span><span class="cx"> 
</span><span class="cx"> MediaControlSeekButtonElement::MediaControlSeekButtonElement(Document* doc, HTMLMediaElement* element, bool forward)
</span><span class="cx">     : MediaControlInputElement(doc, forward ? MEDIA_CONTROLS_SEEK_FORWARD_BUTTON : MEDIA_CONTROLS_SEEK_BACK_BUTTON,
</span><del>-                               &quot;button&quot;, element)
</del><ins>+                               &quot;button&quot;, element, forward ? MediaSeekForwardButton : MediaSeekBackButton)
</ins><span class="cx">     , m_forward(forward)
</span><span class="cx">     , m_seeking(false)
</span><span class="cx">     , m_capturing(false)
</span><span class="lines">@@ -482,7 +433,7 @@
</span><span class="cx"> // ----------------------------
</span><span class="cx"> 
</span><span class="cx"> MediaControlRewindButtonElement::MediaControlRewindButtonElement(Document* doc, HTMLMediaElement* element)
</span><del>-    : MediaControlInputElement(doc, MEDIA_CONTROLS_REWIND_BUTTON, &quot;button&quot;, element)
</del><ins>+: MediaControlInputElement(doc, MEDIA_CONTROLS_REWIND_BUTTON, &quot;button&quot;, element, MediaRewindButton)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -504,7 +455,7 @@
</span><span class="cx"> // ----------------------------
</span><span class="cx"> 
</span><span class="cx"> MediaControlReturnToRealtimeButtonElement::MediaControlReturnToRealtimeButtonElement(Document* doc, HTMLMediaElement* element)
</span><del>-: MediaControlInputElement(doc, MEDIA_CONTROLS_RETURN_TO_REALTIME_BUTTON, &quot;button&quot;, element)
</del><ins>+: MediaControlInputElement(doc, MEDIA_CONTROLS_RETURN_TO_REALTIME_BUTTON, &quot;button&quot;, element, MediaReturnToRealtimeButton)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -525,8 +476,8 @@
</span><span class="cx"> // ----------------------------
</span><span class="cx"> 
</span><span class="cx"> MediaControlTimelineElement::MediaControlTimelineElement(Document* document, HTMLMediaElement* element)
</span><del>-    : MediaControlInputElement(document, MEDIA_CONTROLS_TIMELINE, &quot;range&quot;, element)
-{
</del><ins>+    : MediaControlInputElement(document, MEDIA_CONTROLS_TIMELINE, &quot;range&quot;, element, MediaTimelineContainer)
+{ 
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void MediaControlTimelineElement::defaultEventHandler(Event* event)
</span><span class="lines">@@ -566,10 +517,11 @@
</span><span class="cx">     setValue(String::number(m_mediaElement-&gt;currentTime()));
</span><span class="cx">     MediaControlInputElement::update();
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> // ----------------------------
</span><span class="cx"> 
</span><span class="cx"> MediaControlFullscreenButtonElement::MediaControlFullscreenButtonElement(Document* doc, HTMLMediaElement* element)
</span><del>-    : MediaControlInputElement(doc, MEDIA_CONTROLS_FULLSCREEN_BUTTON, &quot;button&quot;, element)
</del><ins>+    : MediaControlInputElement(doc, MEDIA_CONTROLS_FULLSCREEN_BUTTON, &quot;button&quot;, element, MediaFullscreenButton)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -591,7 +543,6 @@
</span><span class="cx"> 
</span><span class="cx"> MediaControlTimeDisplayElement::MediaControlTimeDisplayElement(Document* doc, PseudoId pseudo, HTMLMediaElement* element)
</span><span class="cx">     : MediaControlElement(doc, pseudo, element)
</span><del>-    , m_currentValue(0)
</del><span class="cx">     , m_isVisible(true)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -621,32 +572,6 @@
</span><span class="cx">     renderer()-&gt;setStyle(style.get());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-String MediaControlTimeDisplayElement::formatTime(float time)
-{
-    if (!isfinite(time))
-        time = 0;
-    int seconds = (int)fabsf(time);
-    int hours = seconds / (60 * 60);
-    int minutes = (seconds / 60) % 60;
-    seconds %= 60;
-    if (hours) {
-        if (hours &gt; 9)
-            return String::format(&quot;%s%02d:%02d:%02d&quot;, (time &lt; 0 ? &quot;-&quot; : &quot;&quot;), hours, minutes, seconds);
</del><span class="cx"> 
</span><del>-        return String::format(&quot;%s%01d:%02d:%02d&quot;, (time &lt; 0 ? &quot;-&quot; : &quot;&quot;), hours, minutes, seconds);
-    }
-
-    return String::format(&quot;%s%02d:%02d&quot;, (time &lt; 0 ? &quot;-&quot; : &quot;&quot;), minutes, seconds);
-}
-
-void MediaControlTimeDisplayElement::setCurrentValue(float time)
-{
-    m_currentValue = time;
-
-    ExceptionCode ec;
-    setInnerText(formatTime(m_currentValue), ec);
-}
-
-
</del><span class="cx"> } //namespace WebCore
</span><span class="cx"> #endif // enable(video)
</span></span></pre></div>
<a id="trunkWebCorerenderingMediaControlElementsh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/MediaControlElements.h (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/MediaControlElements.h        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/WebCore/rendering/MediaControlElements.h        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -89,15 +89,9 @@
</span><span class="cx">     void update();
</span><span class="cx">     virtual void updateStyle();
</span><span class="cx"> 
</span><del>-    MediaControlElementType displayType() const { return m_displayType; }
-
-    HTMLMediaElement* mediaElement() const { return m_mediaElement; }
-    virtual bool isMediaControlElement() const { return true; }
-
</del><span class="cx"> protected:
</span><span class="cx">     HTMLMediaElement* m_mediaElement;   
</span><span class="cx">     PseudoId m_pseudoStyleId;
</span><del>-    MediaControlElementType m_displayType;  // some elements can show multiple types (e.g. play/pause)
</del><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> // ----------------------------
</span><span class="lines">@@ -124,7 +118,7 @@
</span><span class="cx"> 
</span><span class="cx"> class MediaControlInputElement : public HTMLInputElement {
</span><span class="cx"> public:
</span><del>-    MediaControlInputElement(Document*, PseudoId, const String&amp; type, HTMLMediaElement*);
</del><ins>+    MediaControlInputElement(Document*, PseudoId, const String&amp; type, HTMLMediaElement*, MediaControlElementType);
</ins><span class="cx">     virtual void attach();
</span><span class="cx">     virtual bool rendererIsNeeded(RenderStyle*);
</span><span class="cx"> 
</span><span class="lines">@@ -136,16 +130,13 @@
</span><span class="cx">     bool hitTest(const IntPoint&amp; absPoint);
</span><span class="cx">     MediaControlElementType displayType() const { return m_displayType; }
</span><span class="cx"> 
</span><del>-    HTMLMediaElement* mediaElement() const { return m_mediaElement; }
-    virtual bool isMediaControlElement() const { return true; }
-
</del><span class="cx"> protected:
</span><span class="cx">     virtual void updateDisplayType() { }
</span><span class="cx">     void setDisplayType(MediaControlElementType);
</span><span class="cx"> 
</span><span class="cx">     HTMLMediaElement* m_mediaElement;   
</span><span class="cx">     PseudoId m_pseudoStyleId;
</span><del>-    MediaControlElementType m_displayType;
</del><ins>+    MediaControlElementType m_displayType;  // some elements can show multiple types (e.g. play/pause)
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> // ----------------------------
</span><span class="lines">@@ -226,13 +217,7 @@
</span><span class="cx">     void setVisible(bool);
</span><span class="cx">     virtual PassRefPtr&lt;RenderStyle&gt; styleForElement();
</span><span class="cx"> 
</span><del>-    void setCurrentValue(float);
-    float currentValue() const { return m_currentValue; }
-
</del><span class="cx"> private:
</span><del>-    String formatTime(float time);
-
-    float m_currentValue;
</del><span class="cx">     bool m_isVisible;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderMediacpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderMedia.cpp (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderMedia.cpp        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/WebCore/rendering/RenderMedia.cpp        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -298,19 +298,19 @@
</span><span class="cx">         createPanel();
</span><span class="cx">         if (m_panel) {
</span><span class="cx">             createRewindButton();
</span><ins>+            createMuteButton();
</ins><span class="cx">             createPlayButton();
</span><span class="cx">             createReturnToRealtimeButton();
</span><span class="cx">             createStatusDisplay();
</span><span class="cx">             createTimelineContainer();
</span><ins>+            createSeekBackButton();
+            createSeekForwardButton();
</ins><span class="cx">             createFullscreenButton();
</span><span class="cx">             if (m_timelineContainer) {
</span><span class="cx">                 createCurrentTimeDisplay();
</span><span class="cx">                 createTimeline();
</span><span class="cx">                 createTimeRemainingDisplay();
</span><span class="cx">             }
</span><del>-            createSeekBackButton();
-            createSeekForwardButton();
-            createMuteButton();
</del><span class="cx">             m_panel-&gt;attach();
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="lines">@@ -366,6 +366,24 @@
</span><span class="cx">     updateTimeDisplay();
</span><span class="cx"> }
</span><span class="cx">     
</span><ins>+String RenderMedia::formatTime(float time)
+{
+    if (!isfinite(time))
+        time = 0;
+    int seconds = (int)fabsf(time); 
+    int hours = seconds / (60 * 60);
+    int minutes = (seconds / 60) % 60;
+    seconds %= 60;
+    if (hours) {
+        if (hours &gt; 9)
+            return String::format(&quot;%s%02d:%02d:%02d&quot;, (time &lt; 0 ? &quot;-&quot; : &quot;&quot;), hours, minutes, seconds);
+        else
+            return String::format(&quot;%s%01d:%02d:%02d&quot;, (time &lt; 0 ? &quot;-&quot; : &quot;&quot;), hours, minutes, seconds);
+    }
+    else
+        return String::format(&quot;%s%02d:%02d&quot;, (time &lt; 0 ? &quot;-&quot; : &quot;&quot;), minutes, seconds);
+}
+
</ins><span class="cx"> void RenderMedia::updateTimeDisplay()
</span><span class="cx"> {
</span><span class="cx">     if (!m_currentTimeDisplay || !m_currentTimeDisplay-&gt;renderer() || m_currentTimeDisplay-&gt;renderer()-&gt;style()-&gt;display() == NONE || style()-&gt;visibility() != VISIBLE)
</span><span class="lines">@@ -373,8 +391,12 @@
</span><span class="cx">     float now = mediaElement()-&gt;currentTime();
</span><span class="cx">     float duration = mediaElement()-&gt;duration();
</span><span class="cx"> 
</span><del>-    m_currentTimeDisplay-&gt;setCurrentValue(now);
-    m_timeRemainingDisplay-&gt;setCurrentValue(now - duration);
</del><ins>+    String timeString = formatTime(now);
+    ExceptionCode ec;
+    m_currentTimeDisplay-&gt;setInnerText(timeString, ec);
+    
+    timeString = formatTime(now - duration);
+    m_timeRemainingDisplay-&gt;setInnerText(timeString, ec);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RenderMedia::updateControlVisibility() 
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderMediah"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderMedia.h (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderMedia.h        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/WebCore/rendering/RenderMedia.h        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -60,6 +60,8 @@
</span><span class="cx">     HTMLMediaElement* mediaElement() const;
</span><span class="cx">     MediaPlayer* player() const;
</span><span class="cx"> 
</span><ins>+    static String formatTime(float time);
+
</ins><span class="cx">     bool shouldShowTimeDisplayControls() const;
</span><span class="cx"> 
</span><span class="cx">     void updateFromElement();
</span></span></pre></div>
<a id="trunkWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/ChangeLog (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/ChangeLog        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/WebKit/ChangeLog        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -1,14 +1,3 @@
</span><del>-2009-08-12  Eric Carlson  &lt;eric.carlson@apple.com&gt;
-
-        Reviewed by Oliver Hunt.
-
-        &lt;video&gt; and &lt;audio&gt; controller should be accessible
-        https://bugs.webkit.org/show_bug.cgi?id=28081
-
-        Add localized strings for media controller accessiblility.
-
-        * English.lproj/Localizable.strings:
-
</del><span class="cx"> 2009-08-06  Mark Rowe  &lt;mrowe@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Rubber-stamped by Sam Weinig.
</span></span></pre></div>
<a id="trunkWebKitEnglishlprojLocalizablestrings"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/English.lproj/Localizable.strings (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/English.lproj/Localizable.strings        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/WebKit/English.lproj/Localizable.strings        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -226,9 +226,6 @@
</span><span class="cx"> /* Undo action name */
</span><span class="cx"> &quot;Paste Ruler (Undo action name)&quot; = &quot;Paste Ruler&quot;;
</span><span class="cx"> 
</span><del>-/* accessibility help text for enter fullscreen button */
-&quot;Play movie in fullscreen mode&quot; = &quot;Play movie in fullscreen mode&quot;;
-
</del><span class="cx"> /* WebKitErrorPlugInCancelledConnection description */
</span><span class="cx"> &quot;Plug-in cancelled&quot; = &quot;Plug-in cancelled&quot;;
</span><span class="cx"> 
</span><span class="lines">@@ -445,24 +442,12 @@
</span><span class="cx"> /* Verb stating the action that will occur when a text field is selected, as used by accessibility */
</span><span class="cx"> &quot;activate&quot; = &quot;activate&quot;;
</span><span class="cx"> 
</span><del>-/* accessibility role description for audio element controller */
-&quot;audio element controller&quot; = &quot;audio element controller&quot;;
-
-/* accessibility role description for audio element controller */
-&quot;audio element playback controls and status display&quot; = &quot;audio element playback controls and status display&quot;;
-
-/* accessibility role description for seek back 30 seconds button */
-&quot;back 30 seconds&quot; = &quot;back 30 seconds&quot;;
-
</del><span class="cx"> /* HTTP result code string */
</span><span class="cx"> &quot;bad gateway&quot; = &quot;bad gateway&quot;;
</span><span class="cx"> 
</span><span class="cx"> /* HTTP result code string */
</span><span class="cx"> &quot;bad request&quot; = &quot;bad request&quot;;
</span><span class="cx"> 
</span><del>-/* accessibility help text for play button */
-&quot;begin playback&quot; = &quot;begin playback&quot;;
-
</del><span class="cx"> /* Verb stating the action that will occur when an unchecked checkbox is clicked, as used by accessibility */
</span><span class="cx"> &quot;check&quot; = &quot;check&quot;;
</span><span class="cx"> 
</span><span class="lines">@@ -478,48 +463,18 @@
</span><span class="cx"> /* HTTP result code string */
</span><span class="cx"> &quot;created&quot; = &quot;created&quot;;
</span><span class="cx"> 
</span><del>-/* accessibility help text for movie status display */
-&quot;current movie status&quot; = &quot;current movie status&quot;;
-
-/* accessibility help text for elapsed time display */
-&quot;current movie time in seconds&quot; = &quot;current movie time in seconds&quot;;
-
-/* string for days, hours, minutes &amp; seconds */
-&quot;date.format.for.days&quot; = &quot;date.format.for.days&quot;;
-
-/* string for hours, minutes &amp; seconds */
-&quot;date.format.for.hours&quot; = &quot;date.format.for.hours&quot;;
-
-/* string for minutes &amp; seconds */
-&quot;date.format.for.minutes&quot; = &quot;date.format.for.minutes&quot;;
-
-/* string for seconds */
-&quot;date.format.for.seconds&quot; = &quot;date.format.for.seconds&quot;;
-
</del><span class="cx"> /* definition phrase */
</span><span class="cx"> &quot;definition&quot; = &quot;definition&quot;;
</span><span class="cx"> 
</span><del>-/* accessibility role description for elapsed time display */
-&quot;elapsed time&quot; = &quot;elapsed time&quot;;
-
</del><span class="cx"> /* HTTP result code string */
</span><span class="cx"> &quot;expectation failed&quot; = &quot;expectation failed&quot;;
</span><span class="cx"> 
</span><del>-/* accessibility role description for fast forward button */
-&quot;fast forward&quot; = &quot;fast forward&quot;;
-
-/* accessibility role description for fast reverse button */
-&quot;fast reverse&quot; = &quot;fast reverse&quot;;
-
</del><span class="cx"> /* HTTP result code string */
</span><span class="cx"> &quot;forbidden&quot; = &quot;forbidden&quot;;
</span><span class="cx"> 
</span><span class="cx"> /* HTTP result code string */
</span><span class="cx"> &quot;found&quot; = &quot;found&quot;;
</span><span class="cx"> 
</span><del>-/* accessibility role description for enter fullscreen button */
-&quot;fullscreen&quot; = &quot;fullscreen&quot;;
-
</del><span class="cx"> /* HTTP result code string */
</span><span class="cx"> &quot;gateway timed out&quot; = &quot;gateway timed out&quot;;
</span><span class="cx"> 
</span><span class="lines">@@ -529,9 +484,6 @@
</span><span class="cx"> /* accessibility role description for image map */
</span><span class="cx"> &quot;image map&quot; = &quot;image map&quot;;
</span><span class="cx"> 
</span><del>-/* string for an indefinite movie time */
-&quot;indefinite time&quot; = &quot;indefinite time&quot;;
-
</del><span class="cx"> /* HTTP result code string */
</span><span class="cx"> &quot;informational&quot; = &quot;informational&quot;;
</span><span class="cx"> 
</span><span class="lines">@@ -556,24 +508,9 @@
</span><span class="cx"> /* HTTP result code string */
</span><span class="cx"> &quot;moved permanently&quot; = &quot;moved permanently&quot;;
</span><span class="cx"> 
</span><del>-/* accessibility role description for timeline slider */
-&quot;movie time&quot; = &quot;movie time&quot;;
-
-/* accessibility help text for timeline slider */
-&quot;movie time scrubber&quot; = &quot;movie time scrubber&quot;;
-
-/* accessibility help text for timeline slider thumb */
-&quot;movie time scrubber thumb&quot; = &quot;movie time scrubber thumb&quot;;
-
</del><span class="cx"> /* HTTP result code string */
</span><span class="cx"> &quot;multiple choices&quot; = &quot;multiple choices&quot;;
</span><span class="cx"> 
</span><del>-/* accessibility role description for mute button */
-&quot;mute&quot; = &quot;mute&quot;;
-
-/* accessibility help text for mute button */
-&quot;mute audio tracks&quot; = &quot;mute audio tracks&quot;;
-
</del><span class="cx"> /* HTTP result code string */
</span><span class="cx"> &quot;needs proxy&quot; = &quot;needs proxy&quot;;
</span><span class="cx"> 
</span><span class="lines">@@ -598,24 +535,12 @@
</span><span class="cx"> /* HTTP result code string */
</span><span class="cx"> &quot;not modified&quot; = &quot;not modified&quot;;
</span><span class="cx"> 
</span><del>-/* accessibility help text for remaining time display */
-&quot;number of seconds of movie remaining&quot; = &quot;number of seconds of movie remaining&quot;;
-
</del><span class="cx"> /* HTTP result code string */
</span><span class="cx"> &quot;partial content&quot; = &quot;partial content&quot;;
</span><span class="cx"> 
</span><del>-/* accessibility role description for pause button */
-&quot;pause&quot; = &quot;pause&quot;;
-
-/* accessibility help text for pause button */
-&quot;pause playback&quot; = &quot;pause playback&quot;;
-
</del><span class="cx"> /* HTTP result code string */
</span><span class="cx"> &quot;payment required&quot; = &quot;payment required&quot;;
</span><span class="cx"> 
</span><del>-/* accessibility role description for play button */
-&quot;play&quot; = &quot;play&quot;;
-
</del><span class="cx"> /* HTTP result code string */
</span><span class="cx"> &quot;precondition failed&quot; = &quot;precondition failed&quot;;
</span><span class="cx"> 
</span><span class="lines">@@ -628,9 +553,6 @@
</span><span class="cx"> /* HTTP result code string */
</span><span class="cx"> &quot;redirected&quot; = &quot;redirected&quot;;
</span><span class="cx"> 
</span><del>-/* accessibility role description for time remaining display */
-&quot;remaining time&quot; = &quot;remaining time&quot;;
-
</del><span class="cx"> /* HTTP result code string */
</span><span class="cx"> &quot;request timed out&quot; = &quot;request timed out&quot;;
</span><span class="cx"> 
</span><span class="lines">@@ -646,24 +568,9 @@
</span><span class="cx"> /* HTTP result code string */
</span><span class="cx"> &quot;reset content&quot; = &quot;reset content&quot;;
</span><span class="cx"> 
</span><del>-/* accessibility help text for return streaming movie to real time button */
-&quot;return streaming movie to real time&quot; = &quot;return streaming movie to real time&quot;;
-
-/* accessibility role description for return to real time button */
-&quot;return to realtime&quot; = &quot;return to realtime&quot;;
-
</del><span class="cx"> /* HTTP result code string */
</span><span class="cx"> &quot;see other&quot; = &quot;see other&quot;;
</span><span class="cx"> 
</span><del>-/* accessibility help text for jump back 30 seconds button */
-&quot;seek movie back 30 seconds&quot; = &quot;seek movie back 30 seconds&quot;;
-
-/* accessibility help text for fast rewind button */
-&quot;seek quickly back&quot; = &quot;seek quickly back&quot;;
-
-/* accessibility help text for fast forward button */
-&quot;seek quickly forward&quot; = &quot;seek quickly forward&quot;;
-
</del><span class="cx"> /* Verb stating the action that will occur when a radio button is clicked, as used by accessibility */
</span><span class="cx"> &quot;select&quot; = &quot;select&quot;;
</span><span class="cx"> 
</span><span class="lines">@@ -673,9 +580,6 @@
</span><span class="cx"> /* HTTP result code string */
</span><span class="cx"> &quot;service unavailable&quot; = &quot;service unavailable&quot;;
</span><span class="cx"> 
</span><del>-/* accessibility role description for movie status */
-&quot;status&quot; = &quot;status&quot;;
-
</del><span class="cx"> /* HTTP result code string */
</span><span class="cx"> &quot;success&quot; = &quot;success&quot;;
</span><span class="cx"> 
</span><span class="lines">@@ -688,9 +592,6 @@
</span><span class="cx"> /* term word of a definition */
</span><span class="cx"> &quot;term&quot; = &quot;term&quot;;
</span><span class="cx"> 
</span><del>-/* accessibility role description for timeline thumb */
-&quot;timeline slider thumb&quot; = &quot;timeline slider thumb&quot;;
-
</del><span class="cx"> /* HTTP result code string */
</span><span class="cx"> &quot;unacceptable&quot; = &quot;unacceptable&quot;;
</span><span class="cx"> 
</span><span class="lines">@@ -706,24 +607,12 @@
</span><span class="cx"> /* Unknown filename */
</span><span class="cx"> &quot;unknown&quot; = &quot;unknown&quot;;
</span><span class="cx"> 
</span><del>-/* accessibility role description for turn mute off button */
-&quot;unmute&quot; = &quot;unmute&quot;;
-
-/* accessibility help text for un mute button */
-&quot;unmute audio tracks&quot; = &quot;unmute audio tracks&quot;;
-
</del><span class="cx"> /* HTTP result code string */
</span><span class="cx"> &quot;unsupported media type&quot; = &quot;unsupported media type&quot;;
</span><span class="cx"> 
</span><span class="cx"> /* HTTP result code string */
</span><span class="cx"> &quot;unsupported version&quot; = &quot;unsupported version&quot;;
</span><span class="cx"> 
</span><del>-/* accessibility role description for video element controller */
-&quot;video element controller&quot; = &quot;video element controller&quot;;
-
-/* accessibility role description for video element controller */
-&quot;video element playback controls and status display&quot; = &quot;video element playback controls and status display&quot;;
-
</del><span class="cx"> /* accessibility role description for web area */
</span><span class="cx"> &quot;web area&quot; = &quot;web area&quot;;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/ChangeLog (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/ChangeLog        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/WebKit/mac/ChangeLog        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -12,19 +12,6 @@
</span><span class="cx">         (WebChromeClient::formDidBlur):
</span><span class="cx">         * WebView/WebUIDelegatePrivate.h:
</span><span class="cx"> 
</span><del>-2009-08-12  Eric Carlson  &lt;eric.carlson@apple.com&gt;
-
-        Reviewed by Oliver Hunt.
-
-        &lt;video&gt; and &lt;audio&gt; controller should be accessible
-        https://bugs.webkit.org/show_bug.cgi?id=28081
-
-        * WebCoreSupport/WebViewFactory.mm:
-        (-[WebViewFactory localizedMediaControlElementString:]):
-        (-[WebViewFactory localizedMediaControlElementHelpText:]):
-        (-[WebViewFactory localizedMediaTimeDescription:]):
-            New.
-
</del><span class="cx"> 2009-08-11  John Gregg  &lt;johnnyg@google.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Maciej Stachowiak.
</span></span></pre></div>
<a id="trunkWebKitmacWebCoreSupportWebViewFactorymm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/WebCoreSupport/WebViewFactory.mm (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/WebCoreSupport/WebViewFactory.mm        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/WebKit/mac/WebCoreSupport/WebViewFactory.mm        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2005, 2009 Apple Computer, Inc.  All rights reserved.
</del><ins>+ * Copyright (C) 2005 Apple Computer, Inc.  All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -608,103 +608,4 @@
</span><span class="cx">     return UI_STRING(&quot;Live Broadcast&quot;, &quot;Media controller status message when watching a live broadcast&quot;);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (NSString*)localizedMediaControlElementString:(NSString*)name
-{
-    if ([name isEqualToString:@&quot;AudioElement&quot;])
-        return UI_STRING(&quot;audio element controller&quot;, &quot;accessibility role description for audio element controller&quot;);
-    if ([name isEqualToString:@&quot;VideoElement&quot;])
-        return UI_STRING(&quot;video element controller&quot;, &quot;accessibility role description for video element controller&quot;);
-
-    if ([name isEqualToString:@&quot;MuteButton&quot;])
-        return UI_STRING(&quot;mute&quot;, &quot;accessibility role description for mute button&quot;);
-    if ([name isEqualToString:@&quot;UnMuteButton&quot;])
-        return UI_STRING(&quot;unmute&quot;, &quot;accessibility role description for turn mute off button&quot;);
-    if ([name isEqualToString:@&quot;PlayButton&quot;])
-        return UI_STRING(&quot;play&quot;, &quot;accessibility role description for play button&quot;);
-    if ([name isEqualToString:@&quot;PauseButton&quot;])
-        return UI_STRING(&quot;pause&quot;, &quot;accessibility role description for pause button&quot;);
-    if ([name isEqualToString:@&quot;Slider&quot;])
-        return UI_STRING(&quot;movie time&quot;, &quot;accessibility role description for timeline slider&quot;);
-    if ([name isEqualToString:@&quot;SliderThumb&quot;])
-        return UI_STRING(&quot;timeline slider thumb&quot;, &quot;accessibility role description for timeline thumb&quot;);
-    if ([name isEqualToString:@&quot;RewindButton&quot;])
-        return UI_STRING(&quot;back 30 seconds&quot;, &quot;accessibility role description for seek back 30 seconds button&quot;);
-    if ([name isEqualToString:@&quot;ReturnToRealtimeButton&quot;])
-        return UI_STRING(&quot;return to realtime&quot;, &quot;accessibility role description for return to real time button&quot;);
-    if ([name isEqualToString:@&quot;CurrentTimeDisplay&quot;])
-        return UI_STRING(&quot;elapsed time&quot;, &quot;accessibility role description for elapsed time display&quot;);
-    if ([name isEqualToString:@&quot;TimeRemainingDisplay&quot;])
-        return UI_STRING(&quot;remaining time&quot;, &quot;accessibility role description for time remaining display&quot;);
-    if ([name isEqualToString:@&quot;StatusDisplay&quot;])
-        return UI_STRING(&quot;status&quot;, &quot;accessibility role description for movie status&quot;);
-    if ([name isEqualToString:@&quot;FullscreenButton&quot;])
-        return UI_STRING(&quot;fullscreen&quot;, &quot;accessibility role description for enter fullscreen button&quot;);
-    if ([name isEqualToString:@&quot;SeekForwardButton&quot;])
-        return UI_STRING(&quot;fast forward&quot;, &quot;accessibility role description for fast forward button&quot;);
-    if ([name isEqualToString:@&quot;SeekBackButton&quot;])
-        return UI_STRING(&quot;fast reverse&quot;, &quot;accessibility role description for fast reverse button&quot;);
-    ASSERT_NOT_REACHED();
-    return @&quot;&quot;;
-}
-
-- (NSString*)localizedMediaControlElementHelpText:(NSString*)name
-{
-    if ([name isEqualToString:@&quot;AudioElement&quot;])
-        return UI_STRING(&quot;audio element playback controls and status display&quot;, &quot;accessibility role description for audio element controller&quot;);
-    if ([name isEqualToString:@&quot;VideoElement&quot;])
-        return UI_STRING(&quot;video element playback controls and status display&quot;, &quot;accessibility role description for video element controller&quot;);
-
-    if ([name isEqualToString:@&quot;MuteButton&quot;])
-        return UI_STRING(&quot;mute audio tracks&quot;, &quot;accessibility help text for mute button&quot;);
-    if ([name isEqualToString:@&quot;UnMuteButton&quot;])
-        return UI_STRING(&quot;unmute audio tracks&quot;, &quot;accessibility help text for un mute button&quot;);
-    if ([name isEqualToString:@&quot;PlayButton&quot;])
-        return UI_STRING(&quot;begin playback&quot;, &quot;accessibility help text for play button&quot;);
-    if ([name isEqualToString:@&quot;PauseButton&quot;])
-        return UI_STRING(&quot;pause playback&quot;, &quot;accessibility help text for pause button&quot;);
-    if ([name isEqualToString:@&quot;Slider&quot;])
-        return UI_STRING(&quot;movie time scrubber&quot;, &quot;accessibility help text for timeline slider&quot;);
-    if ([name isEqualToString:@&quot;SliderThumb&quot;])
-        return UI_STRING(&quot;movie time scrubber thumb&quot;, &quot;accessibility help text for timeline slider thumb&quot;);
-    if ([name isEqualToString:@&quot;RewindButton&quot;])
-        return UI_STRING(&quot;seek movie back 30 seconds&quot;, &quot;accessibility help text for jump back 30 seconds button&quot;);
-    if ([name isEqualToString:@&quot;ReturnToRealtimeButton&quot;])
-        return UI_STRING(&quot;return streaming movie to real time&quot;, &quot;accessibility help text for return streaming movie to real time button&quot;);
-    if ([name isEqualToString:@&quot;CurrentTimeDisplay&quot;])
-        return UI_STRING(&quot;current movie time in seconds&quot;, &quot;accessibility help text for elapsed time display&quot;);
-    if ([name isEqualToString:@&quot;TimeRemainingDisplay&quot;])
-        return UI_STRING(&quot;number of seconds of movie remaining&quot;, &quot;accessibility help text for remaining time display&quot;);
-    if ([name isEqualToString:@&quot;StatusDisplay&quot;])
-        return UI_STRING(&quot;current movie status&quot;, &quot;accessibility help text for movie status display&quot;);
-    if ([name isEqualToString:@&quot;SeekBackButton&quot;])
-        return UI_STRING(&quot;seek quickly back&quot;, &quot;accessibility help text for fast rewind button&quot;);
-    if ([name isEqualToString:@&quot;SeekForwardButton&quot;])
-        return UI_STRING(&quot;seek quickly forward&quot;, &quot;accessibility help text for fast forward button&quot;);
-    if ([name isEqualToString:@&quot;FullscreenButton&quot;])
-        return UI_STRING(&quot;Play movie in fullscreen mode&quot;, &quot;accessibility help text for enter fullscreen button&quot;);
-    ASSERT_NOT_REACHED();
-    return @&quot;&quot;;
-}
-
-- (NSString*)localizedMediaTimeDescription:(float)time
-{
-    if (!isfinite(time))
-        return UI_STRING(&quot;indefinite time&quot;, &quot;string for an indefinite movie time&quot;);
-
-    int seconds = (int)fabsf(time); 
-    int days = seconds / (60 * 60 * 24);
-    int hours = seconds / (60 * 60);
-    int minutes = (seconds / 60) % 60;
-    seconds %= 60;
-
-    if (days)
-        return [NSString stringWithFormat:UI_STRING(&quot;date.format.for.days&quot;, &quot;string for days, hours, minutes &amp; seconds&quot;), days, hours, minutes, seconds];
-    else if (hours)
-        return [NSString stringWithFormat:UI_STRING(&quot;date.format.for.hours&quot;, &quot;string for hours, minutes &amp; seconds&quot;), hours, minutes, seconds];
-    else if (minutes)
-        return [NSString stringWithFormat:UI_STRING(&quot;date.format.for.minutes&quot;, &quot;string for minutes &amp; seconds&quot;), minutes, seconds];
-
-    return [NSString stringWithFormat:UI_STRING(&quot;date.format.for.seconds&quot;, &quot;string for seconds&quot;), seconds];
-}
-
</del><span class="cx"> @end
</span></span></pre></div>
<a id="trunkWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/ChangeLog (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/ChangeLog        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/WebKit/win/ChangeLog        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -26,26 +26,6 @@
</span><span class="cx">         * WebView.h:
</span><span class="cx">         Removed window-resizer-related code.
</span><span class="cx"> 
</span><del>-2009-08-12  Eric Carlson  &lt;eric.carlson@apple.com&gt;
-
-        Windows build fix.
-
-        * WebCoreLocalizedStrings.cpp:
-        (WebCore::localizedMediaTimeDescription):
-
-2009-08-12  Eric Carlson  &lt;eric.carlson@apple.com&gt;
-
-        Reviewed by Oliver Hunt.
-
-        &lt;video&gt; and &lt;audio&gt; controller should be accessible
-        https://bugs.webkit.org/show_bug.cgi?id=28081
-
-        * WebCoreLocalizedStrings.cpp:
-        (WebCore::localizedMediaControlElementString):
-        (WebCore::localizedMediaControlElementHelpText):
-        (WebCore::localizedMediaTimeDescription):
-            New.
-
</del><span class="cx"> 2009-08-11  John Gregg  &lt;johnnyg@google.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Maciej Stachowiak.
</span></span></pre></div>
<a id="trunkWebKitwinWebCoreLocalizedStringscpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/WebCoreLocalizedStrings.cpp (47139 => 47140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/WebCoreLocalizedStrings.cpp        2009-08-12 19:45:09 UTC (rev 47139)
+++ trunk/WebKit/win/WebCoreLocalizedStrings.cpp        2009-08-12 19:51:14 UTC (rev 47140)
</span><span class="lines">@@ -114,114 +114,3 @@
</span><span class="cx"> 
</span><span class="cx">     return result.get();
</span><span class="cx"> }
</span><del>-
-String WebCore::localizedMediaControlElementString(const String&amp; name)
-{
-    if (name == &quot;AudioElement&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;audio element controller&quot;, &quot;accessibility role description for audio element controller&quot;));
-    if (name == &quot;VideoElement&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;video element controller&quot;, &quot;accessibility role description for video element controller&quot;));
-    if (name == &quot;MuteButton&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;mute&quot;, &quot;accessibility role description for mute button&quot;));
-    if (name == &quot;UnMuteButton&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;unmute&quot;, &quot;accessibility role description for turn mute off button&quot;));
-    if (name == &quot;PlayButton&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;play&quot;, &quot;accessibility role description for play button&quot;));
-    if (name == &quot;PauseButton&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;pause&quot;, &quot;accessibility role description for pause button&quot;));
-    if (name == &quot;Slider&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;movie time&quot;, &quot;accessibility role description for timeline slider&quot;));
-    if (name == &quot;SliderThumb&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;timeline slider thumb&quot;, &quot;accessibility role description for timeline thumb&quot;));
-    if (name == &quot;RewindButton&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;back 30 seconds&quot;, &quot;accessibility role description for seek back 30 seconds button&quot;));
-    if (name == &quot;ReturnToRealtimeButton&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;return to realtime&quot;, &quot;accessibility role description for return to real time button&quot;));
-    if (name == &quot;CurrentTimeDisplay&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;elapsed time&quot;, &quot;accessibility role description for elapsed time display&quot;));
-    if (name == &quot;TimeRemainingDisplay&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;remaining time&quot;, &quot;accessibility role description for time remaining display&quot;));
-    if (name == &quot;StatusDisplay&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;status&quot;, &quot;accessibility role description for movie status&quot;));
-    if (name == &quot;FullscreenButton&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;fullscreen&quot;, &quot;accessibility role description for enter fullscreen button&quot;));
-    if (name == &quot;SeekForwardButton&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;fast forward&quot;, &quot;accessibility role description for fast forward button&quot;));
-    if (name == &quot;SeekBackButton&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;fast reverse&quot;, &quot;accessibility role description for fast reverse button&quot;));
-
-    ASSERT_NOT_REACHED();
-    return String();
-}
-
-String WebCore::localizedMediaControlElementHelpText(const String&amp; name)
-{
-    if (name == &quot;AudioElement&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;audio element playback controls and status display&quot;, &quot;accessibility role description for audio element controller&quot;));
-    if (name == &quot;VideoElement&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;video element playback controls and status display&quot;, &quot;accessibility role description for video element controller&quot;));
-    if (name == &quot;MuteButton&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;mute audio tracks&quot;, &quot;accessibility help text for mute button&quot;));
-    if (name == &quot;UnMuteButton&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;unmute audio tracks&quot;, &quot;accessibility help text for un mute button&quot;));
-    if (name == &quot;PlayButton&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;begin playback&quot;, &quot;accessibility help text for play button&quot;));
-    if (name == &quot;PauseButton&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;pause playback&quot;, &quot;accessibility help text for pause button&quot;));
-    if (name == &quot;Slider&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;movie time scrubber&quot;, &quot;accessibility help text for timeline slider&quot;));
-    if (name == &quot;SliderThumb&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;movie time scrubber thumb&quot;, &quot;accessibility help text for timeline slider thumb&quot;));
-    if (name == &quot;RewindButton&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;seek movie back 30 seconds&quot;, &quot;accessibility help text for jump back 30 seconds button&quot;));
-    if (name == &quot;ReturnToRealtimeButton&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;return streaming movie to real time&quot;, &quot;accessibility help text for return streaming movie to real time button&quot;));
-    if (name == &quot;CurrentTimeDisplay&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;current movie time in seconds&quot;, &quot;accessibility help text for elapsed time display&quot;));
-    if (name == &quot;TimeRemainingDisplay&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;number of seconds of movie remaining&quot;, &quot;accessibility help text for remaining time display&quot;));
-    if (name == &quot;StatusDisplay&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;current movie status&quot;, &quot;accessibility help text for movie status display&quot;));
-    if (name == &quot;SeekBackButton&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;seek quickly back&quot;, &quot;accessibility help text for fast rewind button&quot;));
-    if (name == &quot;SeekForwardButton&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;seek quickly forward&quot;, &quot;accessibility help text for fast forward button&quot;));
-    if (name == &quot;FullscreenButton&quot;)
-        return String(LPCTSTR_UI_STRING(&quot;Play movie in fullscreen mode&quot;, &quot;accessibility help text for enter fullscreen button&quot;));
-
-    ASSERT_NOT_REACHED();
-    return String();
-}
-
-String WebCore::localizedMediaTimeDescription(float time)
-{
-    if (!isfinite(time))
-        return String(LPCTSTR_UI_STRING(&quot;indefinite time&quot;, &quot;string for an indefinite movie time&quot;));
-
-    int seconds = (int)fabsf(time); 
-    int days = seconds / (60 * 60 * 24);
-    int hours = seconds / (60 * 60);
-    int minutes = (seconds / 60) % 60;
-    seconds %= 60;
-
-    if (days) {
-        static RetainPtr&lt;CFStringRef&gt; format(AdoptCF, UI_STRING(&quot;date.format.for.days&quot;, &quot;string for days, hours, minutes &amp; seconds&quot;));
-        RetainPtr&lt;CFStringRef&gt; result(AdoptCF, CFStringCreateWithFormat(0, 0, format.get(), days, hours, minutes, seconds));
-        return result.get();
-    }
-    else if (hours) {
-        static RetainPtr&lt;CFStringRef&gt; format(AdoptCF, UI_STRING(&quot;date.format.for.hours&quot;, &quot;string for hours, minutes &amp; seconds&quot;));
-        RetainPtr&lt;CFStringRef&gt; result(AdoptCF, CFStringCreateWithFormat(0, 0, format.get(), hours, minutes, seconds));
-        return result.get();
-    }
-    else if (minutes) {
-        static RetainPtr&lt;CFStringRef&gt; format(AdoptCF, UI_STRING(&quot;date.format.for.minutes&quot;, &quot;string for minutes &amp; seconds&quot;));
-        RetainPtr&lt;CFStringRef&gt; result(AdoptCF, CFStringCreateWithFormat(0, 0, format.get(), minutes, seconds));
-        return result.get();
-    }
-
-    static RetainPtr&lt;CFStringRef&gt; format(AdoptCF, UI_STRING(&quot;date.format.for.seconds&quot;, &quot;string for seconds&quot;));
-    RetainPtr&lt;CFStringRef&gt; result(AdoptCF, CFStringCreateWithFormat(0, 0, format.get(), seconds));
-    return result.get();
-}
-
</del></span></pre>
</div>
</div>

</body>
</html>