Title: [160707] trunk
- Revision
- 160707
- Author
- [email protected]
- Date
- 2013-12-17 08:55:41 -0800 (Tue, 17 Dec 2013)
Log Message
Source/WebKit/win: [WinCairo] Compile fixes for GStreamer on Windows.
https://bugs.webkit.org/show_bug.cgi?id=124867
Patch by Alex Christensen <[email protected]> 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 <[email protected]> on 2013-12-17
Reviewed by Philippe Normand.
* WinLauncher/WinLauncher.cpp:
(wWinMain):
Added g_main_context_iteration in main event loop.
Modified Paths
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (160706 => 160707)
--- trunk/Source/WebKit/win/ChangeLog 2013-12-17 16:18:21 UTC (rev 160706)
+++ trunk/Source/WebKit/win/ChangeLog 2013-12-17 16:55:41 UTC (rev 160707)
@@ -1,3 +1,16 @@
+2013-12-17 Alex Christensen <[email protected]>
+
+ [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 <[email protected]>
Web Inspector: Push More Inspector Required Classes Down into _javascript_Core
Modified: trunk/Source/WebKit/win/WebView.cpp (160706 => 160707)
--- trunk/Source/WebKit/win/WebView.cpp 2013-12-17 16:18:21 UTC (rev 160706)
+++ trunk/Source/WebKit/win/WebView.cpp 2013-12-17 16:55:41 UTC (rev 160707)
@@ -6292,7 +6292,7 @@
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::exitFullscreen()
{
-#if ENABLE(VIDEO)
+#if ENABLE(VIDEO) && !USE(GSTREAMER)
if (!m_fullScreenVideoController)
return;
Modified: trunk/Tools/ChangeLog (160706 => 160707)
--- trunk/Tools/ChangeLog 2013-12-17 16:18:21 UTC (rev 160706)
+++ trunk/Tools/ChangeLog 2013-12-17 16:55:41 UTC (rev 160707)
@@ -1,3 +1,14 @@
+2013-12-17 Alex Christensen <[email protected]>
+
+ [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 <[email protected]>
Fix for C++ should have the & or * beside the type not the variable name check.
Modified: trunk/Tools/WinLauncher/WinLauncher.cpp (160706 => 160707)
--- trunk/Tools/WinLauncher/WinLauncher.cpp 2013-12-17 16:18:21 UTC (rev 160706)
+++ trunk/Tools/WinLauncher/WinLauncher.cpp 2013-12-17 16:55:41 UTC (rev 160707)
@@ -42,6 +42,10 @@
#include <CoreFoundation/CFRunLoop.h>
#endif
+#if USE(GLIB)
+#include <glib.h>
+#endif
+
#include <algorithm>
#include <assert.h>
#include <comip.h>
@@ -616,6 +620,9 @@
TranslateMessage(&msg);
DispatchMessage(&msg);
}
+#if USE(GLIB)
+ g_main_context_iteration(0, false);
+#endif
}
} __except(createCrashReport(GetExceptionInformation()), EXCEPTION_EXECUTE_HANDLER) { }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
