Fix check when setLayerType is called in constructor

BUG: 13514997

Change-Id: I8414b7caf3a7fb6770242dd4d1640ff89c9be26a

1 files changed, 6 insertions, 1 deletions

diff --git a/chromium/java/com/android/webview/chromium/WebViewChromium.java b/chromium/java/com/android/webview/chromium/WebViewChromium.java
index 2927416..316ccdb 100644
--- a/chromium/java/com/android/webview/chromium/WebViewChromium.java
+++ b/chromium/java/com/android/webview/chromium/WebViewChromium.java
@@ -257,6 +257,9 @@ class WebViewChromium implements WebViewProvider,
             // old apps use to enable that behavior is deprecated.
             AwContents.setShouldDownloadFavicons();
         }
+
+        // TODO: This assumes AwContents ignores second Paint param.
+        mAwContents.setLayerType(mWebView.getLayerType(), null);
     }
 
     void startYourEngine() {
@@ -1916,7 +1919,9 @@ class WebViewChromium implements WebViewProvider,
 
     @Override
     public void setLayerType(final int layerType, final Paint paint) {
-        mFactory.startYourEngines(false);
+        // This can be called from WebView constructor in which case mAwContents
+        // is still null. We set the layer type in initForReal in that case.
+        if (mAwContents == null) return;
         if (checkNeedsPost()) {
             ThreadUtils.postOnUiThread(new Runnable() {
                 @Override