diff options
| author | Leon Scroggins <scroggo@google.com> | 2010-03-10 12:07:27 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-10 12:07:27 -0800 |
| commit | 8dc85313cd382ae58293575cc7c79eb4f8f98db6 (patch) | |
| tree | 30a1b1150605f7864cc660ddf4a34f0d59d82b28 | |
| parent | e1f1e96033ca986ef6ffe1c8a72fab9a6ab787ed (diff) | |
| parent | eb24e6d3a4a1f1ce9c067c76307edfa3b2f1694d (diff) | |
| download | external_webkit-8dc85313cd382ae58293575cc7c79eb4f8f98db6.zip external_webkit-8dc85313cd382ae58293575cc7c79eb4f8f98db6.tar.gz external_webkit-8dc85313cd382ae58293575cc7c79eb4f8f98db6.tar.bz2 | |
Merge "Use a paint with 80% alpha instead of saveLayer for disabled elements."
| -rw-r--r-- | WebKit/android/RenderSkinRadio.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/WebKit/android/RenderSkinRadio.cpp b/WebKit/android/RenderSkinRadio.cpp index 27c3ce3..a1fc659 100644 --- a/WebKit/android/RenderSkinRadio.cpp +++ b/WebKit/android/RenderSkinRadio.cpp @@ -75,12 +75,11 @@ void RenderSkinRadio::Draw(SkCanvas* canvas, Node* element, const IntRect& ir, // Set up a paint to with filtering to look better. SkPaint paint; paint.setFlags(SkPaint::kFilterBitmap_Flag); - int saveLayerCount = 0; int saveScaleCount = 0; if (!element->isElementNode() || !static_cast<Element*>(element)->isEnabledFormControl()) { - saveLayerCount = canvas->saveLayerAlpha(&r, 0x80); + paint.setAlpha(0x80); } SkScalar width = r.width(); SkScalar scale = SkScalarDiv(width, SIZE); @@ -95,11 +94,7 @@ void RenderSkinRadio::Draw(SkCanvas* canvas, Node* element, const IntRect& ir, canvas->drawBitmap(s_bitmap[checked + 2*(!isCheckBox)], 0, 0, &paint); - if (saveLayerCount != 0) { - canvas->restoreToCount(saveLayerCount); - } else { - canvas->restoreToCount(saveScaleCount); - } + canvas->restoreToCount(saveScaleCount); } } //WebCore |