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

[eric.carlson at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 64a8be7efa72c1a2e46cb32c33131e5f8f694544
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 16 21:12:58 2010 +0000

    2010-11-16  Eric Carlson  <eric.carlson at apple.com>
    
            Unreviewed attempt to fix GTK build after http://trac.webkit.org/changeset/72117
    
            * platform/graphics/MediaPlayer.cpp:
            (WebCore::installedMediaEngines):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72128 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1d0c5d3..00b28e1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-16  Eric Carlson  <eric.carlson at apple.com>
+
+        Unreviewed attempt to fix GTK build after http://trac.webkit.org/changeset/72117
+
+        * platform/graphics/MediaPlayer.cpp:
+        (WebCore::installedMediaEngines):
+
 2010-11-12  Zhenyao Mo  <zmo at google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/WebCore/platform/graphics/MediaPlayer.cpp b/WebCore/platform/graphics/MediaPlayer.cpp
index e7159f8..57f55f9 100644
--- a/WebCore/platform/graphics/MediaPlayer.cpp
+++ b/WebCore/platform/graphics/MediaPlayer.cpp
@@ -174,7 +174,10 @@ static Vector<MediaPlayerFactory*>& installedMediaEngines()
 #if USE(GSTREAMER)
         MediaPlayerPrivateGStreamer::registerMediaEngine(addMediaEngine);
 #endif
+
+#if !PLATFORM(GTK) && !PLATFORM(EFL)
         PlatformMediaEngineClassName::registerMediaEngine(addMediaEngine);
+#endif
     }
     
     return installedEngines;

-- 
WebKit Debian packaging