[WinCairo] Preparation for ENABLE(VIDEO).

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: http://svn.webkit.org/repository/webkit/trunk@159122 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 31b95729
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
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
{
......
......@@ -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
......
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
......
......@@ -25,7 +25,7 @@
#include "config.h"
#if ENABLE(VIDEO)
#if ENABLE(VIDEO) && !USE(GSTREAMER)
#include "FullscreenVideoController.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment