| commit | a6213458ba6a6342c9ec5e5f2da5da22eb0e7706 | [log] [tgz] |
|---|---|---|
| author | Kristian Monsen <kristianm@google.com> | Wed Sep 04 15:38:25 2013 -0700 |
| committer | Kristian Monsen <kristianm@google.com> | Wed Sep 04 16:50:49 2013 -0700 |
| tree | bac12173d4269686ac92d7dc1eedaa08d8164018 | |
| parent | a66d54c9f62ace5182635c4bf74449fb62f9d464 [diff] |
Let getContentHeight be used from any thread Fix for bug 10594869 Change-Id: I94c9840811abb207c23db8816f2e282e7807c746
diff --git a/chromium/java/com/android/webview/chromium/WebViewChromium.java b/chromium/java/com/android/webview/chromium/WebViewChromium.java index f1343c0..4469189 100644 --- a/chromium/java/com/android/webview/chromium/WebViewChromium.java +++ b/chromium/java/com/android/webview/chromium/WebViewChromium.java
@@ -547,7 +547,7 @@ @Override public int getContentHeight() { - checkThread(); + // No checkThread() as it is mostly thread safe (workaround for b/10594869). return mAwContents.getContentHeightCss(); }