[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
commit-queue at webkit.org
commit-queue at webkit.org
Fri Jan 21 14:39:48 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit 50e394a6db5b47e80a2d298d663a2978e16367e0
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 24 02:53:41 2010 +0000
2010-12-23 Jan Erik Hanssen <jhanssen at sencha.com>
Reviewed by Alexey Proskuryakov.
[Qt] Composition text is not removed from the editor when composition is cancelled
https://bugs.webkit.org/show_bug.cgi?id=29391
Ensure that the composition text is cleared when an empty QInputMethodEvent
is received and the editor is in composition mode.
* editing/input/ime-composition-clearpreedit-expected.txt: Added.
* editing/input/ime-composition-clearpreedit.html: Added.
* platform/gtk/Skipped:
* platform/mac-wk2/Skipped:
* platform/qt-wk2/Skipped:
2010-12-23 Jan Erik Hanssen <jhanssen at sencha.com>
Reviewed by Alexey Proskuryakov.
[Qt] Composition text is not removed from the editor when composition is cancelled
https://bugs.webkit.org/show_bug.cgi?id=29391
Ensure that the composition text is cleared when an empty QInputMethodEvent
is received and the editor is in composition mode.
* Api/qwebpage.cpp:
(QWebPagePrivate::inputMethodEvent):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74605 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5e50e65..f7e0ed4 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2010-12-23 Jan Erik Hanssen <jhanssen at sencha.com>
+
+ Reviewed by Alexey Proskuryakov.
+
+ [Qt] Composition text is not removed from the editor when composition is cancelled
+ https://bugs.webkit.org/show_bug.cgi?id=29391
+
+ Ensure that the composition text is cleared when an empty QInputMethodEvent
+ is received and the editor is in composition mode.
+
+ * editing/input/ime-composition-clearpreedit-expected.txt: Added.
+ * editing/input/ime-composition-clearpreedit.html: Added.
+ * platform/gtk/Skipped:
+ * platform/mac-wk2/Skipped:
+ * platform/qt-wk2/Skipped:
+
2010-12-23 Benjamin Kalman <kalman at chromium.org>
Reviewed by Ryosuke Niwa.
diff --git a/LayoutTests/editing/input/ime-composition-clearpreedit-expected.txt b/LayoutTests/editing/input/ime-composition-clearpreedit-expected.txt
new file mode 100644
index 0000000..c9d82a1
--- /dev/null
+++ b/LayoutTests/editing/input/ime-composition-clearpreedit-expected.txt
@@ -0,0 +1,7 @@
+This tests that clearing a text compose doesn't leave the composed text behild in the text field
+
+To test manually, enable an IME, input characters, clear the compose and see if the input field only contains the initial value
+
+
+SUCCESS COMPOSE
+SUCCESS CLEAR
diff --git a/LayoutTests/editing/input/ime-composition-clearpreedit.html b/LayoutTests/editing/input/ime-composition-clearpreedit.html
new file mode 100644
index 0000000..fe95475
--- /dev/null
+++ b/LayoutTests/editing/input/ime-composition-clearpreedit.html
@@ -0,0 +1,39 @@
+<html>
+<head>
+<title></title>
+</head>
+<body>
+<p>This tests that clearing a text compose doesn't leave the composed text behild in the text field</p>
+<p>To test manually, enable an IME, input characters, clear the compose and see if the input field only contains the initial value</p>
+<input id="test" type="text" value=""/>
+<ul id="console"></ul>
+<script language="javascript" type="text/javascript">
+function log(str) {
+ var li = document.createElement('li');
+ li.appendChild(document.createTextNode(str));
+ var console = document.getElementById('console');
+ console.appendChild(li);
+}
+
+var test = document.getElementById('test');
+test.focus();
+
+if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+
+ // Compose text.
+ textInputController.setMarkedText('5', 5, 1);
+ textInputController.setMarkedText('6', 5, 1);
+ textInputController.setMarkedText('7', 5, 1);
+
+ // Verify that the input field contains the composed value
+ log(test.value == "7" ? "SUCCESS COMPOSE" : "FAILED COMPOSE");
+
+ textInputController.setMarkedText('', 0, 1);
+
+ // Verify that the input field only contains its initial value
+ log(test.value == "" ? "SUCCESS CLEAR" : "FAILED CLEAR");
+}
+</script>
+</body>
+</html>
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 9fcd73f..8e89054 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -4698,6 +4698,7 @@ fast/forms/input-maxlength-ime-preedit.html
fast/text/international/thai-cursor-position.html
fast/events/ime-composition-events-001.html
fast/dom/tab-in-right-alignment.html
+editing/input/ime-composition-clearpreedit.html
# No User Scripts
userscripts/script-not-run-for-fragments.html
diff --git a/LayoutTests/platform/mac-wk2/Skipped b/LayoutTests/platform/mac-wk2/Skipped
index dfddcf8..6214d13 100644
--- a/LayoutTests/platform/mac-wk2/Skipped
+++ b/LayoutTests/platform/mac-wk2/Skipped
@@ -1418,6 +1418,7 @@ http/tests/loading/state-object-security-exception.html
# WebKitTestRunner needs textInputController
# <https://bugs.webkit.org/show_bug.cgi?id=42337>
+editing/input/ime-composition-clearpreedit.html
editing/spelling/spelling-contenteditable.html
editing/spelling/spelling-textarea.html
editing/spelling/spelling-backspace-between-lines.html
diff --git a/LayoutTests/platform/qt-wk2/Skipped b/LayoutTests/platform/qt-wk2/Skipped
index 204b132..ce96a25 100644
--- a/LayoutTests/platform/qt-wk2/Skipped
+++ b/LayoutTests/platform/qt-wk2/Skipped
@@ -1618,6 +1618,7 @@ fast/history/gesture-before-onload-location-href.html
# WebKitTestRunner needs textInputController
# <https://bugs.webkit.org/show_bug.cgi?id=42337>
+editing/input/ime-composition-clearpreedit.html
editing/spelling/spelling-backspace-between-lines.html
editing/selection/5825350-1.html
editing/selection/5825350-2.html
diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index f0124b8..16b5c78 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -1099,6 +1099,8 @@ void QWebPagePrivate::inputMethodEvent(QInputMethodEvent *ev)
editor->confirmComposition(ev->commitString());
else if (!hasSelection && !ev->preeditString().isEmpty())
editor->setComposition(ev->preeditString(), underlines, 0, 0);
+ else if (ev->preeditString().isEmpty() && editor->hasComposition())
+ editor->confirmComposition(String());
ev->accept();
}
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 76a0efe..9d93dbd 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,5 +1,18 @@
2010-12-23 Jan Erik Hanssen <jhanssen at sencha.com>
+ Reviewed by Alexey Proskuryakov.
+
+ [Qt] Composition text is not removed from the editor when composition is cancelled
+ https://bugs.webkit.org/show_bug.cgi?id=29391
+
+ Ensure that the composition text is cleared when an empty QInputMethodEvent
+ is received and the editor is in composition mode.
+
+ * Api/qwebpage.cpp:
+ (QWebPagePrivate::inputMethodEvent):
+
+2010-12-23 Jan Erik Hanssen <jhanssen at sencha.com>
+
Reviewed by Andreas Kling.
[Qt] copy and paste greek symbols to Word, TextEdit results in ?'s being shown
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list