Merge 'Render media button and buttons properly.' into master.

Bug:3009375

Requires a change to frameworks/base.

Change-Id: I0cb921b17ffc00992c3ad299c96f8e72c8daaf25

2 files changed, 12 insertions, 19 deletions

diff --git a/WebKit/android/RenderSkinMediaButton.cpp b/WebKit/android/RenderSkinMediaButton.cpp
index 240bbd6..090d55e 100644
--- a/WebKit/android/RenderSkinMediaButton.cpp
+++ b/WebKit/android/RenderSkinMediaButton.cpp
@@ -58,8 +58,8 @@ static const PatchData gFiles[] =
         { "spinner_76_inner_holo.png", 0, 0 }, // SPINNER_INNER
         { "ic_media_video_poster.png", 0, 0 }, // VIDEO
         { "btn_media_player_disabled.9.png", 0, 0 }, // BACKGROUND_SLIDER
-        { "btn_media_player_pressed.9.png", 0, 0 },  // SLIDER_TRACK
-        { "btn_media_player.9.png", 0, 0 }           // SLIDER_THUMB
+        { "scrubber_track_holo_dark.9.png", 0, 0 },  // SLIDER_TRACK
+        { "scrubber_control_holo.png", 0, 0 }      // SLIDER_THUMB
     };
 
 static SkBitmap gButton[sizeof(gFiles)/sizeof(gFiles[0])];
@@ -96,9 +96,9 @@ void RenderSkinMediaButton::Draw(SkCanvas* canvas, const IntRect& r, int buttonT
         return;
     }
 
-    bool drawsNinePatch = true;
+    bool drawsNinePatch = false;
     bool drawsImage = true;
-    bool drawsBackgroundColor = false;
+    bool drawsBackgroundColor = true;
 
     int ninePatchIndex = 0;
     int imageIndex = 0;
@@ -125,7 +125,6 @@ void RenderSkinMediaButton::Draw(SkCanvas* canvas, const IntRect& r, int buttonT
     case FULLSCREEN:
     {
          imageIndex = buttonType + 1;
-         drawsBackgroundColor = true;
          paint.setColor(backgroundColor);
          break;
     }
@@ -141,30 +140,24 @@ void RenderSkinMediaButton::Draw(SkCanvas* canvas, const IntRect& r, int buttonT
     {
          drawsBackgroundColor = false;
          drawsImage = false;
-         drawsNinePatch = false;
-         drawsBackgroundColor = true;
-         paint.setColor(backgroundColor);
          break;
     }
     case SLIDER_TRACK:
     {
+         drawsNinePatch = true;
          drawsImage = false;
-         drawsNinePatch = false;
-         drawsBackgroundColor = true;
-         paint.setColor(trackBackgroundColor);
-         bounds.fTop += 8;
-         bounds.fBottom -= 8;
+         ninePatchIndex = buttonType + 1;
          break;
     }
     case SLIDER_THUMB:
     {
-         drawsImage = false;
-         ninePatchIndex = buttonType + 1;
+         drawsBackgroundColor = false;
+         imageMargin = 0;
+         imageIndex = buttonType + 1;
          break;
     }
     default:
-         drawsImage = false;
-         drawsNinePatch = false;
+         return;
     }
 
     if (drawsBackgroundColor) {
diff --git a/WebKit/android/RenderSkinMediaButton.h b/WebKit/android/RenderSkinMediaButton.h
index c429ce4..6aa9c4e 100644
--- a/WebKit/android/RenderSkinMediaButton.h
+++ b/WebKit/android/RenderSkinMediaButton.h
@@ -54,8 +54,8 @@ public:
     /**
      * Slider dimensions
      */
-    static int sliderThumbWidth() { return 10; }
-    static int sliderThumbHeight() { return 30; }
+    static int sliderThumbWidth() { return 32; }
+    static int sliderThumbHeight() { return 32; }
 
 };