Source/WebKit/win: [WinCairo] Compile fixes for GStreamer on Windows.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 17 Dec 2013 16:55:41 +0000 (16:55 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 17 Dec 2013 16:55:41 +0000 (16:55 +0000)
https://bugs.webkit.org/show_bug.cgi?id=124867

Patch by Alex Christensen <achristensen@webkit.org> on 2013-12-17
Reviewed by Philippe Normand.

* WebView.cpp:
(WebView::enterFullscreenForNode):
(WebView::exitFullscreen):
GStreamer in WebKit does not support fullscreen, so
I added #if !USE(GSTREAMER) to the fullscreen code to get it to compile.

Tools: [WinCairo] Adding support for GStreamer and GLib.
https://bugs.webkit.org/show_bug.cgi?id=124867

Patch by Alex Christensen <achristensen@webkit.org> on 2013-12-17
Reviewed by Philippe Normand.

* WinLauncher/WinLauncher.cpp:
(wWinMain):
Added g_main_context_iteration in main event loop.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@160707 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/win/ChangeLog
Source/WebKit/win/WebView.cpp
Tools/ChangeLog
Tools/WinLauncher/WinLauncher.cpp

index 52c2d8f..3edbae4 100644 (file)
@@ -1,3 +1,16 @@
+2013-12-17  Alex Christensen  <achristensen@webkit.org>
+
+        [WinCairo] Compile fixes for GStreamer on Windows.
+        https://bugs.webkit.org/show_bug.cgi?id=124867
+
+        Reviewed by Philippe Normand.
+
+        * WebView.cpp:
+        (WebView::enterFullscreenForNode):
+        (WebView::exitFullscreen):
+        GStreamer in WebKit does not support fullscreen, so
+        I added #if !USE(GSTREAMER) to the fullscreen code to get it to compile.
+
 2013-12-11  Joseph Pecoraro  <pecoraro@apple.com>
 
         Web Inspector: Push More Inspector Required Classes Down into JavaScriptCore
index dbe1524..aa7a964 100644 (file)
@@ -6292,7 +6292,7 @@ HRESULT WebView::setCanStartPlugins(BOOL canStartPlugins)
 
 void WebView::enterFullscreenForNode(Node* node)
 {
-#if ENABLE(VIDEO)
+#if ENABLE(VIDEO) && !USE(GSTREAMER)
     if (!isHTMLVideoElement(node) || !node->isElementNode())
         return;
 
@@ -6323,7 +6323,7 @@ void WebView::enterFullscreenForNode(Node* node)
 
 void WebView::exitFullscreen()
 {
-#if ENABLE(VIDEO)
+#if ENABLE(VIDEO) && !USE(GSTREAMER)
     if (!m_fullScreenVideoController)
         return;
     
index e28825f..ba2e6fe 100644 (file)
@@ -1,3 +1,14 @@
+2013-12-17  Alex Christensen  <achristensen@webkit.org>
+
+        [WinCairo] Adding support for GStreamer and GLib.
+        https://bugs.webkit.org/show_bug.cgi?id=124867
+
+        Reviewed by Philippe Normand.
+
+        * WinLauncher/WinLauncher.cpp:
+        (wWinMain):
+        Added g_main_context_iteration in main event loop.
+
 2013-12-17  Gergo Balogh  <geryxyz@inf.u-szeged.hu>
 
         Fix for C++ should have the & or * beside the type not the variable name check.
index a803f97..30975ba 100644 (file)
 #include <CoreFoundation/CFRunLoop.h>
 #endif
 
+#if USE(GLIB)
+#include <glib.h>
+#endif
+
 #include <algorithm>
 #include <assert.h>
 #include <comip.h>
@@ -616,6 +620,9 @@ int WINAPI wWinMain(HINSTANCE, HINSTANCE, PWSTR, int nCmdShow)
                 TranslateMessage(&msg);
                 DispatchMessage(&msg);
             }
+#if USE(GLIB)
+            g_main_context_iteration(0, false);
+#endif
         }
     } __except(createCrashReport(GetExceptionInformation()), EXCEPTION_EXECUTE_HANDLER) { }