Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 188f40d7: Merge change Ibb994bd2 into eclair-mr2

Browse Source 
Merge commit '188f40d705fc50bb94c08c6da95f46b2f6993996' into eclair-mr2-plus-aosp

* commit '188f40d705fc50bb94c08c6da95f46b2f6993996':
  rename nativeFindIsDown to nativeFindIsUp; check for null webkit
This commit is contained in:
Cary Clark
2009-11-18 11:46:42 -08:00
committed by Android Git Automerger
parent 355c4bc31c 188f40d705
commit ad6e111a4a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/webkit/WebView.java
View File

@@ -2428,12 +2428,14 @@ public class WebView extends AbsoluteLayout
* Clear the highlighting surrounding text matches created by findAll. * Clear the highlighting surrounding text matches created by findAll.
*/ */
public void clearMatches() { public void clearMatches() {
if (mNativeClass == 0)
return;
if (mFindIsUp) { if (mFindIsUp) {
recordNewContentSize(mContentWidth, mContentHeight - mFindHeight, recordNewContentSize(mContentWidth, mContentHeight - mFindHeight,
false); false);
mFindIsUp = false; mFindIsUp = false;
} }
nativeSetFindIsDown(); nativeSetFindIsUp();
// Now that the dialog has been removed, ensure that we scroll to a // Now that the dialog has been removed, ensure that we scroll to a
// location that is not beyond the end of the page. // location that is not beyond the end of the page.
pinScrollTo(mScrollX, mScrollY, false, 0); pinScrollTo(mScrollX, mScrollY, false, 0);
@@ -5879,7 +5881,7 @@ public class WebView extends AbsoluteLayout
private native void nativeRecordButtons(boolean focused, private native void nativeRecordButtons(boolean focused,
boolean pressed, boolean invalidate); boolean pressed, boolean invalidate);
private native void nativeSelectBestAt(Rect rect); private native void nativeSelectBestAt(Rect rect);
private native void nativeSetFindIsDown(); private native void nativeSetFindIsUp();
private native void nativeSetFollowedLink(boolean followed); private native void nativeSetFollowedLink(boolean followed);
private native void nativeSetHeightCanMeasure(boolean measure); private native void nativeSetHeightCanMeasure(boolean measure);
// Returns a value corresponding to CachedFrame::ImeAction // Returns a value corresponding to CachedFrame::ImeAction