import java.io.PrintWriter;
import java.io.StringWriter;
import java.lang.ref.WeakReference;
+import java.net.MalformedURLException;
+import java.net.URL;
import org.chromium.base.ActivityState;
import org.chromium.base.ApplicationStatus;
import org.chromium.base.ApplicationStatus.ActivityStateListener;
import org.chromium.base.CommandLine;
-
-import org.xwalk.core.internal.extension.XWalkExtensionManager;
-import org.xwalk.core.internal.extension.XWalkPathHelper;
+import org.xwalk.core.internal.extension.BuiltinXWalkExtensions;
/**
* <p>XWalkViewInternal represents an Android view for web apps/pages. Thus most of attributes
private XWalkContent mContent;
private Activity mActivity;
private Context mContext;
- private XWalkExtensionManager mExtensionManager;
private boolean mIsHidden;
private XWalkActivityStateListener mActivityStateListener;
@XWalkAPI(preWrapperLines = {
" super(${param1}, ${param2});"},
postWrapperLines = {
+ " if (bridge == null) return;",
" addView((FrameLayout)bridge, new FrameLayout.LayoutParams(",
" FrameLayout.LayoutParams.MATCH_PARENT,",
" FrameLayout.LayoutParams.MATCH_PARENT));"})
public XWalkViewInternal(Context context, AttributeSet attrs) {
- super(context, attrs);
+ super(convertContext(context), attrs);
checkThreadSafety();
- mContext = context;
- init(context, attrs);
+ mActivity = (Activity) context;
+ mContext = getContext();
+ init(mContext, attrs);
}
/**
@XWalkAPI(preWrapperLines = {
" super(${param1}, null);"},
postWrapperLines = {
+ " if (bridge == null) return;",
" addView((FrameLayout)bridge, new FrameLayout.LayoutParams(",
" FrameLayout.LayoutParams.MATCH_PARENT,",
" FrameLayout.LayoutParams.MATCH_PARENT));"})
public XWalkViewInternal(Context context, Activity activity) {
- super(context, null);
- checkThreadSafety();
+ super(convertContext(context), null);
+ checkThreadSafety();
// Make sure mActivity is initialized before calling 'init' method.
mActivity = activity;
- mContext = context;
- init(context, null);
+ mContext = getContext();
+ init(mContext, null);
+ }
+
+ private static Context convertContext(Context context) {
+ Context ret = context;
+ Context bridgeContext = ReflectionHelper.getBridgeContext();
+ if (bridgeContext == null || context == null ||
+ bridgeContext.getPackageName().equals(context.getPackageName())) {
+ // Not acrossing package
+ ret = context;
+ } else {
+ ret = new MixedContext(bridgeContext, context);
+ }
+ return ret;
}
/**
return mContext;
}
+ public void completeWindowCreation(XWalkViewInternal newXWalkView) {
+ mContent.supplyContentsForPopup(newXWalkView == null ? null : newXWalkView.mContent);
+ }
+
private void init(Context context, AttributeSet attrs) {
// Initialize chromium resources. Assign them the correct ids in
// xwalk core.
setNotificationService(new XWalkNotificationServiceImpl(context, this));
if (!CommandLine.getInstance().hasSwitch("disable-xwalk-extensions")) {
- // Enable xwalk extension mechanism and start load extensions here.
- // Note that it has to be after above initialization.
- mExtensionManager = new XWalkExtensionManager(context, getActivity());
- mExtensionManager.loadExtensions();
+ BuiltinXWalkExtensions.load(context, getActivity());
+ } else {
+ XWalkPreferencesInternal.setValue(XWalkPreferencesInternal.ENABLE_EXTENSIONS, false);
}
XWalkPathHelper.initialize();
@XWalkAPI
public void onHide() {
if (mContent == null || mIsHidden) return;
- if (null != mExtensionManager) mExtensionManager.onPause();
mContent.onPause();
mIsHidden = true;
}
@XWalkAPI
public void onShow() {
if (mContent == null || !mIsHidden ) return;
- if (null != mExtensionManager) mExtensionManager.onResume();
mContent.onResume();
mIsHidden = false;
}
@XWalkAPI
public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (mContent == null) return;
- if (null != mExtensionManager)
- mExtensionManager.onActivityResult(requestCode, resultCode, data);
mContent.onActivityResult(requestCode, resultCode, data);
}
// TODO(yongsheng): make it static?
@XWalkAPI
public String getAPIVersion() {
- return "2.1";
+ return "3.0";
}
/**
}
/**
- * Enables remote debugging and returns the URL at which the dev tools server is listening
- * for commands. The allowedUid argument can be used to specify the uid of the process that is
- * permitted to connect.
- * TODO(yongsheng): how to enable this in XWalkPreferencesInternal?
- *
- * @hide
+ * Enables remote debugging and returns the URL at which the dev tools
+ * server is listening for commands.
+ * The allowedUid argument can be used to specify the uid of the process
+ * that is permitted to connect.
+ */
+ public void enableRemoteDebugging(int allowedUid) {
+ if (mContent == null) return;
+ checkThreadSafety();
+ mContent.enableRemoteDebugging(allowedUid);
+ }
+
+ /**
+ * Get the websocket url for remote debugging.
+ * @return the web socket url to remote debug this xwalk view.
+ * null will be returned if remote debugging is not enabled.
+ * @since 4.0
*/
- public String enableRemoteDebugging(int allowedUid) {
+ @XWalkAPI
+ public URL getRemoteDebuggingUrl() {
if (mContent == null) return null;
checkThreadSafety();
- return mContent.enableRemoteDebugging(allowedUid);
+ String wsUrl = mContent.getRemoteDebuggingUrl();
+ if (wsUrl == null || wsUrl.isEmpty()) return null;
+
+ try {
+ return new URL(wsUrl);
+ } catch (MalformedURLException e) {
+ return null;
+ }
}
/**
if (mContent == null) return;
ApplicationStatus.unregisterActivityStateListener(mActivityStateListener);
mActivityStateListener = null;
- if (null != mExtensionManager) mExtensionManager.onDestroy();
mContent.destroy();
disableRemoteDebugging();
}
// Enables remote debugging and returns the URL at which the dev tools server is listening
// for commands. Only the current process is allowed to connect to the server.
- String enableRemoteDebugging() {
- return enableRemoteDebugging(mContext.getApplicationInfo().uid);
+ void enableRemoteDebugging() {
+ enableRemoteDebugging(mContext.getApplicationInfo().uid);
}
void disableRemoteDebugging() {
projects / platform / framework / web / crosswalk.git / blobdiff