Upstream version 8.36.161.0

[platform/framework/web/crosswalk.git] / src / xwalk / runtime / android / core_internal / src / org / xwalk / core / internal / XWalkContent.java

diff --git a/src/xwalk/runtime/android/core/src/org/xwalk/core/XWalkContent.java b/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/XWalkContent.java
similarity index 91%
rename from src/xwalk/runtime/android/core/src/org/xwalk/core/XWalkContent.java
rename to src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/XWalkContent.java
index 1591291..03fc848 100644 (file)
--- a/src/xwalk/runtime/android/core/src/org/xwalk/core/XWalkContent.java
+++ b/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/XWalkContent.java
@@ -3,7 +3,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.xwalk.core;
+package org.xwalk.core.internal;
 
 import android.app.Activity;
 import android.content.Context;
@@ -33,22 +33,25 @@ import org.chromium.content.browser.ContentViewRenderView.CompositingSurfaceType
 import org.chromium.content.browser.ContentViewStatics;
 import org.chromium.content.browser.LoadUrlParams;
 import org.chromium.content.browser.NavigationHistory;
+import org.chromium.content.common.CleanupReference;
 import org.chromium.media.MediaPlayerBridge;
 import org.chromium.ui.base.ActivityWindowAndroid;
 
+import org.xwalk.core.JavascriptInterface;
+
 @JNINamespace("xwalk")
 /**
- * This class is the implementation class for XWalkView by calling internal
+ * This class is the implementation class for XWalkViewInternal by calling internal
  * various classes.
  */
