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

philn at webkit.org philn at webkit.org
Wed Dec 22 18:11:20 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 5ad132965f90eb162d4fa496f3a5a08fae8a4003
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 8 16:49:34 2010 +0000

    2010-12-08  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Gustavo Noronha Silva.
    
            [GTK] media/fullscreen* failing on 64-bits Debug
            https://bugs.webkit.org/show_bug.cgi?id=50394
    
            Avoid emiting durationchanged in the case where the previous
            duration was 0 because that case is already handled by the
            HTMLMediaElement.
    
            Test: media/media-fullscreen*.html
    
            * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
            (WebCore::MediaPlayerPrivateGStreamer::durationChanged):
    
    LayoutTests:
    
            Reviewed by Gustavo Noronha Silva.
    
            [GTK] media/fullscreen* failing on 64-bits Debug
            https://bugs.webkit.org/show_bug.cgi?id=50394
    
            * platform/gtk/Skipped: Unskip now passing tests.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73523 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1792955..f4486f1 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-08  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GTK] media/fullscreen* failing on 64-bits Debug
+        https://bugs.webkit.org/show_bug.cgi?id=50394
+
+        * platform/gtk/Skipped: Unskip now passing tests.
+
 2010-12-08  Ilya Tikhonovsky  <loislo at chromium.org>
 
         Unreviewed. Remove WIN prefix for inspector's tests expectations.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 83f0797..a12b5f3 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5140,10 +5140,6 @@ editing/selection/5354455-1.html
 editing/selection/5354455-2.html
 media/controls-right-click-on-timebar.html
 
-# https://bugs.webkit.org/show_bug.cgi?id=50394
-media/media-fullscreen-inline.html
-media/media-fullscreen-not-in-document.html
-
 # Gtk doesn't implement dumpResourceResponseMIMETypes which is required for the
 # preloader tests.
 fast/preloader
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 91ec866..14e1b3f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-12-08  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GTK] media/fullscreen* failing on 64-bits Debug
+        https://bugs.webkit.org/show_bug.cgi?id=50394
+
+        Avoid emiting durationchanged in the case where the previous
+        duration was 0 because that case is already handled by the
+        HTMLMediaElement.
+
+        Test: media/media-fullscreen*.html
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivateGStreamer::durationChanged):
+
 2010-12-07  Darin Adler  <darin at apple.com>
 
         Reviewed by Geoffrey Garen.
diff --git a/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
index e338c14..f11c3cc 100644
--- a/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
+++ b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
@@ -1255,8 +1255,10 @@ void MediaPlayerPrivateGStreamer::durationChanged()
     float previousDuration = m_mediaDuration;
 
     cacheDuration();
-
-    if (m_mediaDuration != previousDuration)
+    // Avoid emiting durationchanged in the case where the previous
+    // duration was 0 because that case is already handled by the
+    // HTMLMediaElement.
+    if (previousDuration && m_mediaDuration != previousDuration)
         m_player->durationChanged();
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list