[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 721db339ec84fa2e3fb9c0cf473ea0987fff4f7f
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 1 06:04:50 2010 +0000

    2010-08-31  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
    
            Reviewed by Martin Robinson.
    
            [EFL] Add PlatformVideoWindowEfl.cpp for WebKit EFL
            https://bugs.webkit.org/show_bug.cgi?id=44508
    
            Add PlatformVideoWindowEfl.cpp in order to use gstreamer by
            WebKit EFL.
    
            * platform/graphics/gstreamer/PlatformVideoWindow.h:
            (WebCore::PlatformVideoWindow::window):
            (WebCore::PlatformVideoWindow::videoWindowId):
            * platform/graphics/gstreamer/PlatformVideoWindowEfl.cpp: Added.
            (PlatformVideoWindow::PlatformVideoWindow):
            (PlatformVideoWindow::~PlatformVideoWindow):
            * platform/graphics/gstreamer/PlatformVideoWindowGtk.cpp: Include <gtk/gtk.h> directly.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66578 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 87b5b7d..54cc4b7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2010-08-31  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
+
+        Reviewed by Martin Robinson.
+
+        [EFL] Add PlatformVideoWindowEfl.cpp for WebKit EFL
+        https://bugs.webkit.org/show_bug.cgi?id=44508
+
+        Add PlatformVideoWindowEfl.cpp in order to use gstreamer by 
+        WebKit EFL.
+
+        * platform/graphics/gstreamer/PlatformVideoWindow.h:
+        (WebCore::PlatformVideoWindow::window):
+        (WebCore::PlatformVideoWindow::videoWindowId):
+        * platform/graphics/gstreamer/PlatformVideoWindowEfl.cpp: Added.
+        (PlatformVideoWindow::PlatformVideoWindow):
+        (PlatformVideoWindow::~PlatformVideoWindow):
+        * platform/graphics/gstreamer/PlatformVideoWindowGtk.cpp: Include <gtk/gtk.h> directly.
+
 2010-08-31  Dave Hyatt  <hyatt at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebCore/platform/graphics/gstreamer/PlatformVideoWindow.h b/WebCore/platform/graphics/gstreamer/PlatformVideoWindow.h
index 83dc5dd..8d99f05 100644
--- a/WebCore/platform/graphics/gstreamer/PlatformVideoWindow.h
+++ b/WebCore/platform/graphics/gstreamer/PlatformVideoWindow.h
@@ -22,14 +22,10 @@
 
 #if ENABLE(VIDEO)
 
+#include "Widget.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 
-#if PLATFORM(GTK)
-#include <gtk/gtk.h>
-typedef GtkWidget PlatformWindowType;
-#endif
-
 namespace WebCore {
 
 class PlatformVideoWindow : public RefCounted<PlatformVideoWindow> {
@@ -39,13 +35,13 @@ class PlatformVideoWindow : public RefCounted<PlatformVideoWindow> {
         PlatformVideoWindow();
         ~PlatformVideoWindow();
 
-        PlatformWindowType* window() const { return m_window; }
-        gulong videoWindowId() const { return m_videoWindowId; }
+        PlatformWidget window() const { return m_window; }
+        unsigned long videoWindowId() const { return m_videoWindowId; }
 
     private:
-        gulong m_videoWindowId;
-        PlatformWindowType* m_videoWindow;
-        PlatformWindowType* m_window;
+        unsigned long m_videoWindowId;
+        PlatformWidget m_videoWindow;
+        PlatformWidget m_window;
     };
 }
 
diff --git a/WebCore/platform/graphics/gstreamer/PlatformVideoWindowEfl.cpp b/WebCore/platform/graphics/gstreamer/PlatformVideoWindowEfl.cpp
new file mode 100644
index 0000000..5c0e6ea
--- /dev/null
+++ b/WebCore/platform/graphics/gstreamer/PlatformVideoWindowEfl.cpp
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2010 Samsung Electronics
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "config.h"
+#include "PlatformVideoWindow.h"
+
+#include "NotImplemented.h"
+
+using namespace WebCore;
+
+PlatformVideoWindow::PlatformVideoWindow()
+{
+    notImplemented();
+}
+
+PlatformVideoWindow::~PlatformVideoWindow()
+{
+    notImplemented();
+}
diff --git a/WebCore/platform/graphics/gstreamer/PlatformVideoWindowGtk.cpp b/WebCore/platform/graphics/gstreamer/PlatformVideoWindowGtk.cpp
index 185f535..c5f835c 100644
--- a/WebCore/platform/graphics/gstreamer/PlatformVideoWindowGtk.cpp
+++ b/WebCore/platform/graphics/gstreamer/PlatformVideoWindowGtk.cpp
@@ -20,6 +20,7 @@
 #include "config.h"
 #include "PlatformVideoWindow.h"
 
+#include <gtk/gtk.h>
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h> // for GDK_WINDOW_XID
 #endif

-- 
WebKit Debian packaging