don't draw layers with history

The history picture and the layers drawn may be out of sync,
so for now, don't draw the layers when the history picture is
drawn.

Also, remove native class check from drawExtras() since it
is already checked by the caller.

fixes http://b/2457350
fixes http://b/2453780

1 files changed, 2 insertions, 2 deletions

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index b13fc75..d29d6f3 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -3136,7 +3136,8 @@ public class WebView extends AbsoluteLayout
     }
 
     private void drawExtras(Canvas canvas, int extras) {
-        if (mNativeClass == 0) return;
+        // If mNativeClass is 0, we should not reach here, so we do not
+        // need to check it again.
         // Currently for each draw we compute the animation values;
         // We may in the future decide to do that independently.
         if (nativeEvaluateLayersAnimations()) {
@@ -3153,7 +3154,6 @@ public class WebView extends AbsoluteLayout
         if (mDrawHistory) {
             canvas.scale(mActualScale, mActualScale);
             canvas.drawPicture(mHistoryPicture);
-            drawExtras(canvas, DRAW_EXTRAS_NONE);
             return;
         }