[WinCairo] Preparation for ENABLE(VIDEO).
authoralex.christensen@flexsim.com <alex.christensen@flexsim.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 12 Nov 2013 18:22:47 +0000 (18:22 +0000)
committeralex.christensen@flexsim.com <alex.christensen@flexsim.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 12 Nov 2013 18:22:47 +0000 (18:22 +0000)
https://bugs.webkit.org/show_bug.cgi?id=57420

Reviewed by Martin Robinson.

Source/WebCore:

* platform/FileSystem.h:
* platform/graphics/MediaPlayer.cpp:
* rendering/RenderMediaControls.cpp:
* rendering/RenderThemeWin.cpp:
(WebCore::RenderThemeWin::adjustSliderThumbSize):
Separated CG code from GStreamer code.

Source/WebKit/win:

* FullscreenVideoController.cpp:
Don't compile if using GStreamer.

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

Source/WebCore/ChangeLog
Source/WebCore/platform/FileSystem.h
Source/WebCore/platform/graphics/MediaPlayer.cpp
Source/WebCore/rendering/RenderMediaControls.cpp
Source/WebCore/rendering/RenderThemeWin.cpp
Source/WebKit/win/ChangeLog
Source/WebKit/win/FullscreenVideoController.cpp

index 391a154038c6696fc68d8d5a1f62f38a95e59643..49cd5ac3b18b66f4412ff26aa472b993ed478a94 100644 (file)
@@ -1,3 +1,17 @@
+2013-11-12  Alex Christensen  <achristensen@webkit.org>
+
+        [WinCairo] Preparation for ENABLE(VIDEO).
+        https://bugs.webkit.org/show_bug.cgi?id=57420
+
+        Reviewed by Martin Robinson.
+
+        * platform/FileSystem.h:
+        * platform/graphics/MediaPlayer.cpp:
+        * rendering/RenderMediaControls.cpp:
+        * rendering/RenderThemeWin.cpp:
+        (WebCore::RenderThemeWin::adjustSliderThumbSize):
+        Separated CG code from GStreamer code.
+
 2013-11-12  Tibor Meszaros  <mtibor@inf.u-szeged.hu>
 
         Fix reported build warnings for GTK
index fa033edc428042cc452fe6ed564de87cbe5d75d5..9a5a39f3e2e0942521a1f6e6904800de5034785d 100644 (file)
@@ -101,7 +101,7 @@ typedef unsigned PlatformModuleVersion;
 #endif
 
 // PlatformFileHandle
-#if USE(GLIB) && !PLATFORM(EFL)
+#if USE(GLIB) && !PLATFORM(EFL) && !PLATFORM(WIN)
 typedef GFileIOStream* PlatformFileHandle;
 const PlatformFileHandle invalidPlatformFileHandle = 0;
 #elif OS(WINDOWS)
index d64ab34a548bdb454a6f77c2974fb0fdc1413a46..3e0af64ca0f6de8b372f8a17637048a8ab48e680 100644 (file)
@@ -61,7 +61,7 @@
 #elif OS(WINCE)
 #include "MediaPlayerPrivateWinCE.h"
 #define PlatformMediaEngineClassName MediaPlayerPrivate
-#elif PLATFORM(WIN)
+#elif PLATFORM(WIN) && !USE(GSTREAMER)
 #include "MediaPlayerPrivateQuickTimeVisualContext.h"
 #define PlatformMediaEngineClassName MediaPlayerPrivateQuickTimeVisualContext
 #if USE(AVFOUNDATION)
index 7e908903b8355a38fa3863e8c678875a2680aa04..8395a9a87769a9628b6e7f1ae7086ce34d7bb4ff 100644 (file)
@@ -36,7 +36,7 @@
 #include "RenderTheme.h"
 
 // FIXME: Unify more of the code for Mac and Win.
-#if PLATFORM(WIN)
+#if PLATFORM(WIN) && USE(CG)
 
 #include <CoreGraphics/CoreGraphics.h>
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
@@ -68,7 +68,7 @@ inline void wkDrawMediaSliderTrack(CGContextRef context, const CGRect& rect, flo
 
 namespace WebCore {
 
-#if PLATFORM(WIN)
+#if PLATFORM(WIN) && USE(CG)
 
 static WKMediaControllerThemeState determineState(RenderObject* o)
 {
index d0ff829df60a1dcb2bd49d999937f98045f3b6f8..8231fa62e9337b7491079748a0032772e04dff05 100644 (file)
@@ -896,7 +896,7 @@ void RenderThemeWin::adjustSliderThumbSize(RenderStyle* style, Element*) const
         style->setWidth(Length(sliderThumbWidth, Fixed));
         style->setHeight(Length(sliderThumbHeight, Fixed));
     }
-#if ENABLE(VIDEO)
+#if ENABLE(VIDEO) && USE(CG)
     else if (part == MediaSliderThumbPart || part == MediaVolumeSliderThumbPart) 
         RenderMediaControls::adjustMediaSliderThumbSize(style);
 #endif
index 41ed3a914176deed9de2d1cbaf739819dd7ed3da..de1a83c7c29feb68a0d2f7636862208d73732161 100644 (file)
@@ -1,3 +1,13 @@
+2013-11-12  Alex Christensen  <achristensen@webkit.org>
+
+        [WinCairo] Preparation for ENABLE(VIDEO).
+        https://bugs.webkit.org/show_bug.cgi?id=57420
+
+        Reviewed by Martin Robinson.
+
+        * FullscreenVideoController.cpp:
+        Don't compile if using GStreamer.
+
 2013-11-10  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 
         [AX] Clean up static_cast<> to cast from AccessibilityObject 
index fb60f261d3abe2d647904d67cac6745b2d09dfb7..d2bd75b1d0ce6e1b499de2d053ea5044f7ca48c2 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#if ENABLE(VIDEO)
+#if ENABLE(VIDEO) && !USE(GSTREAMER)
 
 #include "FullscreenVideoController.h"