am 9f208824: Merge change I7f97011b into eclair-mr2
Merge commit '9f2088240272086cd9eb94d01b1872a1088b76f2' into eclair-mr2-plus-aosp * commit '9f2088240272086cd9eb94d01b1872a1088b76f2': check for native initialization before calling public function
This commit is contained in:
@@ -1721,6 +1721,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);
|
||||||
@@ -2339,6 +2340,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);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2349,6 +2351,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);
|
||||||
@@ -3477,6 +3480,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();
|
||||||
|
|||||||
Reference in New Issue
Block a user