android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java - Issue 418883002: Simplify wrap_contents mode.

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/AndroidViewIntegrationTest.java

Issue 418883002: Simplify wrap_contents mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix findbugs Created 6 years, 4 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/AwSettings.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/AwLayoutSizerTest.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/AndroidViewIntegrationTest.java

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

index a7fdde96d36b3b5b2ac66796634cdbfe81a80cc6..84278da95cafb4504db06acc25ebe25721547e5c 100644

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

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

@@ -343,10 +343,7 @@ public class AndroidViewIntegrationTest extends AwTestBase {

final int expectedWidthCss =

(int) Math.ceil(getRootLayoutWidthOnMainThread() / deviceDIPScale);

- final int expectedHeightCss = contentHeightCss +

- // The second div in the contents is styled to have 150% of the viewport height, hence

- // the 1.5.

- (int) (AwLayoutSizer.FIXED_LAYOUT_HEIGHT * 1.5);

+ final int expectedHeightCss = contentHeightCss;

loadPageOfSizeAndWaitForSizeChange(testContainerView.getAwContents(),

mOnContentSizeChangedHelper, expectedWidthCss, contentHeightCss, true);