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

Commit 7ad6dc27 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 25110 into eclair

* changes:
  synchronize access to pictureReady, copyContentPicture
parents d631fedb 674a844f
Loading
Loading
Loading
Loading
+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;