diff options
author | tedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-10 07:15:09 +0000 |
---|---|---|
committer | tedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-10 07:15:09 +0000 |
commit | 59fab02ce4138015a20efa8e976035e056fc5023 (patch) | |
tree | ef24ad65a12a475ed5f66b4df468c26e5c296ca0 /content | |
parent | 5fd29c1f4972a2300a16860296bdee0e8bf1d02c (diff) | |
download | chromium_src-59fab02ce4138015a20efa8e976035e056fc5023.zip chromium_src-59fab02ce4138015a20efa8e976035e056fc5023.tar.gz chromium_src-59fab02ce4138015a20efa8e976035e056fc5023.tar.bz2 |
Remove no longer used shouldOverrideScroll method in ContentViewClient.
BUG=
Review URL: https://codereview.chromium.org/110603002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239693 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
5 files changed, 0 insertions, 51 deletions
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java index 9aa67b6..cd07115 100644 --- a/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java +++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java @@ -103,20 +103,6 @@ public class ContentViewClient { public void onImeStateChangeRequested(boolean requestShow) { } - // TODO(dtrainor): Should expose getScrollX/Y from ContentView or make - // computeHorizontalScrollOffset()/computeVerticalScrollOffset() public. - /** - * Gives the UI the chance to override each scroll event. - * @param dx The amount scrolled in the X direction (in physical pixels). - * @param dy The amount scrolled in the Y direction (in physical pixels). - * @param scrollX The current X scroll offset (in physical pixels). - * @param scrollY The current Y scroll offset (in physical pixels). - * @return Whether or not the UI consumed and handled this event. - */ - public boolean shouldOverrideScroll(float dx, float dy, float scrollX, float scrollY) { - return false; - } - /** * Returns an ActionMode.Callback for in-page selection. */ 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 0c42df1..e465d49 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 @@ -1562,12 +1562,6 @@ public class ContentViewCore return mContentSettings; } - @Override - public boolean didUIStealScroll(float x, float y) { - return getContentViewClient().shouldOverrideScroll( - x, y, computeHorizontalScrollOffset(), computeVerticalScrollOffset()); - } - private void onRenderCoordinatesUpdated() { if (mContentViewGestureHandler == null) return; diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java index e7da690..445b5a2 100644 --- a/content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java +++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java @@ -242,14 +242,6 @@ class ContentViewGestureHandler implements LongPressDelegate { boolean sendGesture(int type, long timeMs, int x, int y, Bundle extraParams); /** - * Gives the UI the chance to override each scroll event. - * @param x The amount scrolled in the X direction. - * @param y The amount scrolled in the Y direction. - * @return Whether or not the UI consumed and handled this event. - */ - boolean didUIStealScroll(float x, float y); - - /** * Show the zoom picker UI. */ public void invokeZoomPicker(); @@ -355,12 +347,8 @@ class ContentViewGestureHandler implements LongPressDelegate { } } - boolean didUIStealScroll = mMotionEventDelegate.didUIStealScroll( - e2.getRawX() - mLastRawX, e2.getRawY() - mLastRawY); - mLastRawX = e2.getRawX(); mLastRawY = e2.getRawY(); - if (didUIStealScroll) return true; if (!mTouchScrolling) { sendTapCancelIfNecessary(e1); endFlingIfNecessary(e2.getEventTime()); diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java index 9e7c105..1496fb5 100644 --- a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java +++ b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java @@ -128,12 +128,6 @@ public class ContentViewGestureHandlerTest extends InstrumentationTestCase { } @Override - public boolean didUIStealScroll(float x, float y) { - // Not implemented. - return false; - } - - @Override public void invokeZoomPicker() { // Not implemented. } @@ -1171,12 +1165,6 @@ public class ContentViewGestureHandlerTest extends InstrumentationTestCase { } @Override - public boolean didUIStealScroll(float x, float y) { - // Not implemented. - return false; - } - - @Override public void invokeZoomPicker() { // Not implemented. } diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClientWrapper.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClientWrapper.java index 93e4cb8..9cc33cf 100644 --- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClientWrapper.java +++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClientWrapper.java @@ -9,9 +9,7 @@ import android.view.ActionMode; import android.view.KeyEvent; import org.chromium.content.browser.ContentViewClient; -import org.chromium.content.browser.SelectActionModeCallback; import org.chromium.content.browser.SelectActionModeCallback.ActionHandler; -import org.chromium.content.browser.test.util.TestContentViewClient; /** * Simplistic {@link TestContentViewClient} for browser tests. @@ -46,11 +44,6 @@ public class TestContentViewClientWrapper extends TestContentViewClient { } @Override - public boolean shouldOverrideScroll(float deltaX, float deltaY, float currX, float currY) { - return mWrappedClient.shouldOverrideScroll(deltaX, deltaY, currX, currX); - } - - @Override public ActionMode.Callback getSelectActionModeCallback( Context context, ActionHandler actionHandler, boolean incognito) { return mWrappedClient.getSelectActionModeCallback(context, actionHandler, incognito); |