commit a770a09ca3346d8ec7cb4cdff90aaf83c8d2c5ff
author Martin Kosiba <mkosiba@android.com> Fri Dec 05 12:54:09 2014
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 05 12:54:10 2014
tree 220da227a445da315f1feb5beea8a4df2561e122
parent 83f6e3dbbf9532ee66cedcc0a67e3eb84b77a120
parent cb0c7574831740c1a54d9de458170b2c0c16ff46

Merge "Fix remaining references to hidden fields."

chromium/java/com/android/webview/chromium/WebViewChromium.java

diff --git a/chromium/java/com/android/webview/chromium/WebViewChromium.java b/chromium/java/com/android/webview/chromium/WebViewChromium.java
index c065988..6cf4238 100644
--- a/chromium/java/com/android/webview/chromium/WebViewChromium.java
+++ b/chromium/java/com/android/webview/chromium/WebViewChromium.java
@@ -319,7 +319,7 @@
         }
 
         AwContentsStatics.setRecordFullDocument(sRecordWholeDocumentEnabledByApi ||
-                mAppTargetSdkVersion < Build.VERSION_CODES.L);
+                mAppTargetSdkVersion < Build.VERSION_CODES.LOLLIPOP);
 
         if (mAppTargetSdkVersion <= Build.VERSION_CODES.KITKAT) {
             // On KK and older versions, JavaScript objects injected via addJavascriptInterface

chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java

diff --git a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
index 79751d8..f54c964 100644
--- a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
+++ b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
@@ -261,7 +261,7 @@
         initPlatSupportLibrary();
         AwBrowserProcess.start(mWebViewDelegate.getApplication());
 
-        if (Build.IS_DEBUGGABLE) {
+        if (isBuildDebuggable()) {
             setWebContentsDebuggingEnabled(true);
         }
 
@@ -362,7 +362,7 @@
                     @Override
                     public void setWebContentsDebuggingEnabled(boolean enable) {
                         // Web Contents debugging is always enabled on debug builds.
-                        if (!Build.IS_DEBUGGABLE) {
+                        if (!isBuildDebuggable()) {
                             WebViewChromiumFactoryProvider.this.
                                     setWebContentsDebuggingEnabled(enable);
                         }