-class XWalkContent extends FrameLayout implements XWalkPreferences.KeyValueChangeListener {
+class XWalkContent extends FrameLayout implements XWalkPreferencesInternal.KeyValueChangeListener {
     private static String TAG = "XWalkContent";
     private ContentViewCore mContentViewCore;
     private ContentView mContentView;
     private ContentViewRenderView mContentViewRenderView;
     private ActivityWindowAndroid mWindow;
     private XWalkDevToolsServer mDevToolsServer;
-    private XWalkView mXWalkView;
+    private XWalkViewInternal mXWalkView;
     private XWalkContentsClientBridge mContentsClientBridge;
     private XWalkContentsIoThreadClient mIoThreadClient;
     private XWalkWebContentsDelegateAdapter mXWalkContentsDelegateAdapter;
@@ -59,7 +62,23 @@ class XWalkContent extends FrameLayout implements XWalkPreferences.KeyValueChang
     long mXWalkContent;
     long mWebContents;
 
-    public XWalkContent(Context context, AttributeSet attrs, XWalkView xwView) {
+    private static final class DestroyRunnable implements Runnable {
+        private final long mXWalkContent;
+        private DestroyRunnable(long nativeXWalkContent) {
+            mXWalkContent = nativeXWalkContent;
+        }
+
+        @Override
+        public void run() {
+            nativeDestroy(mXWalkContent);
+        }
+    }
+
+    // Reference to the active mXWalkContent pointer while it is active use
+    // (ie before it is destroyed).
+    private CleanupReference mCleanupReference;
+
+    public XWalkContent(Context context, AttributeSet attrs, XWalkViewInternal xwView) {
         super(context, attrs);
 
         // Initialize the WebContensDelegate.
@@ -73,7 +92,7 @@ class XWalkContent extends FrameLayout implements XWalkPreferences.KeyValueChang
         mWindow = new ActivityWindowAndroid(xwView.getActivity());
 
         // Initialize ContentViewRenderView
-        boolean animated = XWalkPreferences.getValue(XWalkPreferences.ANIMATABLE_XWALK_VIEW);
+        boolean animated = XWalkPreferencesInternal.getValue(XWalkPreferencesInternal.ANIMATABLE_XWALK_VIEW);
         CompositingSurfaceType surfaceType =
                 animated ? CompositingSurfaceType.TEXTURE_VIEW : CompositingSurfaceType.SURFACE_VIEW;
         mContentViewRenderView = new ContentViewRenderView(context, mWindow, surfaceType) {
@@ -90,6 +109,11 @@ class XWalkContent extends FrameLayout implements XWalkPreferences.KeyValueChang
                         FrameLayout.LayoutParams.MATCH_PARENT));
 
         mXWalkContent = nativeInit(mXWalkContentsDelegateAdapter, mContentsClientBridge);
+
+        // The native side object has been bound to this java instance, so now is the time to
+        // bind all the native->java relationships.
+        mCleanupReference = new CleanupReference(this, new DestroyRunnable(mXWalkContent));
+
         mWebContents = nativeGetWebContents(mXWalkContent, mIoThreadClient,
                 mContentsClientBridge.getInterceptNavigationDelegate());
 
@@ -123,7 +147,7 @@ class XWalkContent extends FrameLayout implements XWalkPreferences.KeyValueChang
         MediaPlayerBridge.setResourceLoadingFilter(
                 new XWalkMediaPlayerResourceLoadingFilter());
 
-        XWalkPreferences.load(this);
+        XWalkPreferencesInternal.load(this);
     }
 
     void doLoadUrl(String url, String content) {
@@ -157,10 +181,10 @@ class XWalkContent extends FrameLayout implements XWalkPreferences.KeyValueChang
 
     public void reload(int mode) {
         switch (mode) {
-            case XWalkView.RELOAD_IGNORE_CACHE:
+            case XWalkViewInternal.RELOAD_IGNORE_CACHE:
                 mContentViewCore.reloadIgnoringCache(true);
                 break;
-            case XWalkView.RELOAD_NORMAL:
+            case XWalkViewInternal.RELOAD_NORMAL:
             default:
                 mContentViewCore.reload(true);
         }
@@ -197,11 +221,11 @@ class XWalkContent extends FrameLayout implements XWalkPreferences.KeyValueChang
         mContentViewCore.evaluateJavaScript(script, coreCallback);
     }
 
-    public void setUIClient(XWalkUIClient client) {
+    public void setUIClient(XWalkUIClientInternal client) {
         mContentsClientBridge.setUIClient(client);
     }
 
-    public void setResourceClient(XWalkResourceClient client) {
+    public void setResourceClient(XWalkResourceClientInternal client) {
         mContentsClientBridge.setResourceClient(client);
     }
 
@@ -360,13 +384,13 @@ class XWalkContent extends FrameLayout implements XWalkPreferences.KeyValueChang
         }
     }
 
-    public XWalkNavigationHistory getNavigationHistory() {
-        return new XWalkNavigationHistory(mXWalkView, mContentViewCore.getNavigationHistory());
+    public XWalkNavigationHistoryInternal getNavigationHistory() {
+        return new XWalkNavigationHistoryInternal(mXWalkView, mContentViewCore.getNavigationHistory());
     }
 
     public static final String SAVE_RESTORE_STATE_KEY = "XWALKVIEW_STATE";
 
-    public XWalkNavigationHistory saveState(Bundle outState) {
+    public XWalkNavigationHistoryInternal saveState(Bundle outState) {
         if (outState == null) return null;
 
         byte[] state = nativeGetState(mXWalkContent);
@@ -376,7 +400,7 @@ class XWalkContent extends FrameLayout implements XWalkPreferences.KeyValueChang
         return getNavigationHistory();
     }
 
-    public XWalkNavigationHistory restoreState(Bundle inState) {
+    public XWalkNavigationHistoryInternal restoreState(Bundle inState) {
         if (inState == null) return null;
 
         byte[] state = inState.getByteArray(SAVE_RESTORE_STATE_KEY);
@@ -428,7 +452,7 @@ class XWalkContent extends FrameLayout implements XWalkPreferences.KeyValueChang
     public void destroy() {
         if (mXWalkContent == 0) return;
 
-        XWalkPreferences.unload(this);
+        XWalkPreferencesInternal.unload(this);
         // Reset existing notification service in order to destruct it.
         setNotificationService(null);
         // Remove its children used for page rendering from view hierarchy.
@@ -440,7 +464,8 @@ class XWalkContent extends FrameLayout implements XWalkPreferences.KeyValueChang
         mContentViewRenderView.destroy();
         mContentViewCore.destroy();
 
-        nativeDestroy(mXWalkContent);
+        mCleanupReference.cleanupNow();
+        mCleanupReference = null;
         mXWalkContent = 0;
     }
 
@@ -473,7 +498,7 @@ class XWalkContent extends FrameLayout implements XWalkPreferences.KeyValueChang
             } else {
                 if (isMainFrame && webResourceResponse.getData() == null) {
                     mContentsClientBridge.getCallbackHelper().postOnReceivedError(
-                            XWalkResourceClient.ERROR_UNKNOWN, null, url);
+                            XWalkResourceClientInternal.ERROR_UNKNOWN, null, url);
                 }
                 interceptedRequestData = new InterceptedRequestData(webResourceResponse.getMimeType(),
                                                                     webResourceResponse.getEncoding(),
@@ -586,7 +611,7 @@ class XWalkContent extends FrameLayout implements XWalkPreferences.KeyValueChang
 
     @Override
     public void onKeyValueChanged(String key, boolean value) {
-        if (key == XWalkPreferences.REMOTE_DEBUGGING) {
+        if (key == XWalkPreferencesInternal.REMOTE_DEBUGGING) {
             if (value) enableRemoteDebugging();
             else disableRemoteDebugging();
         }