android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java - Issue 1054203002: Enable NeedsBraces check and fix some checkstyle issues.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java

Issue 1054203002: Enable NeedsBraces check and fix some checkstyle issues. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added if checks Created 5 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « android_webview/java/src/org/chromium/android_webview/permission/AwPermissionRequest.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/ArchiveTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java

index 59b53e317287cbe78ca2edaf3ff9766e95345cc0..77babfe0126e79fc3223b61970bd3ae4fe11fbe4 100644

--- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java

+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java

@@ -100,10 +100,8 @@ public class AndroidScrollIntegrationTest extends AwTestBase {

@Override

public void scrollTo(int x, int y) {

- if (mMaxScrollXPix != -1)

- x = Math.min(mMaxScrollXPix, x);

- if (mMaxScrollYPix != -1)

- y = Math.min(mMaxScrollYPix, y);

+ if (mMaxScrollXPix != -1) x = Math.min(mMaxScrollXPix, x);

+ if (mMaxScrollYPix != -1) y = Math.min(mMaxScrollYPix, y);

super.scrollTo(x, y);

mOnScrollToCallbackHelper.notifyCalled();

}