[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 0ab74bdd928305bf645ada5124f372a299eca913
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 11 02:53:08 2010 +0000

    2010-08-10  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
    
            Reviewed by Antonio Gomes.
    
            [EFL] Add video files to enable video in WebKit EFL
            https://bugs.webkit.org/show_bug.cgi?id=43790
    
            Add files regarding html5 video to CMakeList.txt for WebKit Efl.
            But, this patch is not run html5 video on WebKit EFL yet.
    
            * CMakeLists.txt: Add files related to html5video.
            * platform/efl/LocalizedStringsEfl.cpp: Add functions for html5 video.
            (WebCore::localizedMediaControlElementString):
            (WebCore::localizedMediaControlElementHelpText):
            (WebCore::localizedMediaTimeDescription):
            * platform/graphics/MediaPlayer.cpp:
            (WebCore::installedMediaEngines): Disable MediaPlayerPrivate::r
          egisterMediaEngine for WebKit EFL.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65117 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index 3d85f6b..4e4b181 100644
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -1762,6 +1762,22 @@ IF (ENABLE_SVG)
     )
 ENDIF()
 
+IF (ENABLE_VIDEO)
+    LIST(APPEND WebCore_SOURCES
+        ${DERIVED_SOURCES_DIR}/JSTimeRanges.cpp
+        bindings/js/JSAudioConstructor.cpp
+        html/HTMLAudioElement.cpp
+        html/HTMLMediaElement.cpp
+        html/HTMLSourceElement.cpp
+        html/HTMLVideoElement.cpp
+        html/TimeRanges.cpp
+        platform/graphics/MediaPlayer.cpp
+        rendering/MediaControlElements.cpp
+        rendering/RenderMedia.cpp
+        rendering/RenderVideo.cpp
+    )
+ENDIF()
+
 IF (ENABLE_WML)
     LIST(APPEND WebCore_SOURCES
         ${DERIVED_SOURCES_DIR}/WMLElementFactory.cpp
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 489e475..8ca2e0e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-08-10  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
+
+        Reviewed by Antonio Gomes.
+
+        [EFL] Add video files to enable video in WebKit EFL
+        https://bugs.webkit.org/show_bug.cgi?id=43790
+
+        Add files regarding html5 video to CMakeList.txt for WebKit Efl.
+        But, this patch is not run html5 video on WebKit EFL yet.
+
+        * CMakeLists.txt: Add files related to html5video.
+        * platform/efl/LocalizedStringsEfl.cpp: Add functions for html5 video.
+        (WebCore::localizedMediaControlElementString):
+        (WebCore::localizedMediaControlElementHelpText):
+        (WebCore::localizedMediaTimeDescription):
+        * platform/graphics/MediaPlayer.cpp:
+        (WebCore::installedMediaEngines): Disable MediaPlayerPrivate::r
+      egisterMediaEngine for WebKit EFL.
+
 2010-08-10  Patrick Gansterer  <paroga at paroga.com>
 
         Reviewed by Nikolas Zimmermann.
diff --git a/WebCore/platform/efl/LocalizedStringsEfl.cpp b/WebCore/platform/efl/LocalizedStringsEfl.cpp
index a58dba2..6023205 100644
--- a/WebCore/platform/efl/LocalizedStringsEfl.cpp
+++ b/WebCore/platform/efl/LocalizedStringsEfl.cpp
@@ -350,6 +350,26 @@ String imageTitle(const String& filename, const IntSize& size)
     return String();
 }
 
+#if ENABLE(VIDEO)
+String localizedMediaControlElementString(const String& name)
+{
+    notImplemented();
+    return String();
+}
+
+String localizedMediaControlElementHelpText(const String& name)
+{
+    notImplemented();
+    return String();
+}
+
+String localizedMediaTimeDescription(float time)
+{
+    notImplemented();
+    return String();
+}
+#endif
+
 String mediaElementLoadingStateText()
 {
     return String::fromUTF8("Loading...");
diff --git a/WebCore/platform/graphics/MediaPlayer.cpp b/WebCore/platform/graphics/MediaPlayer.cpp
index 0732116..07f7761 100644
--- a/WebCore/platform/graphics/MediaPlayer.cpp
+++ b/WebCore/platform/graphics/MediaPlayer.cpp
@@ -171,7 +171,7 @@ static Vector<MediaPlayerFactory*>& installedMediaEngines()
 
 #if PLATFORM(WIN)
         MediaPlayerPrivateQuickTimeVisualContext::registerMediaEngine(addMediaEngine);
-#elif !PLATFORM(GTK)
+#elif !PLATFORM(GTK) && !PLATFORM(EFL)
         // FIXME: currently all the MediaEngines are named
         // MediaPlayerPrivate. This code will need an update when bug
         // 36663 is adressed.

-- 
WebKit Debian packaging