diff options
| author | Kristian Monsen <kristianm@google.com> | 2013-09-04 15:38:25 -0700 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2013-09-05 03:30:23 +0000 |
| commit | 94a8e6a6d7d1b2a6b3718eb91956403ef6b03d9c (patch) | |
| tree | 39e06e17b20a73d52131f5f49ca0f51b76662169 /chromium/java/com/android/webview | |
| parent | e27917ca170c4df6f2a949c58820ac1d841a57e2 (diff) | |
| download | webview-94a8e6a6d7d1b2a6b3718eb91956403ef6b03d9c.tar.gz | |
Let getContentHeight be used from any thread
Fix for bug 10594869
Change-Id: I94c9840811abb207c23db8816f2e282e7807c746
(cherry picked from commit a6213458ba6a6342c9ec5e5f2da5da22eb0e7706)
Diffstat (limited to 'chromium/java/com/android/webview')
| -rw-r--r-- | chromium/java/com/android/webview/chromium/WebViewChromium.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/java/com/android/webview/chromium/WebViewChromium.java b/chromium/java/com/android/webview/chromium/WebViewChromium.java index ab1a8d0..2e49ae9 100644 --- a/chromium/java/com/android/webview/chromium/WebViewChromium.java +++ b/chromium/java/com/android/webview/chromium/WebViewChromium.java @@ -585,7 +585,7 @@ class WebViewChromium implements WebViewProvider, @Override public int getContentHeight() { - checkThread(); + // No checkThread() as it is mostly thread safe (workaround for b/10594869). return mAwContents.getContentHeightCss(); } |