diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-09-06 18:49:32 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-09-11 12:08:59 +0100 |
| commit | 0748c17e255e46dc9b168711755c5ed8c233b44d (patch) | |
| tree | b196b06d38a0733b304f0facdc9d23f286a59b45 | |
| parent | cde10b3801d3eb42f7c2e5cec01709fac6f0fff4 (diff) | |
| download | external_webkit-0748c17e255e46dc9b168711755c5ed8c233b44d.zip external_webkit-0748c17e255e46dc9b168711755c5ed8c233b44d.tar.gz external_webkit-0748c17e255e46dc9b168711755c5ed8c233b44d.tar.bz2 | |
Merge Webkit at r66666 : Adding Exception code to collapseToStart
From Webkit CL:
http://trac.webkit.org/changeset/66590/trunk/WebCore/page/DOMSelection.cpp
Created a bug so the contributor can have a look at the code after the merge:
http://b/issue?id=2990497
Change-Id: I63480cbcb0b3edfd009e1387b7875d6a5819f60b
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index 87ef809..e7026d7 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -1906,10 +1906,11 @@ String WebViewCore::modifySelection(const String& alter, const String& direction selection->addRange(rangeRef.get()); } + ExceptionCode ec; if (equalIgnoringCase(direction, "forward")) { - selection->collapseToEnd(); + selection->collapseToEnd(ec); } else if (equalIgnoringCase(direction, "backward")) { - selection->collapseToStart(); + selection->collapseToStart(ec); } else { LOGE("Invalid direction: %s", direction.utf8().data()); return String(); |