[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:53:25 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit 3ac1c8a9b4a6a096092f2938ede93f4c87fdbc85
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 3 21:16:08 2011 +0000
2011-01-03 Antonio Gomes <agomes at rim.com>
Unreviewed crash fix.
Follow up of r74891: potential crash fix (bogus assertion).
* WebCoreSupport/EditorClientQt.cpp:
(WebCore::editorCommandForKeyDownEvent):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74932 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 25d562a..ecd6442 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-03 Antonio Gomes <agomes at rim.com>
+
+ Unreviewed crash fix.
+
+ Follow up of r74891: potential crash fix (bogus assertion).
+
+ * WebCoreSupport/EditorClientQt.cpp:
+ (WebCore::editorCommandForKeyDownEvent):
+
2011-01-03 Noam Rosenthal <noam.rosenthal at nokia.com>
Reviewed by Andreas Kling.
diff --git a/WebKit/qt/WebCoreSupport/EditorClientQt.cpp b/WebKit/qt/WebCoreSupport/EditorClientQt.cpp
index bff5267..534e334 100644
--- a/WebKit/qt/WebCoreSupport/EditorClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/EditorClientQt.cpp
@@ -377,7 +377,8 @@ static const KeyDownEntry keyDownEntries[] = {
const char* editorCommandForKeyDownEvent(const KeyboardEvent* event)
{
- ASSERT(event->type() == eventNames().keydownEvent);
+ if (event->type() != eventNames().keydownEvent)
+ return "";
static HashMap<int, const char*> keyDownCommandsMap;
if (keyDownCommandsMap.isEmpty()) {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list