summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-10-26 15:14:51 +0100
committerBen Murdoch <benm@google.com>2011-10-27 13:49:10 +0100
commit0b8560dee52ce9d55cda03caa5f2a3e733b55ba3 (patch)
tree542e59885dab4759209a4f57b706521be2df57bf /Source
parent4476ae7e9e02e5c2ff8a776f01d3fb50e8a4c895 (diff)
downloadexternal_webkit-0b8560dee52ce9d55cda03caa5f2a3e733b55ba3.zip
external_webkit-0b8560dee52ce9d55cda03caa5f2a3e733b55ba3.tar.gz
external_webkit-0b8560dee52ce9d55cda03caa5f2a3e733b55ba3.tar.bz2
Add missing save/restore calls to GraphicsContext::fillRect
Android is missing some calls to GraphicsContext::save/restore inside our GraphicsContext::fillRect implementations. The calls were added to the Skia GraphicsContext in http://trac.webkit.org/changeset/63102 Bug: 5361502 Change-Id: Ifcbc116d997473e3a184561102dc5cb74f5aa5ec
Diffstat (limited to 'Source')
-rw-r--r--Source/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp b/Source/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
index 86e1f63..f647673 100644
--- a/Source/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
@@ -782,6 +782,7 @@ void GraphicsContext::fillRoundedRect(const IntRect& rect, const IntSize& topLef
void GraphicsContext::fillRect(const FloatRect& rect)
{
+ save();
SkPaint paint;
m_data->setupPaintFill(&paint);
@@ -791,6 +792,7 @@ void GraphicsContext::fillRect(const FloatRect& rect)
m_state.fillGradient.get());
GC2CANVAS(this)->drawRect(rect, paint);
+ restore();
}
void GraphicsContext::fillRect(const FloatRect& rect, const Color& color, ColorSpace)
@@ -799,6 +801,7 @@ void GraphicsContext::fillRect(const FloatRect& rect, const Color& color, ColorS
return;
if (color.rgb() & 0xFF000000) {
+ save();
SkPaint paint;
m_data->setupPaintCommon(&paint);
@@ -828,6 +831,7 @@ void GraphicsContext::fillRect(const FloatRect& rect, const Color& color, ColorS
paint.setAntiAlias(false);
GC2CANVAS(this)->drawRect(rect, paint);
+ restore();
}
}