diff options
| author | Steve Block <steveblock@google.com> | 2010-03-15 11:43:06 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-03-16 22:31:52 +0000 |
| commit | 0b43747206014244c9318868ed199b648918d816 (patch) | |
| tree | e0999062a6bed23ffad5bf73908c49af825a22b7 /core/java/android/webkit/FrameLoader.java | |
| parent | f3c755a079233bc3e4f5d1583fd556fe02663ddb (diff) | |
| download | frameworks_base-0b43747206014244c9318868ed199b648918d816.zip frameworks_base-0b43747206014244c9318868ed199b648918d816.tar.gz frameworks_base-0b43747206014244c9318868ed199b648918d816.tar.bz2 | |
Fix loading from the cache for synchronous requests
This fixes crashes in several XHR layout tests.
Bug: 2218794
Change-Id: Iebe3a2d19f1fa43b8d9c9d7763e818f7195b8ceb
Diffstat (limited to 'core/java/android/webkit/FrameLoader.java')
| -rw-r--r-- | core/java/android/webkit/FrameLoader.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/core/java/android/webkit/FrameLoader.java b/core/java/android/webkit/FrameLoader.java index 303e417..906264a 100644 --- a/core/java/android/webkit/FrameLoader.java +++ b/core/java/android/webkit/FrameLoader.java @@ -262,9 +262,13 @@ class FrameLoader { CacheLoader cacheLoader = new CacheLoader(mListener, result); mListener.setCacheLoader(cacheLoader); - // Load the cached file in a separate thread - WebViewWorker.getHandler().obtainMessage( - WebViewWorker.MSG_ADD_STREAMLOADER, cacheLoader).sendToTarget(); + if (mListener.isSynchronous()) { + cacheLoader.load(); + } else { + // Load the cached file in a separate thread + WebViewWorker.getHandler().obtainMessage( + WebViewWorker.MSG_ADD_STREAMLOADER, cacheLoader).sendToTarget(); + } } /* |