summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Source/WebCore/platform/android/RenderThemeAndroid.cpp2
-rw-r--r--Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.cpp1
2 files changed, 3 insertions, 0 deletions
diff --git a/Source/WebCore/platform/android/RenderThemeAndroid.cpp b/Source/WebCore/platform/android/RenderThemeAndroid.cpp
index 2ff222a..cda4d51 100644
--- a/Source/WebCore/platform/android/RenderThemeAndroid.cpp
+++ b/Source/WebCore/platform/android/RenderThemeAndroid.cpp
@@ -489,6 +489,7 @@ bool RenderThemeAndroid::paintRadio(RenderObject* obj, const PaintInfo& info, co
borderRect.inflate(-3);
const float cx = borderRect.center().x();
const float cy = borderRect.center().y() - 1;
+ context->setStrokeStyle(SolidStroke);
context->setStrokeColor(borderColor, context->strokeColorSpace());
context->setStrokeThickness(1);
context->setFillColor(Color::transparent, context->fillColorSpace());
@@ -635,6 +636,7 @@ bool RenderThemeAndroid::paintCombo(RenderObject* obj, const PaintInfo& info, c
context->fillRect(FloatRect(bounds.maxX() - arrowSize + 0.5f, bounds.y() + .5f,
arrowSize - 1, bounds.height() - 1));
// outline
+ context->setStrokeStyle(SolidStroke);
context->setStrokeThickness(1.0f);
context->setStrokeColor(Color(defaultBgDark), context->strokeColorSpace());
context->strokeRect(bounds, 1.0f);
diff --git a/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.cpp b/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.cpp
index 03d9b81..867ff56 100644
--- a/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.cpp
+++ b/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.cpp
@@ -1017,6 +1017,7 @@ IntRect PlatformGraphicsContextRecording::calculateCoveredBounds(FloatRect bound
{
if (mRecordingStateStack.last().mOpaqueTrackingDisabled
|| m_state->alpha != 1.0f
+ || (m_state->fillShader != 0 && !m_state->fillShader->isOpaque())
|| (m_state->mode != SkXfermode::kSrc_Mode && m_state->mode != SkXfermode::kSrcOver_Mode)
|| !mCurrentMatrix->rectStaysRect()) {
return IntRect();