resolved conflicts for merge of 24e276c8 to master

Change-Id: I1f46d4444330bf7e03b99a5d0089e9388b9ea8bd

1 files changed, 7 insertions, 1 deletions

diff --git a/WebCore/platform/android/RenderThemeAndroid.cpp b/WebCore/platform/android/RenderThemeAndroid.cpp
index 68b6441..6fb7079 100644
--- a/WebCore/platform/android/RenderThemeAndroid.cpp
+++ b/WebCore/platform/android/RenderThemeAndroid.cpp
@@ -262,7 +262,7 @@ bool RenderThemeAndroid::shouldRenderMediaControlPart(ControlPart part, Element*
           return false;
       case MediaSeekBackButtonPart:
       case MediaSeekForwardButtonPart:
-          return true;
+          return false;
       case MediaRewindButtonPart:
           return mediaElement->movieLoadType() != MediaPlayer::LiveStream;
       case MediaReturnToRealtimeButtonPart:
@@ -276,6 +276,12 @@ bool RenderThemeAndroid::shouldRenderMediaControlPart(ControlPart part, Element*
       }
 }
 
+bool paintMediaFullscreenButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& rect)
+{
+      RenderSkinMediaButton::Draw(getCanvasFromInfo(paintInfo), rect, RenderSkinMediaButton::PLAY);
+      return false;
+}
+
 bool RenderThemeAndroid::paintMediaMuteButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& rect)
 {
       RenderSkinMediaButton::Draw(getCanvasFromInfo(paintInfo), rect, RenderSkinMediaButton::MUTE);