[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
tkent at chromium.org
tkent at chromium.org
Wed Dec 22 15:51:07 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 3549109f6425eccdf7dcad3e8b43eefc455faa1e
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 15 05:19:44 2010 +0000
KeyboardEvent::keyIdentifier() should return "const String&"
https://bugs.webkit.org/show_bug.cgi?id=49426
Reviewed by Andreas Kling.
WebCore:
No new tests. This shouldn't change the current behavior.
* dom/KeyboardEvent.h:
(WebCore::KeyboardEvent::keyIdentifier): Change the return type; String -> const String&
* dom/SelectElement.cpp:
(WebCore::SelectElement::menuListDefaultEventHandler):
Change the type of a variable to have keyIdentifier(); String -> const String&
(WebCore::SelectElement::listBoxDefaultEventHandler): ditto.
* html/HTMLInputElement.cpp:
(WebCore::HTMLInputElement::defaultEventHandler): ditto.
(WebCore::HTMLInputElement::handleKeyEventForRange): ditto.
* page/EventHandler.cpp:
(WebCore::EventHandler::handleKeyboardSelectionMovement): ditto.
WebKit/mac:
* WebCoreSupport/WebEditorClient.mm:
(selectorForKeyEvent):
Change the type of a variable to have keyIdentifier(); String -> const String&
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71995 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2ca2eda..effa8a1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,24 @@
+2010-11-14 Kent Tamura <tkent at chromium.org>
+
+ Reviewed by Andreas Kling.
+
+ KeyboardEvent::keyIdentifier() should return "const String&"
+ https://bugs.webkit.org/show_bug.cgi?id=49426
+
+ No new tests. This shouldn't change the current behavior.
+
+ * dom/KeyboardEvent.h:
+ (WebCore::KeyboardEvent::keyIdentifier): Change the return type; String -> const String&
+ * dom/SelectElement.cpp:
+ (WebCore::SelectElement::menuListDefaultEventHandler):
+ Change the type of a variable to have keyIdentifier(); String -> const String&
+ (WebCore::SelectElement::listBoxDefaultEventHandler): ditto.
+ * html/HTMLInputElement.cpp:
+ (WebCore::HTMLInputElement::defaultEventHandler): ditto.
+ (WebCore::HTMLInputElement::handleKeyEventForRange): ditto.
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::handleKeyboardSelectionMovement): ditto.
+
2010-11-14 Kenichi Ishibashi <bashi at google.com>
Reviewed by Kent Tamura.
diff --git a/WebCore/dom/KeyboardEvent.h b/WebCore/dom/KeyboardEvent.h
index 30a2ef0..02f9f63 100644
--- a/WebCore/dom/KeyboardEvent.h
+++ b/WebCore/dom/KeyboardEvent.h
@@ -73,7 +73,7 @@ namespace WebCore {
const String& keyIdentifier, unsigned keyLocation,
bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, bool altGraphKey = false);
- String keyIdentifier() const { return m_keyIdentifier; }
+ const String& keyIdentifier() const { return m_keyIdentifier; }
unsigned keyLocation() const { return m_keyLocation; }
bool getModifierState(const String& keyIdentifier) const;
diff --git a/WebCore/dom/SelectElement.cpp b/WebCore/dom/SelectElement.cpp
index e79dd7d..31368fb 100644
--- a/WebCore/dom/SelectElement.cpp
+++ b/WebCore/dom/SelectElement.cpp
@@ -541,7 +541,7 @@ void SelectElement::menuListDefaultEventHandler(SelectElementData& data, Element
if (!element->renderer() || !event->isKeyboardEvent())
return;
- String keyIdentifier = static_cast<KeyboardEvent*>(event)->keyIdentifier();
+ const String& keyIdentifier = static_cast<KeyboardEvent*>(event)->keyIdentifier();
bool handled = false;
#if ARROW_KEYS_POP_MENU
@@ -746,13 +746,13 @@ void SelectElement::listBoxDefaultEventHandler(SelectElementData& data, Element*
event->setDefaultHandled();
}
- } else if (event->type() == eventNames().mouseupEvent && event->isMouseEvent() && static_cast<MouseEvent*>(event)->button() == LeftButton && element->document()->frame()->eventHandler()->autoscrollRenderer() != element->renderer())
+ } else if (event->type() == eventNames().mouseupEvent && event->isMouseEvent() && static_cast<MouseEvent*>(event)->button() == LeftButton && element->document()->frame()->eventHandler()->autoscrollRenderer() != element->renderer()) {
// This makes sure we fire dispatchFormControlChangeEvent for a single click. For drag selection, onChange will fire when the autoscroll timer stops.
listBoxOnChange(data, element);
- else if (event->type() == eventNames().keydownEvent) {
+ } else if (event->type() == eventNames().keydownEvent) {
if (!event->isKeyboardEvent())
return;
- String keyIdentifier = static_cast<KeyboardEvent*>(event)->keyIdentifier();
+ const String& keyIdentifier = static_cast<KeyboardEvent*>(event)->keyIdentifier();
int endIndex = 0;
if (data.activeSelectionEndIndex() < 0) {
diff --git a/WebCore/html/HTMLInputElement.cpp b/WebCore/html/HTMLInputElement.cpp
index 5406524..c683d49 100644
--- a/WebCore/html/HTMLInputElement.cpp
+++ b/WebCore/html/HTMLInputElement.cpp
@@ -1276,7 +1276,7 @@ void HTMLInputElement::defaultEventHandler(Event* evt)
}
if (hasSpinButton() && evt->type() == eventNames().keydownEvent && evt->isKeyboardEvent()) {
- String key = static_cast<KeyboardEvent*>(evt)->keyIdentifier();
+ const String& key = static_cast<KeyboardEvent*>(evt)->keyIdentifier();
int step = 0;
if (key == "Up")
step = 1;
@@ -1410,7 +1410,7 @@ void HTMLInputElement::defaultEventHandler(Event* evt)
}
if (evt->type() == eventNames().keydownEvent && evt->isKeyboardEvent()) {
- String key = static_cast<KeyboardEvent*>(evt)->keyIdentifier();
+ const String& key = static_cast<KeyboardEvent*>(evt)->keyIdentifier();
if (key == "U+0020") {
switch (deprecatedInputType()) {
@@ -1471,7 +1471,7 @@ void HTMLInputElement::defaultEventHandler(Event* evt)
if (evt->type() == eventNames().keyupEvent && evt->isKeyboardEvent()) {
bool clickElement = false;
- String key = static_cast<KeyboardEvent*>(evt)->keyIdentifier();
+ const String& key = static_cast<KeyboardEvent*>(evt)->keyIdentifier();
if (key == "U+0020") {
switch (deprecatedInputType()) {
@@ -1606,7 +1606,7 @@ void HTMLInputElement::handleKeyEventForRange(KeyboardEvent* event)
{
if (event->type() != eventNames().keydownEvent)
return;
- String key = event->keyIdentifier();
+ const String& key = event->keyIdentifier();
if (key != "Up" && key != "Right" && key != "Down" && key != "Left")
return;
diff --git a/WebCore/page/EventHandler.cpp b/WebCore/page/EventHandler.cpp
index 208d897..18477e8 100644
--- a/WebCore/page/EventHandler.cpp
+++ b/WebCore/page/EventHandler.cpp
@@ -2344,7 +2344,7 @@ void EventHandler::handleKeyboardSelectionMovement(KeyboardEvent* event)
if (!event)
return;
- String key = event->keyIdentifier();
+ const String& key = event->keyIdentifier();
bool isShifted = event->getModifierState("Shift");
bool isOptioned = event->getModifierState("Alt");
bool isCommanded = event->getModifierState("Meta");
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 13b3929..549df93 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-14 Kent Tamura <tkent at chromium.org>
+
+ Reviewed by Andreas Kling.
+
+ KeyboardEvent::keyIdentifier() should return "const String&"
+ https://bugs.webkit.org/show_bug.cgi?id=49426
+
+ * WebCoreSupport/WebEditorClient.mm:
+ (selectorForKeyEvent):
+ Change the type of a variable to have keyIdentifier(); String -> const String&
+
2010-11-12 John Knottenbelt <jknotten at chromium.org>
Reviewed by Steve Block.
diff --git a/WebKit/mac/WebCoreSupport/WebEditorClient.mm b/WebKit/mac/WebCoreSupport/WebEditorClient.mm
index 39b511e..9efa766 100644
--- a/WebKit/mac/WebCoreSupport/WebEditorClient.mm
+++ b/WebKit/mac/WebCoreSupport/WebEditorClient.mm
@@ -643,7 +643,7 @@ static SEL selectorForKeyEvent(KeyboardEvent* event)
// Eventually, we should move all of the auto-fill code down to WebKit and remove the need for this function by
// not relying on the selector in the new implementation.
// The key identifiers are from <http://www.w3.org/TR/DOM-Level-3-Events/keyset.html#KeySet-Set>
- String key = event->keyIdentifier();
+ const String& key = event->keyIdentifier();
if (key == "Up")
return @selector(moveUp:);
if (key == "Down")
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list