diff options
6 files changed, 0 insertions, 38 deletions
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java index b9d914e..49f3671 100644 --- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java +++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java @@ -2233,11 +2233,6 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate // AwContents.InternalAccessDelegate implementation -------------------------------------- private class InternalAccessAdapter implements AwContents.InternalAccessDelegate { @Override - public boolean drawChild(Canvas arg0, View arg1, long arg2) { - return false; - } - - @Override public boolean super_onKeyUp(int arg0, KeyEvent arg1) { // Intentional no-op return false; diff --git a/android_webview/java/src/org/chromium/android_webview/FullScreenView.java b/android_webview/java/src/org/chromium/android_webview/FullScreenView.java index 1e548cb..940bec2 100644 --- a/android_webview/java/src/org/chromium/android_webview/FullScreenView.java +++ b/android_webview/java/src/org/chromium/android_webview/FullScreenView.java @@ -195,12 +195,6 @@ public class FullScreenView extends FrameLayout { private class InternalAccessAdapter implements AwContents.InternalAccessDelegate { @Override - public boolean drawChild(Canvas canvas, View child, long drawingTime) { - // Intentional no-op - return false; - } - - @Override public boolean super_onKeyUp(int keyCode, KeyEvent event) { return FullScreenView.super.onKeyUp(keyCode, event); } diff --git a/android_webview/test/shell/src/org/chromium/android_webview/test/AwTestContainerView.java b/android_webview/test/shell/src/org/chromium/android_webview/test/AwTestContainerView.java index ac86473..43baab3 100644 --- a/android_webview/test/shell/src/org/chromium/android_webview/test/AwTestContainerView.java +++ b/android_webview/test/shell/src/org/chromium/android_webview/test/AwTestContainerView.java @@ -435,11 +435,6 @@ public class AwTestContainerView extends FrameLayout { private class InternalAccessAdapter implements AwContents.InternalAccessDelegate { @Override - public boolean drawChild(Canvas canvas, View child, long drawingTime) { - return AwTestContainerView.super.drawChild(canvas, child, drawingTime); - } - - @Override public boolean super_onKeyUp(int keyCode, KeyEvent event) { return AwTestContainerView.super.onKeyUp(keyCode, event); } diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentView.java b/content/public/android/java/src/org/chromium/content/browser/ContentView.java index 0e1c6a7..130978a 100644 --- a/content/public/android/java/src/org/chromium/content/browser/ContentView.java +++ b/content/public/android/java/src/org/chromium/content/browser/ContentView.java @@ -6,7 +6,6 @@ package org.chromium.content.browser; import android.content.Context; import android.content.res.Configuration; -import android.graphics.Canvas; import android.graphics.Rect; import android.os.Build; import android.os.Bundle; @@ -90,12 +89,6 @@ public class ContentView extends FrameLayout // Needed by ContentViewCore.InternalAccessDelegate @Override - public boolean drawChild(Canvas canvas, View child, long drawingTime) { - return super.drawChild(canvas, child, drawingTime); - } - - // Needed by ContentViewCore.InternalAccessDelegate - @Override public void onScrollChanged(int l, int t, int oldl, int oldt) { super.onScrollChanged(l, t, oldl, oldt); } 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 bca0435..9f2b522 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 @@ -16,7 +16,6 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.res.Configuration; import android.graphics.Bitmap; -import android.graphics.Canvas; import android.graphics.Rect; import android.os.Build; import android.os.Bundle; @@ -359,11 +358,6 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Screen @SuppressWarnings("javadoc") public interface InternalAccessDelegate { /** - * @see View#drawChild(Canvas, View, long) - */ - boolean drawChild(Canvas canvas, View child, long drawingTime); - - /** * @see View#onKeyUp(keyCode, KeyEvent) */ boolean super_onKeyUp(int keyCode, KeyEvent event); diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java index f1176e6..6c0fda1 100644 --- a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java +++ b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java @@ -5,13 +5,11 @@ package org.chromium.content.browser; import android.content.res.Configuration; -import android.graphics.Canvas; import android.os.SystemClock; import android.test.suitebuilder.annotation.SmallTest; import android.view.InputDevice; import android.view.KeyEvent; import android.view.MotionEvent; -import android.view.View; import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.UrlUtils; @@ -41,13 +39,6 @@ public class ContentViewScrollingTest extends ContentShellTestBase { private boolean mScrollChanged; private final Object mLock = new Object(); - - - @Override - public boolean drawChild(Canvas canvas, View child, long drawingTime) { - return false; - } - @Override public boolean super_onKeyUp(int keyCode, KeyEvent event) { return false; |