[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 5942664541a674fddf133b685081c2b5350e3908
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 12 03:56:40 2010 +0000

    2010-08-11  Victoria Kirst  <vrk at google.com>
    
            Reviewed by David Levin.
    
            Fixing a regression in the UI for Mac default audio/video controls.
            https://bugs.webkit.org/show_bug.cgi?id=43750
    
            * rendering/RenderThemeChromiumMac.h:
            * rendering/RenderThemeChromiumMac.mm:
            (WebCore::RenderThemeChromiumMac::paintMediaVolumeSliderContainer):
            (WebCore::RenderThemeChromiumMac::paintMediaSliderThumb):
            (WebCore::RenderThemeChromiumMac::volumeSliderOffsetFromMuteButton):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65215 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index c47aaad..f3d1df8 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -864,6 +864,18 @@ BUG31342 WIN RELEASE : security/block-test-no-port.html = TEXT PASS
 // starting with the 52554->52633 merge.
 BUG31363 DEBUG WIN LINUX : platform/chromium/fast/dom/interval.html = TEXT PASS
 
+// These tests are generating the correct output, but the output currently in
+// the repository is incorrect (regression).
+BUG43750 MAC: media/audio-controls-rendering.html = FAIL
+BUG43750 MAC: media/audio-no-installed-engines.html = FAIL
+BUG43750 MAC: media/controls-after-reload.html = FAIL
+BUG43750 MAC: media/controls-strict.html = FAIL
+BUG43750 MAC: media/video-aspect-ratio.html = FAIL
+BUG43750 MAC: media/video-controls-rendering.html = FAIL
+BUG43750 MAC: media/video-display-toggle.html = FAIL
+BUG43750 MAC: media/video-no-audio.html = FAIL
+BUG43750 MAC: media/video-volume-slider.html = FAIL
+
 // -----------------------------------------------------------------
 // SVG TESTS
 // -----------------------------------------------------------------
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6585d0a..fa8f28b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-11  Victoria Kirst  <vrk at google.com>
+
+        Reviewed by David Levin.
+
+        Fixing a regression in the UI for Mac default audio/video controls.
+        https://bugs.webkit.org/show_bug.cgi?id=43750
+
+        * rendering/RenderThemeChromiumMac.h:
+        * rendering/RenderThemeChromiumMac.mm:
+        (WebCore::RenderThemeChromiumMac::paintMediaVolumeSliderContainer):
+        (WebCore::RenderThemeChromiumMac::paintMediaSliderThumb):
+        (WebCore::RenderThemeChromiumMac::volumeSliderOffsetFromMuteButton):
+
 2010-08-11  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/rendering/RenderThemeChromiumMac.h b/WebCore/rendering/RenderThemeChromiumMac.h
index 2309081..d1875fc 100644
--- a/WebCore/rendering/RenderThemeChromiumMac.h
+++ b/WebCore/rendering/RenderThemeChromiumMac.h
@@ -41,8 +41,11 @@ protected:
     virtual bool shouldRenderMediaControlPart(ControlPart, Element*);
     virtual String extraMediaControlsStyleSheet();
 
+    virtual bool paintMediaSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
+    virtual bool paintMediaVolumeSliderContainer(RenderObject*, const PaintInfo&, const IntRect&);
     virtual bool paintMediaVolumeSliderTrack(RenderObject*, const PaintInfo&, const IntRect&);
     virtual bool paintMediaVolumeSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
+    virtual IntPoint volumeSliderOffsetFromMuteButton(Node*, const IntSize&) const;
 
 #endif
 
diff --git a/WebCore/rendering/RenderThemeChromiumMac.mm b/WebCore/rendering/RenderThemeChromiumMac.mm
index a43da1e..e8ffe6c 100644
--- a/WebCore/rendering/RenderThemeChromiumMac.mm
+++ b/WebCore/rendering/RenderThemeChromiumMac.mm
@@ -134,6 +134,11 @@ String RenderThemeChromiumMac::extraMediaControlsStyleSheet()
     return String(mediaControlsChromiumUserAgentStyleSheet, sizeof(mediaControlsChromiumUserAgentStyleSheet));
 }
 
+bool RenderThemeChromiumMac::paintMediaVolumeSliderContainer(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+{
+    return true;
+}
+
 bool RenderThemeChromiumMac::paintMediaVolumeSliderTrack(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     return RenderMediaControlsChromium::paintMediaControlsPart(MediaVolumeSlider, object, paintInfo, rect);
@@ -144,6 +149,15 @@ bool RenderThemeChromiumMac::paintMediaVolumeSliderThumb(RenderObject* object, c
     return RenderMediaControlsChromium::paintMediaControlsPart(MediaVolumeSliderThumb, object, paintInfo, rect);
 }
 
+bool RenderThemeChromiumMac::paintMediaSliderThumb(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+{
+    return RenderMediaControlsChromium::paintMediaControlsPart(MediaSliderThumb, object, paintInfo, rect);
+}
+
+IntPoint RenderThemeChromiumMac::volumeSliderOffsetFromMuteButton(Node* muteButton, const IntSize& size) const
+{
+    return RenderTheme::volumeSliderOffsetFromMuteButton(muteButton, size);
+}
 #endif
 
 } // namespace WebCore

-- 
WebKit Debian packaging