Skip to content

Commit

Permalink
[android_webview] Call super.onMeasure in AwTestContainerView.
Browse files Browse the repository at this point in the history
This essentially reverts http://crrev.com/531583002. The super
call is necessary for measuring children, however the super call
should also happen before the call th mAwContents.onMeasure to
make sure the right set of measuredDimensions are used.

BUG=None
TEST=AndroidWebViewTest
TBR=boliu@chromium.org

Review URL: https://codereview.chromium.org/536873002

Cr-Commit-Position: refs/heads/master@{#293111}
  • Loading branch information
mkosiba authored and Commit bot committed Sep 3, 2014
1 parent 83552e7 commit 0b147e5
Showing 1 changed file with 1 addition and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -304,9 +304,8 @@ public boolean dispatchKeyEvent(KeyEvent event) {

@Override
public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
mAwContents.onMeasure(widthMeasureSpec, heightMeasureSpec);
// This method is intended to be overridden without calling super. Doing so clobbers state
// set by mAwContents.onMeasure.
}

@Override
Expand Down

0 comments on commit 0b147e5

Please sign in to comment.