Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7ad6dc27: Merge change 25110 into eclair

Browse Source 
Merge commit '7ad6dc27176a0d3f5374d7d3b9bffda492296237' into eclair-plus-aosp

* commit '7ad6dc27176a0d3f5374d7d3b9bffda492296237':
  synchronize access to pictureReady, copyContentPicture
This commit is contained in:
Cary Clark
2009-09-15 13:51:26 -07:00
committed by Android Git Automerger
parent a338367a92 7ad6dc2717
commit a94341f7c7
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/webkit/WebViewCore.java
View File

@@ -837,9 +837,11 @@ final class WebViewCore {
case DESTROY: case DESTROY:
// Time to take down the world. Cancel all pending // Time to take down the world. Cancel all pending
// loads and destroy the native view and frame. // loads and destroy the native view and frame.
mBrowserFrame.destroy(); synchronized (WebViewCore.this) {
mBrowserFrame = null; mBrowserFrame.destroy();
mNativeClass = 0; mBrowserFrame = null;
mNativeClass = 0;
}
break; break;
case UPDATE_FRAME_CACHE_IF_LOADING: case UPDATE_FRAME_CACHE_IF_LOADING:
@@ -1623,11 +1625,11 @@ final class WebViewCore {
} }
} }
/* package */ boolean pictureReady() { /* package */ synchronized boolean pictureReady() {
return nativePictureReady(); return nativePictureReady();
} }
/*package*/ Picture copyContentPicture() { /*package*/ synchronized Picture copyContentPicture() {
Picture result = new Picture(); Picture result = new Picture();
nativeCopyContentToPicture(result); nativeCopyContentToPicture(result);
return result; return result;