diff options
| author | Leon Scroggins <scroggo@google.com> | 2011-03-16 14:53:22 -0400 |
|---|---|---|
| committer | Leon Scroggins <scroggo@google.com> | 2011-03-16 14:53:22 -0400 |
| commit | 0bbec56c50049ac90827b0fa48ffd2e420c3ab74 (patch) | |
| tree | 177046b464711922b4f363f1f584c9c36d82f7a3 /WebKit/android | |
| parent | f74d19f6fc19e01034ade84133327dc1f3274006 (diff) | |
| parent | 7165b1cd83b3379b5710a3854b40e9fca4c0868e (diff) | |
| download | external_webkit-0bbec56c50049ac90827b0fa48ffd2e420c3ab74.zip external_webkit-0bbec56c50049ac90827b0fa48ffd2e420c3ab74.tar.gz external_webkit-0bbec56c50049ac90827b0fa48ffd2e420c3ab74.tar.bz2 | |
resolved conflicts for merge of 7165b1cd to master
Change-Id: I86e0f1726df824f3b53e878f3ae7ca3a98308539
Diffstat (limited to 'WebKit/android')
| -rw-r--r-- | WebKit/android/RenderSkinMediaButton.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/WebKit/android/RenderSkinMediaButton.cpp b/WebKit/android/RenderSkinMediaButton.cpp index 3216b8d..8d426a3 100644 --- a/WebKit/android/RenderSkinMediaButton.cpp +++ b/WebKit/android/RenderSkinMediaButton.cpp @@ -100,8 +100,15 @@ void RenderSkinMediaButton::Draw(SkCanvas* canvas, const IntRect& r, int buttonT SkRect bounds(r); SkScalar imageMargin = 8; SkPaint paint; - SkColor backgroundColor = SkColorSetARGB(255, 200, 200, 200); + + int alpha = 255; + if (translucent) + alpha = 190; + + SkColor backgroundColor = SkColorSetARGB(alpha, 34, 34, 34); SkColor trackBackgroundColor = SkColorSetARGB(255, 100, 100, 100); + paint.setColor(backgroundColor); + paint.setFlags(SkPaint::kFilterBitmap_Flag); switch (buttonType) { case PAUSE: |