| Index: android_webview/java/src/org/chromium/android_webview/AwContents.java
|
| diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java
|
| index bb4222c87c273f6e8a5a8a32fc91e7805fdd5e50..ed703a2919644cc89ff0c11f3bf68f772dd66773 100644
|
| --- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
|
| +++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
|
| @@ -446,19 +446,17 @@ public class AwContents {
|
|
|
| //--------------------------------------------------------------------------------------------
|
| private class AwComponentCallbacks implements ComponentCallbacks2 {
|
| - @Override
|
| - public void onTrimMemory(int level) {
|
| - if (mNativeAwContents == 0) return;
|
| - nativeTrimMemory(mNativeAwContents, level);
|
| - }
|
| -
|
| - @Override
|
| - public void onLowMemory() {
|
| - }
|
| -
|
| - @Override
|
| - public void onConfigurationChanged(Configuration configuration) {
|
| - }
|
| + @Override
|
| + public void onTrimMemory(int level) {
|
| + if (mNativeAwContents == 0) return;
|
| + nativeTrimMemory(mNativeAwContents, level);
|
| + }
|
| +
|
| + @Override
|
| + public void onLowMemory() {}
|
| +
|
| + @Override
|
| + public void onConfigurationChanged(Configuration configuration) {}
|
| };
|
|
|
| //--------------------------------------------------------------------------------------------
|
| @@ -594,7 +592,7 @@ public class AwContents {
|
|
|
| // The only call to onShow. onHide should never be called.
|
| mContentViewCore.onShow();
|
| - }
|
| + }
|
|
|
| /**
|
| * Called on the "source" AwContents that is opening the popup window to
|
| @@ -886,7 +884,7 @@ public class AwContents {
|
| * ensuring the URL passed in is properly formatted (i.e. the scheme has been added if left
|
| * off during user input).
|
| *
|
| - * @param pararms Parameters for this load.
|
| + * @param params Parameters for this load.
|
| */
|
| public void loadUrl(LoadUrlParams params) {
|
| if (params.getLoadUrlType() == LoadUrlParams.LOAD_TYPE_DATA &&
|
| @@ -918,8 +916,8 @@ public class AwContents {
|
| // Chromium does not use this use code path and the best emulation of this behavior to call
|
| // request visited links once on the first URL load of the WebView.
|
| if (!mHasRequestedVisitedHistoryFromClient) {
|
| - mHasRequestedVisitedHistoryFromClient = true;
|
| - requestVisitedHistoryFromClient();
|
| + mHasRequestedVisitedHistoryFromClient = true;
|
| + requestVisitedHistoryFromClient();
|
| }
|
| }
|
|
|
| @@ -1398,7 +1396,7 @@ public class AwContents {
|
|
|
| @VisibleForTesting
|
| public float getPageScaleFactor() {
|
| - return (float)mPageScaleFactor;
|
| + return mPageScaleFactor;
|
| }
|
|
|
| /**
|
| @@ -1532,8 +1530,8 @@ public class AwContents {
|
|
|
| // Note this will trigger IPC back to browser even if nothing is hit.
|
| nativeRequestNewHitTestDataAt(mNativeAwContents,
|
| - (int)Math.round(event.getX(actionIndex) / mDIPScale),
|
| - (int)Math.round(event.getY(actionIndex) / mDIPScale));
|
| + (int) Math.round(event.getX(actionIndex) / mDIPScale),
|
| + (int) Math.round(event.getY(actionIndex) / mDIPScale));
|
| }
|
|
|
| if (mOverScrollGlow != null && event.getActionMasked() == MotionEvent.ACTION_UP) {
|
| @@ -1595,8 +1593,8 @@ public class AwContents {
|
| mContentViewCore.onDetachedFromWindow();
|
|
|
| if (mComponentCallbacks != null) {
|
| - mContainerView.getContext().unregisterComponentCallbacks(mComponentCallbacks);
|
| - mComponentCallbacks = null;
|
| + mContainerView.getContext().unregisterComponentCallbacks(mComponentCallbacks);
|
| + mComponentCallbacks = null;
|
| }
|
|
|
| mScrollAccessibilityHelper.removePostedCallbacks();
|
| @@ -1948,7 +1946,7 @@ public class AwContents {
|
| float oldPageScaleFactor = mPageScaleFactor;
|
| mPageScaleFactor = pageScaleFactor;
|
| mContentsClient.getCallbackHelper().postOnScaleChangedScaled(
|
| - (float)(oldPageScaleFactor * mDIPScale), (float)(mPageScaleFactor * mDIPScale));
|
| + (float) (oldPageScaleFactor * mDIPScale), (float) (mPageScaleFactor * mDIPScale));
|
| }
|
|
|
| @CalledByNative
|
| @@ -2045,7 +2043,7 @@ public class AwContents {
|
|
|
| private native void nativeAddVisitedLinks(long nativeAwContents, String[] visitedLinks);
|
| private native boolean nativeOnDraw(long nativeAwContents, Canvas canvas,
|
| - boolean isHardwareAccelerated, int scrollX, int ScrollY,
|
| + boolean isHardwareAccelerated, int scrollX, int scrollY,
|
| int clipLeft, int clipTop, int clipRight, int clipBottom);
|
| private native void nativeSetGlobalVisibleRect(long nativeAwContents, int visibleLeft,
|
| int visibleTop, int visibleRight, int visibleBottom);
|
|
|