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

am a94341f7: am 7ad6dc27: Merge change 25110 into eclair

Browse Source 
Merge commit 'a94341f7c777679d6d37d3402315ca73f24bccc1'

* commit 'a94341f7c777679d6d37d3402315ca73f24bccc1':
  synchronize access to pictureReady, copyContentPicture
This commit is contained in:
Cary Clark
2009-09-17 06:40:29 -07:00
committed by Android Git Automerger
parent ce506e1f9f a94341f7c7
commit 167d7e2c61
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:
// Time to take down the world. Cancel all pending
// loads and destroy the native view and frame.
mBrowserFrame.destroy();
mBrowserFrame = null;
mNativeClass = 0;
synchronized (WebViewCore.this) {
mBrowserFrame.destroy();
mBrowserFrame = null;
mNativeClass = 0;
}
break;
case UPDATE_FRAME_CACHE_IF_LOADING:
@@ -1623,11 +1625,11 @@ final class WebViewCore {
}
}
/* package */ boolean pictureReady() {
/* package */ synchronized boolean pictureReady() {
return nativePictureReady();
}
/*package*/ Picture copyContentPicture() {
/*package*/ synchronized Picture copyContentPicture() {
Picture result = new Picture();
nativeCopyContentToPicture(result);
return result;