Index: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java |
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java |
index 5f0f0fefcc5bfd439a086ea1baa684bafbb6b04a..c37dcc33eb05b699773f72b2b6d338c9e3135794 100644 |
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java |
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java |
@@ -227,40 +227,6 @@ public class ContentViewCore |
public void onSmartClipDataExtracted(String text, String html, Rect clipRect); |
} |
- /** |
- * An interface that allows the embedder to be notified of navigation transition |
- * related events and respond to them. |
- */ |
- public interface NavigationTransitionDelegate { |
- /** |
- * Called when the navigation is deferred immediately after the response started. |
- * |
- * @param enteringColor The background color of the entering document, as a String |
- * representing a legal CSS color value. This is inserted into |
- * the transition layer's markup after the entering stylesheets |
- * have been applied. |
- */ |
- public void didDeferAfterResponseStarted(String enteringColor); |
- |
- /** |
- * Called when a navigation transition has been detected, and we need to check |
- * if it's supported. |
- */ |
- public boolean willHandleDeferAfterResponseStarted(); |
- |
- /** |
- * Called when the navigation is deferred immediately after the response |
- * started. |
- */ |
- public void addEnteringStylesheetToTransition(String stylesheet); |
- |
- /** |
- * Notifies that a navigation transition is started for a given frame. |
- * @param frameId A positive, non-zero integer identifying the navigating frame. |
- */ |
- public void didStartNavigationTransitionForFrame(long frameId); |
- } |
- |
private final Context mContext; |
private ViewGroup mContainerView; |
private InternalAccessDelegate mContainerViewInternals; |
@@ -363,8 +329,6 @@ public class ContentViewCore |
private SmartClipDataListener mSmartClipDataListener = null; |
- private NavigationTransitionDelegate mNavigationTransitionDelegate = null; |
- |
// This holds the state of editable text (e.g. contents of <input>, contenteditable) of |
// a focused element. |
// Every time the user, IME, javascript (Blink), autofill etc. modifies the content, the new |
@@ -906,7 +870,8 @@ public class ContentViewCore |
* Stops loading the current web contents. |
*/ |
public void stopLoading() { |
- if (mWebContents != null) mWebContents.stop(); |
+ assert mWebContents != null; |
+ mWebContents.stop(); |
} |
/** |
@@ -915,8 +880,8 @@ public class ContentViewCore |
* @return The URL of the current page. |
*/ |
public String getUrl() { |
- if (mNativeContentViewCore != 0) return nativeGetURL(mNativeContentViewCore); |
- return null; |
+ assert mWebContents != null; |
+ return mWebContents.getUrl(); |
} |
/** |
@@ -925,7 +890,8 @@ public class ContentViewCore |
* @return The title of the current page. |
*/ |
public String getTitle() { |
- return mWebContents == null ? null : mWebContents.getTitle(); |
+ assert mWebContents != null; |
+ return mWebContents.getTitle(); |
} |
/** |
@@ -2152,9 +2118,10 @@ public class ContentViewCore |
mActionMode = null; |
// On ICS, startActionMode throws an NPE when getParent() is null. |
if (mContainerView.getParent() != null) { |
+ assert mWebContents != null; |
mActionMode = mContainerView.startActionMode( |
getContentViewClient().getSelectActionModeCallback(getContext(), actionHandler, |
- nativeIsIncognito(mNativeContentViewCore))); |
+ mWebContents.isIncognito())); |
} |
mUnselectAllOnActionModeDismiss = true; |
if (mActionMode == null) { |
@@ -3060,41 +3027,10 @@ public class ContentViewCore |
} |
} |
- @CalledByNative |
- private void didDeferAfterResponseStarted(String enteringColor) { |
- if (mNavigationTransitionDelegate != null ) { |
- mNavigationTransitionDelegate.didDeferAfterResponseStarted(enteringColor); |
- } |
- } |
- |
- @CalledByNative |
- public void didStartNavigationTransitionForFrame(long frameId) { |
- if (mNavigationTransitionDelegate != null ) { |
- mNavigationTransitionDelegate.didStartNavigationTransitionForFrame(frameId); |
- } |
- } |
- |
- @CalledByNative |
- private boolean willHandleDeferAfterResponseStarted() { |
- if (mNavigationTransitionDelegate == null) return false; |
- return mNavigationTransitionDelegate.willHandleDeferAfterResponseStarted(); |
- } |
- |
@VisibleForTesting |
void setHasPendingNavigationTransitionForTesting() { |
- if (mNativeContentViewCore == 0) return; |
- nativeSetHasPendingNavigationTransitionForTesting(mNativeContentViewCore); |
- } |
- |
- public void setNavigationTransitionDelegate(NavigationTransitionDelegate delegate) { |
- mNavigationTransitionDelegate = delegate; |
- } |
- |
- @CalledByNative |
- private void addEnteringStylesheetToTransition(String stylesheet) { |
- if (mNavigationTransitionDelegate != null ) { |
- mNavigationTransitionDelegate.addEnteringStylesheetToTransition(stylesheet); |
- } |
+ assert mWebContents != null; |
+ mWebContents.setHasPendingNavigationTransitionForTesting(); |
} |
/** |
@@ -3152,8 +3088,8 @@ public class ContentViewCore |
} |
public void resumeResponseDeferredAtStart() { |
- if (mNativeContentViewCore == 0) return; |
- nativeResumeResponseDeferredAtStart(mNativeContentViewCore); |
+ assert mWebContents != null; |
+ mWebContents.resumeResponseDeferredAtStart(); |
} |
/** |
@@ -3188,10 +3124,6 @@ public class ContentViewCore |
boolean canLoadLocalResources, |
boolean isRendererInitiated); |
- private native String nativeGetURL(long nativeContentViewCoreImpl); |
- |
- private native boolean nativeIsIncognito(long nativeContentViewCoreImpl); |
- |
private native void nativeSetFocus(long nativeContentViewCoreImpl, boolean focused); |
private native void nativeSendOrientationChangeEvent( |
@@ -3254,8 +3186,10 @@ public class ContentViewCore |
private native void nativeHideTextHandles(long nativeContentViewCoreImpl); |
private native void nativeResetGestureDetection(long nativeContentViewCoreImpl); |
+ |
private native void nativeSetDoubleTapSupportEnabled( |
long nativeContentViewCoreImpl, boolean enabled); |
+ |
private native void nativeSetMultiTouchZoomSupportEnabled( |
long nativeContentViewCoreImpl, boolean enabled); |
@@ -3275,6 +3209,7 @@ public class ContentViewCore |
private native void nativeSetUseDesktopUserAgent(long nativeContentViewCoreImpl, |
boolean enabled, boolean reloadOnChange); |
+ |
private native boolean nativeGetUseDesktopUserAgent(long nativeContentViewCoreImpl); |
private native void nativeClearSslPreferences(long nativeContentViewCoreImpl); |
@@ -3289,8 +3224,10 @@ public class ContentViewCore |
String name); |
private native int nativeGetNavigationHistory(long nativeContentViewCoreImpl, Object context); |
+ |
private native void nativeGetDirectedNavigationHistory(long nativeContentViewCoreImpl, |
Object context, boolean isForward, int maxEntries); |
+ |
private native String nativeGetOriginalUrlForActiveNavigationEntry( |
long nativeContentViewCoreImpl); |
@@ -3301,10 +3238,6 @@ public class ContentViewCore |
private native void nativeExtractSmartClipData(long nativeContentViewCoreImpl, |
int x, int y, int w, int h); |
- private native void nativeSetBackgroundOpaque(long nativeContentViewCoreImpl, boolean opaque); |
- private native void nativeResumeResponseDeferredAtStart( |
- long nativeContentViewCoreImpl); |
- private native void nativeSetHasPendingNavigationTransitionForTesting( |
- long nativeContentViewCoreImpl); |
+ private native void nativeSetBackgroundOpaque(long nativeContentViewCoreImpl, boolean opaque); |
} |