Merge WebKit at r84325: Initial merge by git.

Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b

1 files changed, 1 insertions, 28 deletions

diff --git a/Source/WebCore/rendering/RenderTheme.cpp b/Source/WebCore/rendering/RenderTheme.cpp
index f254c99..6617d18 100644
--- a/Source/WebCore/rendering/RenderTheme.cpp
+++ b/Source/WebCore/rendering/RenderTheme.cpp
@@ -485,33 +485,6 @@ bool RenderTheme::paintDecorations(RenderObject* o, const PaintInfo& paintInfo,
 }
 
 #if ENABLE(VIDEO)
-bool RenderTheme::hitTestMediaControlPart(RenderObject* o, const IntPoint& absPoint)
-{
-    if (!o->isBox())
-        return false;
-
-    FloatPoint localPoint = o->absoluteToLocal(absPoint, false, true);  // respect transforms
-    return toRenderBox(o)->borderBoxRect().contains(roundedIntPoint(localPoint));
-}
-
-bool RenderTheme::shouldRenderMediaControlPart(ControlPart part, Element* e)
-{
-    HTMLMediaElement* mediaElement = static_cast<HTMLMediaElement*>(e);
-    switch (part) {
-    case MediaMuteButtonPart:
-        return mediaElement->hasAudio();
-    case MediaRewindButtonPart:
-        return mediaElement->movieLoadType() != MediaPlayer::LiveStream;
-    case MediaReturnToRealtimeButtonPart:
-        return mediaElement->movieLoadType() == MediaPlayer::LiveStream;
-    case MediaFullscreenButtonPart:
-        return mediaElement->supportsFullscreen();
-    case MediaToggleClosedCaptionsButtonPart:
-        return mediaElement->hasClosedCaptions();
-    default:
-        return true;
-    }
-}
 
 String RenderTheme::formatMediaControlsTime(float time) const
 {
@@ -968,7 +941,7 @@ IntSize RenderTheme::meterSizeForBounds(const RenderMeter*, const IntRect& bound
     return bounds.size();
 }
 
-bool RenderTheme::supportsMeter(ControlPart, bool) const
+bool RenderTheme::supportsMeter(ControlPart) const
 {
     return false;
 }