am 1d51221c: am 4a0b0816: Merge "Don\'t use setupPaintFill for drawBitmap" into jb-dev

* commit '1d51221cb2f00354a8d78776caaaa04347e9b61b':
  Don't use setupPaintFill for drawBitmap

1 files changed, 10 insertions, 0 deletions

diff --git a/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContext.cpp b/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContext.cpp
index 944dc98..3b37693 100644
--- a/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContext.cpp
+++ b/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContext.cpp
@@ -231,6 +231,16 @@ void PlatformGraphicsContext::setAlpha(float alpha)
     m_state->alpha = alpha;
 }
 
+int PlatformGraphicsContext::getNormalizedAlpha() const
+{
+    int alpha = roundf(m_state->alpha * 256);
+    if (alpha > 255)
+        alpha = 255;
+    else if (alpha < 0)
+        alpha = 0;
+    return alpha;
+}
+
 void PlatformGraphicsContext::setCompositeOperation(CompositeOperator op)
 {
     m_state->mode = WebCoreCompositeToSkiaComposite(op);