Commit 5e243cee authored by Jinsuk Kim's avatar Jinsuk Kim Committed by Commit Bot

Android: Deletes super_onConfigurationChanged delegate

The call order of |super.onConfigurationChanged| doesn't seem to matter. This
CL deletes the interface method from ContentViewCore.InternalAccessDelegate
and let the embedders call it directly.

Bug: 598880
Change-Id: If0ef9eeb583036846130accbbdd0e71b19ac48b6
Reviewed-on: https://chromium-review.googlesource.com/1053327Reviewed-by: default avatarBo <boliu@chromium.org>
Commit-Queue: Jinsuk Kim <jinsukkim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557436}
parent 3dba9b56
...@@ -203,6 +203,11 @@ public class AwContents implements SmartClipProvider { ...@@ -203,6 +203,11 @@ public class AwContents implements SmartClipProvider {
* @see View#startActivityForResult(Intent, int) * @see View#startActivityForResult(Intent, int)
*/ */
void super_startActivityForResult(Intent intent, int requestCode); void super_startActivityForResult(Intent intent, int requestCode);
/**
* @see View#onConfigurationChanged(Configuration)
*/
void super_onConfigurationChanged(Configuration newConfig);
} }
/** /**
...@@ -3432,6 +3437,7 @@ public class AwContents implements SmartClipProvider { ...@@ -3432,6 +3437,7 @@ public class AwContents implements SmartClipProvider {
public void onConfigurationChanged(Configuration newConfig) { public void onConfigurationChanged(Configuration newConfig) {
if (!isDestroyedOrNoOperation(NO_WARN)) { if (!isDestroyedOrNoOperation(NO_WARN)) {
mContentViewCore.onConfigurationChanged(newConfig); mContentViewCore.onConfigurationChanged(newConfig);
mInternalAccessAdapter.super_onConfigurationChanged(newConfig);
} }
} }
......
...@@ -230,6 +230,7 @@ public class ContentView ...@@ -230,6 +230,7 @@ public class ContentView
protected void onConfigurationChanged(Configuration newConfig) { protected void onConfigurationChanged(Configuration newConfig) {
ContentViewCore cvc = getContentViewCore(); ContentViewCore cvc = getContentViewCore();
if (cvc != null) cvc.onConfigurationChanged(newConfig); if (cvc != null) cvc.onConfigurationChanged(newConfig);
super.onConfigurationChanged(newConfig);
} }
/** /**
...@@ -340,11 +341,6 @@ public class ContentView ...@@ -340,11 +341,6 @@ public class ContentView
return super.onGenericMotionEvent(event); return super.onGenericMotionEvent(event);
} }
@Override
public void super_onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
}
/////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////
// End Implementation of ContentViewCore.InternalAccessDelegate // // End Implementation of ContentViewCore.InternalAccessDelegate //
/////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////
......
...@@ -199,7 +199,6 @@ public class ContentViewCoreImpl implements ContentViewCore { ...@@ -199,7 +199,6 @@ public class ContentViewCoreImpl implements ContentViewCore {
try { try {
TraceEvent.begin("ContentViewCore.onConfigurationChanged"); TraceEvent.begin("ContentViewCore.onConfigurationChanged");
getImeAdapter().onKeyboardConfigurationChanged(newConfig); getImeAdapter().onKeyboardConfigurationChanged(newConfig);
mContainerViewInternals.super_onConfigurationChanged(newConfig);
// To request layout has side effect, but it seems OK as it only happen in // To request layout has side effect, but it seems OK as it only happen in
// onConfigurationChange and layout has to be changed in most case. // onConfigurationChange and layout has to be changed in most case.
ViewAndroidDelegate viewDelegate = mWebContents.getViewAndroidDelegate(); ViewAndroidDelegate viewDelegate = mWebContents.getViewAndroidDelegate();
......
...@@ -69,11 +69,6 @@ public interface ContentViewCore { ...@@ -69,11 +69,6 @@ public interface ContentViewCore {
*/ */
boolean super_onGenericMotionEvent(MotionEvent event); boolean super_onGenericMotionEvent(MotionEvent event);
/**
* @see View#onConfigurationChanged(Configuration)
*/
void super_onConfigurationChanged(Configuration newConfig);
/** /**
* @see View#onScrollChanged(int, int, int, int) * @see View#onScrollChanged(int, int, int, int)
*/ */
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
package org.chromium.content.browser; package org.chromium.content.browser;
import android.content.res.Configuration;
import android.os.SystemClock; import android.os.SystemClock;
import android.support.test.InstrumentationRegistry; import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest; import android.support.test.filters.SmallTest;
...@@ -67,10 +66,6 @@ public class ContentViewScrollingTest { ...@@ -67,10 +66,6 @@ public class ContentViewScrollingTest {
return false; return false;
} }
@Override
public void super_onConfigurationChanged(Configuration newConfig) {
}
@Override @Override
public void onScrollChanged(int lPix, int tPix, int oldlPix, int oldtPix) { public void onScrollChanged(int lPix, int tPix, int oldlPix, int oldtPix) {
synchronized (mLock) { synchronized (mLock) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment