Modified: trunk/Source/WebCore/ChangeLog (166652 => 166653)
--- trunk/Source/WebCore/ChangeLog 2014-04-02 17:54:48 UTC (rev 166652)
+++ trunk/Source/WebCore/ChangeLog 2014-04-02 18:11:22 UTC (rev 166653)
@@ -1,3 +1,25 @@
+2014-03-31 Brent Fulgham <[email protected]>
+
+ [Win] Correct media controls for test harness
+ https://bugs.webkit.org/show_bug.cgi?id=131008
+
+ Reviewed by Eric Carlson.
+
+ * rendering/RenderThemeSafari.cpp: Revise to match RenderThemeWin logic.
+ (WebCore::RenderThemeSafari::systemFont):
+ (WebCore::RenderThemeSafari::paintMenuList):
+ (WebCore::RenderThemeSafari::paintSearchFieldResultsButton):
+ (WebCore::RenderThemeSafari::mediaControlsStyleSheet):
+ (WebCore::RenderThemeSafari::mediaControlsScript):
+ (WebCore::RenderThemeSafari::paintMediaFullscreenButton): Deleted.
+ (WebCore::RenderThemeSafari::paintMediaMuteButton): Deleted.
+ (WebCore::RenderThemeSafari::paintMediaPlayButton): Deleted.
+ (WebCore::RenderThemeSafari::paintMediaSeekBackButton): Deleted.
+ (WebCore::RenderThemeSafari::paintMediaSeekForwardButton): Deleted.
+ (WebCore::RenderThemeSafari::paintMediaSliderTrack): Deleted.
+ (WebCore::RenderThemeSafari::paintMediaSliderThumb): Deleted.
+ * rendering/RenderThemeSafari.h:
+
2014-04-02 [email protected] <[email protected]>
[WinCairo] Compile error.
Modified: trunk/Source/WebCore/rendering/RenderThemeSafari.cpp (166652 => 166653)
--- trunk/Source/WebCore/rendering/RenderThemeSafari.cpp 2014-04-02 17:54:48 UTC (rev 166652)
+++ trunk/Source/WebCore/rendering/RenderThemeSafari.cpp 2014-04-02 18:11:22 UTC (rev 166653)
@@ -45,9 +45,14 @@
#include "RenderView.h"
#include "SoftLinking.h"
#include "StyleResolver.h"
+#include "UserAgentStyleSheets.h"
#include <CoreGraphics/CoreGraphics.h>
#include <wtf/RetainPtr.h>
-
+
+#if ENABLE(MEDIA_CONTROLS_SCRIPT)
+#include "UserAgentScripts.h"
+#endif
+
using std::min;
// FIXME: The platform-independent code in this class should be factored out and merged with RenderThemeMac.
@@ -1168,41 +1173,25 @@
paintThemePart(SafariTheme::SearchFieldResultsButtonPart, paintInfo.context->platformContext(), searchRect, controlSizeFromRect(searchRect, searchFieldSizes()), determineState(o));
return false;
}
+
#if ENABLE(VIDEO)
-bool RenderThemeSafari::paintMediaFullscreenButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
+String RenderThemeSafari::mediaControlsStyleSheet()
{
- return RenderMediaControls::paintMediaControlsPart(MediaEnterFullscreenButton, o, paintInfo, r);
+#if ENABLE(MEDIA_CONTROLS_SCRIPT)
+ return String(mediaControlsAppleUserAgentStyleSheet, sizeof(mediaControlsAppleUserAgentStyleSheet));
+#else
+ return emptyString();
+#endif
}
-bool RenderThemeSafari::paintMediaMuteButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
+String RenderThemeSafari::mediaControlsScript()
{
- return RenderMediaControls::paintMediaControlsPart(MediaMuteButton, o, paintInfo, r);
+#if ENABLE(MEDIA_CONTROLS_SCRIPT)
+ return String(mediaControlsAppleJavaScript, sizeof(mediaControlsAppleJavaScript));
+#else
+ return emptyString();
+#endif
}
-
-bool RenderThemeSafari::paintMediaPlayButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
-{
- return RenderMediaControls::paintMediaControlsPart(MediaPlayButton, o, paintInfo, r);
-}
-
-bool RenderThemeSafari::paintMediaSeekBackButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
-{
- return RenderMediaControls::paintMediaControlsPart(MediaSeekBackButton, o, paintInfo, r);
-}
-
-bool RenderThemeSafari::paintMediaSeekForwardButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
-{
- return RenderMediaControls::paintMediaControlsPart(MediaSeekForwardButton, o, paintInfo, r);
-}
-
-bool RenderThemeSafari::paintMediaSliderTrack(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
-{
- return RenderMediaControls::paintMediaControlsPart(MediaSlider, o, paintInfo, r);
-}
-
-bool RenderThemeSafari::paintMediaSliderThumb(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
-{
- return RenderMediaControls::paintMediaControlsPart(MediaSliderThumb, o, paintInfo, r);
-}
#endif
#if ENABLE(METER_ELEMENT)
Modified: trunk/Source/WebCore/rendering/RenderThemeSafari.h (166652 => 166653)
--- trunk/Source/WebCore/rendering/RenderThemeSafari.h 2014-04-02 17:54:48 UTC (rev 166652)
+++ trunk/Source/WebCore/rendering/RenderThemeSafari.h 2014-04-02 18:11:22 UTC (rev 166653)
@@ -129,13 +129,8 @@
virtual bool paintCapsLockIndicator(RenderObject*, const PaintInfo&, const IntRect&);
#if ENABLE(VIDEO)
- virtual bool paintMediaFullscreenButton(RenderObject*, const PaintInfo&, const IntRect&);
- virtual bool paintMediaPlayButton(RenderObject*, const PaintInfo&, const IntRect&);
- virtual bool paintMediaMuteButton(RenderObject*, const PaintInfo&, const IntRect&);
- virtual bool paintMediaSeekBackButton(RenderObject*, const PaintInfo&, const IntRect&);
- virtual bool paintMediaSeekForwardButton(RenderObject*, const PaintInfo&, const IntRect&);
- virtual bool paintMediaSliderTrack(RenderObject*, const PaintInfo&, const IntRect&);
- virtual bool paintMediaSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
+ virtual String mediaControlsStyleSheet() override;
+ virtual String mediaControlsScript() override;
#endif
#if ENABLE(METER_ELEMENT)
