[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[simon.fraser at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 4a56c92361c5c2d5b178a3a788459701f0b513e4
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 6 20:47:58 2009 +0000

    2009-10-06  Simon Fraser  <simon.fraser at apple.com>
    
            Reviewed by Mark Rowe.
    
            accessibility/media-element.html crashes (and has incorrect result)
            https://bugs.webkit.org/show_bug.cgi?id=30108
    
            Fix up the accessibilty label for the newly added fullscreen button,
            and update the test result accordingly.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49206 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f9565f4..8dce8a1 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-06  Simon Fraser  <simon.fraser at apple.com>
+
+        Reviewed by Mark Rowe.
+        
+        accessibility/media-element.html crashes (and has incorrect result)
+        https://bugs.webkit.org/show_bug.cgi?id=30108
+
+        Fix up the accessibilty label for the newly added fullscreen button,
+        and update the test result accordingly.
+
+        * platform/mac/accessibility/media-element-expected.txt:
+
 2009-10-06  Daniel Bates  <dbates at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/LayoutTests/platform/mac/accessibility/media-element-expected.txt b/LayoutTests/platform/mac/accessibility/media-element-expected.txt
index 7eacfba..f85f769 100644
--- a/LayoutTests/platform/mac/accessibility/media-element-expected.txt
+++ b/LayoutTests/platform/mac/accessibility/media-element-expected.txt
@@ -32,6 +32,10 @@ State at 'load' event:
         role: AXRole: AXStaticText
 
 
+        description: AXDescription: fullscreen
+        role: AXRole: AXButton
+
+
         description: AXDescription: mute
         role: AXRole: AXButton
 
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fd7daa7..46841c5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-10-06  Simon Fraser  <simon.fraser at apple.com>
+
+        Reviewed by Mark Rowe.
+
+        accessibility/media-element.html crashes (and has incorrect result)
+        https://bugs.webkit.org/show_bug.cgi?id=30108
+
+        Fix up the accessibilty label for the newly added fullscreen button,
+        and update the test result accordingly.
+
+        * accessibility/AccessibilityMediaControls.cpp:
+        (WebCore::AccessibilityMediaControl::controlTypeName):
+
 2009-10-06  Kelly Norton  <knorton at google.com>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebCore/accessibility/AccessibilityMediaControls.cpp b/WebCore/accessibility/AccessibilityMediaControls.cpp
index a807ab9..7200de9 100644
--- a/WebCore/accessibility/AccessibilityMediaControls.cpp
+++ b/WebCore/accessibility/AccessibilityMediaControls.cpp
@@ -101,6 +101,7 @@ MediaControlElementType AccessibilityMediaControl::controlType() const
 
 String AccessibilityMediaControl::controlTypeName() const
 {
+    DEFINE_STATIC_LOCAL(const String, mediaFullscreenButtonName, ("FullscreenButton"));
     DEFINE_STATIC_LOCAL(const String, mediaMuteButtonName, ("MuteButton"));
     DEFINE_STATIC_LOCAL(const String, mediaPlayButtonName, ("PlayButton"));
     DEFINE_STATIC_LOCAL(const String, mediaSeekBackButtonName, ("SeekBackButton"));
@@ -114,6 +115,8 @@ String AccessibilityMediaControl::controlTypeName() const
     DEFINE_STATIC_LOCAL(const String, mediaTimeRemainingDisplay, ("TimeRemainingDisplay"));
 
     switch (controlType()) {
+    case MediaFullscreenButton:
+        return mediaFullscreenButtonName;
     case MediaMuteButton:
         return mediaMuteButtonName;
     case MediaPlayButton:
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 66b3213..9293336 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-06  Simon Fraser  <simon.fraser at apple.com>
+
+        Reviewed by Mark Rowe.
+
+        accessibility/media-element.html crashes (and has incorrect result)
+        https://bugs.webkit.org/show_bug.cgi?id=30108
+
+        Fix up the accessibilty label for the newly added fullscreen button,
+        and update the test result accordingly.
+
+        * English.lproj/Localizable.strings:
+
 2009-10-05  Kevin Decker  <kdecker at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebKit/English.lproj/Localizable.strings b/WebKit/English.lproj/Localizable.strings
index 74fc327..e4a172b 100644
Binary files a/WebKit/English.lproj/Localizable.strings and b/WebKit/English.lproj/Localizable.strings differ
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 59d232a..c7364b5 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,18 @@
+2009-10-06  Simon Fraser  <simon.fraser at apple.com>
+
+        Reviewed by Mark Rowe.
+
+        accessibility/media-element.html crashes (and has incorrect result)
+        https://bugs.webkit.org/show_bug.cgi?id=30108
+
+        Fix up the accessibilty label for the newly added fullscreen button,
+        and update the test result accordingly.
+
+        * WebCoreSupport/WebViewFactory.mm:
+        (-[WebViewFactory localizedMediaControlElementString:]):
+        Handle "ControlsPanel" which is just an empty container, to avoid
+        asserting in debug builds.
+
 2009-10-06  Daniel Bates  <dbates at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKit/mac/WebCoreSupport/WebViewFactory.mm b/WebKit/mac/WebCoreSupport/WebViewFactory.mm
index 04816d3..79b2959 100644
--- a/WebKit/mac/WebCoreSupport/WebViewFactory.mm
+++ b/WebKit/mac/WebCoreSupport/WebViewFactory.mm
@@ -652,6 +652,10 @@
     if ([name isEqualToString:@"VideoElement"])
         return UI_STRING("video element controller", "accessibility role description for video element controller");
 
+    // FIXME: the ControlsPanel container should never be visible in the accessibility hierarchy.
+    if ([name isEqualToString:@"ControlsPanel"])
+        return @"";
+
     if ([name isEqualToString:@"MuteButton"])
         return UI_STRING("mute", "accessibility role description for mute button");
     if ([name isEqualToString:@"UnMuteButton"])

-- 
WebKit Debian packaging