summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikhail Naganov <mnaganov@google.com>2013-12-18 10:56:55 +0000
committerBen Murdoch <benm@google.com>2014-01-08 11:48:55 +0000
commitf0f06187a11edc8887aac508c27f28c840764f6f (patch)
tree3ce7dab4f4975b33158e2d47bafa7342506de01d
parentc548c8e47dc1baafa3010c46db0c4ebb26e2b9ca (diff)
downloadandroid_frameworks_webview-f0f06187a11edc8887aac508c27f28c840764f6f.tar.gz
android_frameworks_webview-f0f06187a11edc8887aac508c27f28c840764f6f.tar.bz2
android_frameworks_webview-f0f06187a11edc8887aac508c27f28c840764f6f.zip
Add WebSettings API tracing
(Cherry pick from master-chromium) This seems to be useful for tracking app's interaction with WebView Change-Id: I1a88f4d2296a822a2d1c0afe398fbc621a3352f0 (cherry picked from commit d7ad43dc1ed52dc48532738c950ea825e9b7def0)
-rw-r--r--chromium/java/com/android/webview/chromium/ContentSettingsAdapter.java46
1 files changed, 43 insertions, 3 deletions
diff --git a/chromium/java/com/android/webview/chromium/ContentSettingsAdapter.java b/chromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
index c09a3a1..d34cc88 100644
--- a/chromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
+++ b/chromium/java/com/android/webview/chromium/ContentSettingsAdapter.java
@@ -17,6 +17,7 @@
package com.android.webview.chromium;
import android.util.Log;
+import android.webkit.DebugFlags;
import android.webkit.WebSettings.LayoutAlgorithm;
import android.webkit.WebSettings.PluginState;
import android.webkit.WebSettings.RenderPriority;
@@ -27,7 +28,7 @@ import org.chromium.android_webview.AwSettings;
public class ContentSettingsAdapter extends android.webkit.WebSettings {
- private static final String TAG = ContentSettingsAdapter.class.getSimpleName();
+ private static final String LOGTAG = ContentSettingsAdapter.class.getSimpleName();
private AwSettings mAwSettings;
@@ -54,6 +55,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public void setSupportZoom(boolean support) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setSupportZoom=" + support);
mAwSettings.setSupportZoom(support);
}
@@ -64,6 +66,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public void setBuiltInZoomControls(boolean enabled) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setBuiltInZoomControls=" + enabled);
mAwSettings.setBuiltInZoomControls(enabled);
}
@@ -74,6 +77,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public void setDisplayZoomControls(boolean enabled) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setDisplayZoomControls=" + enabled);
mAwSettings.setDisplayZoomControls(enabled);
}
@@ -84,6 +88,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public void setAllowFileAccess(boolean allow) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setAllowFileAccess=" + allow);
mAwSettings.setAllowFileAccess(allow);
}
@@ -94,6 +99,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public void setAllowContentAccess(boolean allow) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setAllowContentAccess=" + allow);
mAwSettings.setAllowContentAccess(allow);
}
@@ -104,6 +110,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public void setLoadWithOverviewMode(boolean overview) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setLoadWithOverviewMode=" + overview);
mAwSettings.setLoadWithOverviewMode(overview);
}
@@ -136,6 +143,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public void setSaveFormData(boolean save) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setSaveFormData=" + save);
mAwSettings.setSaveFormData(save);
}
@@ -157,6 +165,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public synchronized void setTextZoom(int textZoom) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setTextZoom=" + textZoom);
mAwSettings.setTextZoom(textZoom);
}
@@ -168,7 +177,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public void setDefaultZoom(ZoomDensity zoom) {
if (zoom != ZoomDensity.MEDIUM) {
- Log.w(TAG, "setDefaultZoom not supported, zoom=" + zoom);
+ Log.w(LOGTAG, "setDefaultZoom not supported, zoom=" + zoom);
}
}
@@ -195,7 +204,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
if (ua == 0) {
setUserAgentString(null);
} else {
- Log.w(TAG, "setUserAgent not supported, ua=" + ua);
+ Log.w(LOGTAG, "setUserAgent not supported, ua=" + ua);
}
}
@@ -207,6 +216,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public synchronized void setUseWideViewPort(boolean use) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setUseWideViewPort=" + use);
mAwSettings.setUseWideViewPort(use);
}
@@ -217,6 +227,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public synchronized void setSupportMultipleWindows(boolean support) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setSupportMultipleWindows=" + support);
mAwSettings.setSupportMultipleWindows(support);
}
@@ -251,6 +262,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public synchronized void setStandardFontFamily(String font) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setStandardFontFamily=" + font);
mAwSettings.setStandardFontFamily(font);
}
@@ -261,6 +273,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public synchronized void setFixedFontFamily(String font) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setFixedFontFamily=" + font);
mAwSettings.setFixedFontFamily(font);
}
@@ -271,6 +284,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public synchronized void setSansSerifFontFamily(String font) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setSansSerifFontFamily=" + font);
mAwSettings.setSansSerifFontFamily(font);
}
@@ -281,6 +295,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public synchronized void setSerifFontFamily(String font) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setSerifFontFamily=" + font);
mAwSettings.setSerifFontFamily(font);
}
@@ -291,6 +306,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public synchronized void setCursiveFontFamily(String font) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setCursiveFontFamily=" + font);
mAwSettings.setCursiveFontFamily(font);
}
@@ -301,6 +317,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public synchronized void setFantasyFontFamily(String font) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setFantasyFontFamily=" + font);
mAwSettings.setFantasyFontFamily(font);
}
@@ -311,6 +328,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public synchronized void setMinimumFontSize(int size) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setMinimumFontSize=" + size);
mAwSettings.setMinimumFontSize(size);
}
@@ -321,6 +339,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public synchronized void setMinimumLogicalFontSize(int size) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setMinimumLogicalFontSize=" + size);
mAwSettings.setMinimumLogicalFontSize(size);
}
@@ -331,6 +350,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public synchronized void setDefaultFontSize(int size) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setDefaultFontSize=" + size);
mAwSettings.setDefaultFontSize(size);
}
@@ -341,6 +361,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public synchronized void setDefaultFixedFontSize(int size) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setDefaultFixedFontSize=" + size);
mAwSettings.setDefaultFixedFontSize(size);
}
@@ -351,6 +372,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public synchronized void setLoadsImagesAutomatically(boolean flag) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setLoadsImagesAutomatically=" + flag);
mAwSettings.setLoadsImagesAutomatically(flag);
}
@@ -361,6 +383,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public synchronized void setBlockNetworkImage(boolean flag) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setBlockNetworkImage=" + flag);
mAwSettings.setImagesEnabled(!flag);
}
@@ -371,6 +394,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public synchronized void setBlockNetworkLoads(boolean flag) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setBlockNetworkLoads=" + flag);
mAwSettings.setBlockNetworkLoads(flag);
}
@@ -381,26 +405,31 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public synchronized void setJavaScriptEnabled(boolean flag) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setJavaScriptEnabled=" + flag);
mAwSettings.setJavaScriptEnabled(flag);
}
@Override
public void setAllowUniversalAccessFromFileURLs(boolean flag) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setAllowUniversalAccessFromFileURLs=" + flag);
mAwSettings.setAllowUniversalAccessFromFileURLs(flag);
}
@Override
public void setAllowFileAccessFromFileURLs(boolean flag) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setAllowFileAccessFromFileURLs=" + flag);
mAwSettings.setAllowFileAccessFromFileURLs(flag);
}
@Override
public synchronized void setPluginsEnabled(boolean flag) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setPluginsEnabled=" + flag);
mAwSettings.setPluginsEnabled(flag);
}
@Override
public synchronized void setPluginState(PluginState state) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setPluginState=" + state);
mAwSettings.setPluginState(state);
}
@@ -416,11 +445,13 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public synchronized void setAppCacheEnabled(boolean flag) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setAppCacheEnabled=" + flag);
mAwSettings.setAppCacheEnabled(flag);
}
@Override
public synchronized void setAppCachePath(String appCachePath) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setAppCachePath=" + appCachePath);
mAwSettings.setAppCachePath(appCachePath);
}
@@ -431,11 +462,13 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public synchronized void setDatabaseEnabled(boolean flag) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setDatabaseEnabled=" + flag);
mAwSettings.setDatabaseEnabled(flag);
}
@Override
public synchronized void setDomStorageEnabled(boolean flag) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setDomStorageEnabled=" + flag);
mAwSettings.setDomStorageEnabled(flag);
}
@@ -457,6 +490,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public synchronized void setGeolocationEnabled(boolean flag) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setGeolocationEnabled=" + flag);
mAwSettings.setGeolocationEnabled(flag);
}
@@ -487,6 +521,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public synchronized void setJavaScriptCanOpenWindowsAutomatically(boolean flag) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setJavaScriptCanOpenWindowsAutomatically=" + flag);
mAwSettings.setJavaScriptCanOpenWindowsAutomatically(flag);
}
@@ -497,6 +532,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public synchronized void setDefaultTextEncodingName(String encoding) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setDefaultTextEncodingName=" + encoding);
mAwSettings.setDefaultTextEncodingName(encoding);
}
@@ -507,6 +543,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public synchronized void setUserAgentString(String ua) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setUserAgentString=" + ua);
mAwSettings.setUserAgentString(ua);
}
@@ -517,6 +554,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public void setNeedInitialFocus(boolean flag) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setNeedInitialFocus=" + flag);
mAwSettings.setShouldFocusFirstNode(flag);
}
@@ -527,6 +565,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public void setCacheMode(int mode) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setCacheMode=" + mode);
mAwSettings.setCacheMode(mode);
}
@@ -537,6 +576,7 @@ public class ContentSettingsAdapter extends android.webkit.WebSettings {
@Override
public void setMediaPlaybackRequiresUserGesture(boolean require) {
+ if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setMediaPlaybackRequiresUserGesture=" + require);
mAwSettings.setMediaPlaybackRequiresUserGesture(require);
}