Merge change I4e9fe62b into eclair

* changes:
  do not merge -- original checkin to mr2 here:
This commit is contained in:
Android (Google) Code Review
2009-11-06 14:23:14 -05:00

View File

@@ -1713,6 +1713,7 @@ public class WebView extends AbsoluteLayout
* as the data member with "url" as key. The result can be null. * as the data member with "url" as key. The result can be null.
*/ */
public void requestImageRef(Message msg) { public void requestImageRef(Message msg) {
if (0 == mNativeClass) return; // client isn't initialized
int contentX = viewToContentX((int) mLastTouchX + mScrollX); int contentX = viewToContentX((int) mLastTouchX + mScrollX);
int contentY = viewToContentY((int) mLastTouchY + mScrollY); int contentY = viewToContentY((int) mLastTouchY + mScrollY);
String ref = nativeImageURI(contentX, contentY); String ref = nativeImageURI(contentX, contentY);
@@ -2331,6 +2332,7 @@ public class WebView extends AbsoluteLayout
* @param forward Direction to search. * @param forward Direction to search.
*/ */
public void findNext(boolean forward) { public void findNext(boolean forward) {
if (0 == mNativeClass) return; // client isn't initialized
nativeFindNext(forward); nativeFindNext(forward);
} }
@@ -2341,6 +2343,7 @@ public class WebView extends AbsoluteLayout
* that were found. * that were found.
*/ */
public int findAll(String find) { public int findAll(String find) {
if (0 == mNativeClass) return 0; // client isn't initialized
if (mFindIsUp == false) { if (mFindIsUp == false) {
recordNewContentSize(mContentWidth, mContentHeight + mFindHeight, recordNewContentSize(mContentWidth, mContentHeight + mFindHeight,
false); false);
@@ -3431,6 +3434,7 @@ public class WebView extends AbsoluteLayout
* @hide * @hide
*/ */
public void emulateShiftHeld() { public void emulateShiftHeld() {
if (0 == mNativeClass) return; // client isn't initialized
mExtendSelection = false; mExtendSelection = false;
mShiftIsPressed = true; mShiftIsPressed = true;
nativeHideCursor(); nativeHideCursor();