Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 07:15:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1384829 - 1. Always perform shadow text actions; r=esawin

Browse Source 
We want to always perform actions on the shadow text side even if a
particular GeckoEditable instance is disconnected from Gecko, because
there could be other users of Editable that still expect the object to
perform valid actions.

MozReview-Commit-ID: 48OIEaPZqUE

--HG--
extra : rebase_source : 1ab86138c81061aeb7ea600497af5290581a9fbc
This commit is contained in:
Jim Chen 2017-09-28 00:14:18 -04:00
parent d3f885c82c
commit 107658fdda
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoEditable.java
View File

@ -451,8 +451,33 @@ final class GeckoEditable extends IGeckoEditableParent.Stub
getConstantName(Action.class, "TYPE_", action.mType) + ")");
}
switch (action.mType) {
case Action.TYPE_EVENT:
case Action.TYPE_SET_HANDLER:
break;
case Action.TYPE_SET_SPAN:
mText.shadowSetSpan(action.mSpanObject, action.mStart,
action.mEnd, action.mSpanFlags);
break;
case Action.TYPE_REMOVE_SPAN:
action.mSpanFlags = mText.getShadowText().getSpanFlags(action.mSpanObject);
mText.shadowRemoveSpan(action.mSpanObject);
break;
case Action.TYPE_REPLACE_TEXT:
mText.shadowReplace(action.mStart, action.mEnd, action.mSequence);
break;
default:
throw new IllegalStateException("Action not processed");
}
// Always perform actions on the shadow text side above, so we still act as a
// valid Editable object, but don't send the actions to Gecko below if we haven't
// been focused or initialized, or we've been destroyed.
if (mFocusedChild == null || mListener == null) {
// We haven't been focused or initialized, or we've been destroyed.
return;
}
@ -480,8 +505,6 @@ final class GeckoEditable extends IGeckoEditableParent.Stub
action.mSpanObject == Selection.SELECTION_START ||
action.mSpanObject == Selection.SELECTION_END);
mText.shadowSetSpan(action.mSpanObject, action.mStart,
action.mEnd, action.mSpanFlags);
action.mSequence = TextUtils.substring(
mText.getShadowText(), action.mStart, action.mEnd);
@ -495,10 +518,8 @@ final class GeckoEditable extends IGeckoEditableParent.Stub
break;
}
case Action.TYPE_REMOVE_SPAN: {
final int flags = mText.getShadowText().getSpanFlags(action.mSpanObject);
final boolean needUpdate = (flags & Spanned.SPAN_INTERMEDIATE) == 0 &&
(flags & Spanned.SPAN_COMPOSING) != 0;
mText.shadowRemoveSpan(action.mSpanObject);
final boolean needUpdate = (action.mSpanFlags & Spanned.SPAN_INTERMEDIATE) == 0 &&
(action.mSpanFlags & Spanned.SPAN_COMPOSING) != 0;
mNeedUpdateComposition |= needUpdate;
if (needUpdate) {
@ -521,7 +542,6 @@ final class GeckoEditable extends IGeckoEditableParent.Stub
// Since we don't have a composition, we can try sending key events.
sendCharKeyEvents(action);
}
mText.shadowReplace(action.mStart, action.mEnd, action.mSequence);
mFocusedChild.onImeReplaceText(
action.mStart, action.mEnd, action.mSequence.toString());
break;