Port Webkit r74089 to GraphicsContextAndroid.

Port the change made to PlatformContextSkia in
http://trac.webkit.org/changeset/74089
to GraphicsContext Android.

This fixes the rendering of inset box shadows.

Bug: 5351383
Change-Id: I7b68c965aec87e610d853a8220468fd8113351e6

1 files changed, 7 insertions, 2 deletions

diff --git a/Source/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp b/Source/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
index e015f5a..86e1f63 100644
--- a/Source/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
@@ -380,12 +380,13 @@ public:
         m_state->antiAliasClipPaths.append(clipPath);
         if (!haveLayerOutstanding) {
             SkRect bounds = clipPath.getBounds();
-            if (m_platformGfxCtx && m_platformGfxCtx->mCanvas)
+            if (m_platformGfxCtx && m_platformGfxCtx->mCanvas) {
                 m_platformGfxCtx->mCanvas->saveLayerAlpha(&bounds, 255,
                     static_cast<SkCanvas::SaveFlags>(SkCanvas::kHasAlphaLayer_SaveFlag
                         | SkCanvas::kFullColorLayer_SaveFlag
                         | SkCanvas::kClipToLayer_SaveFlag));
-            else
+                m_platformGfxCtx->mCanvas->save();
+            } else
                 ASSERT(0);
         }
     }
@@ -395,6 +396,10 @@ public:
         // Anti-aliased clipping:
         //
         // Refer to PlatformContextSkia.cpp's applyAntiAliasedClipPaths() for more details
+
+        if (m_platformGfxCtx && m_platformGfxCtx->mCanvas)
+            m_platformGfxCtx->mCanvas->restore();
+
         SkPaint paint;
         paint.setXfermodeMode(SkXfermode::kClear_Mode);
         paint.setAntiAlias(true);