Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a94341f7 authored by Cary Clark's avatar Cary Clark Committed by Android Git Automerger
Browse files

am 7ad6dc27: Merge change 25110 into eclair 

Merge commit '7ad6dc27' into eclair-plus-aosp

* commit '7ad6dc27':
  synchronize access to pictureReady, copyContentPicture
parents a338367a 7ad6dc27

core/java/android/webkit/WebViewCore.java

+7 −5
Original line number Diff line number Diff line
@@ -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.

                            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;