[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:11:28 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 9681a114b9e98370caffa515e36e60f6953290f1
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 13 19:42:20 2003 +0000
Reviewed by John
Fix for this bug:
<rdar://problem/3480761>: event object type attribute returns
khtml_keypress instead of keypress
Fixed string so that it returns keypress instead of khtml_keypress.
While I was at it, I changed the constant used for this event from
KHTML_KEYPRESS_EVENT to KEYPRESS_EVENT.
* khtml/ecma/kjs_binding.cpp:
(ScriptInterpreter::wasRunByUserGesture): Constant name fixup.
* khtml/ecma/kjs_dom.cpp: Ditto.
(DOMNode::getValueProperty): Ditto.
(DOMNode::putValue): Ditto.
* khtml/ecma/kjs_window.cpp:
(Window::get): Ditto.
(Window::put): Ditto.
* khtml/html/html_elementimpl.cpp:
(HTMLElementImpl::parseAttribute): Ditto.
* khtml/html/html_formimpl.cpp:
(HTMLInputElementImpl::defaultEventHandler): Ditto.
(HTMLSelectElementImpl::defaultEventHandler): Ditto.
* khtml/xml/dom2_eventsimpl.cpp:
(EventImpl::idToType): This is the change that fixes the bug.
(KeyboardEventImpl::KeyboardEventImpl): Constant name fixup.
* khtml/xml/dom2_eventsimpl.h:
(DOM::EventImpl::): Ditto.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5477 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6d1b484..9caea4c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,35 @@
+2003-11-13 Ken Kocienda <kocienda at apple.com>
+
+ Reviewed by John
+
+ Fix for this bug:
+
+ <rdar://problem/3480761>: event object type attribute returns
+ khtml_keypress instead of keypress
+
+ Fixed string so that it returns keypress instead of khtml_keypress.
+ While I was at it, I changed the constant used for this event from
+ KHTML_KEYPRESS_EVENT to KEYPRESS_EVENT.
+
+ * khtml/ecma/kjs_binding.cpp:
+ (ScriptInterpreter::wasRunByUserGesture): Constant name fixup.
+ * khtml/ecma/kjs_dom.cpp: Ditto.
+ (DOMNode::getValueProperty): Ditto.
+ (DOMNode::putValue): Ditto.
+ * khtml/ecma/kjs_window.cpp:
+ (Window::get): Ditto.
+ (Window::put): Ditto.
+ * khtml/html/html_elementimpl.cpp:
+ (HTMLElementImpl::parseAttribute): Ditto.
+ * khtml/html/html_formimpl.cpp:
+ (HTMLInputElementImpl::defaultEventHandler): Ditto.
+ (HTMLSelectElementImpl::defaultEventHandler): Ditto.
+ * khtml/xml/dom2_eventsimpl.cpp:
+ (EventImpl::idToType): This is the change that fixes the bug.
+ (KeyboardEventImpl::KeyboardEventImpl): Constant name fixup.
+ * khtml/xml/dom2_eventsimpl.h:
+ (DOM::EventImpl::): Ditto.
+
2003-11-13 Darin Adler <darin at apple.com>
Reviewed by Ken.
diff --git a/WebCore/khtml/ecma/kjs_binding.cpp b/WebCore/khtml/ecma/kjs_binding.cpp
index 86d8e0a..00818f8 100644
--- a/WebCore/khtml/ecma/kjs_binding.cpp
+++ b/WebCore/khtml/ecma/kjs_binding.cpp
@@ -237,7 +237,7 @@ bool ScriptInterpreter::wasRunByUserGesture() const
id == DOM::EventImpl::MOUSEUP_EVENT || id == DOM::EventImpl::KHTML_DBLCLICK_EVENT ||
id == DOM::EventImpl::KHTML_CLICK_EVENT ||
// keyboard events
- id == DOM::EventImpl::KEYDOWN_EVENT || id == DOM::EventImpl::KHTML_KEYPRESS_EVENT ||
+ id == DOM::EventImpl::KEYDOWN_EVENT || id == DOM::EventImpl::KEYPRESS_EVENT ||
id == DOM::EventImpl::KEYUP_EVENT ||
// other accepted events
id == DOM::EventImpl::SELECT_EVENT || id == DOM::EventImpl::CHANGE_EVENT ||
diff --git a/WebCore/khtml/ecma/kjs_dom.cpp b/WebCore/khtml/ecma/kjs_dom.cpp
index 86f2f1c..5e588fb 100644
--- a/WebCore/khtml/ecma/kjs_dom.cpp
+++ b/WebCore/khtml/ecma/kjs_dom.cpp
@@ -205,7 +205,7 @@ Value DOMNode::getValueProperty(ExecState *exec, int token) const
case OnKeyDown:
return getListener(DOM::EventImpl::KEYDOWN_EVENT);
case OnKeyPress:
- return getListener(DOM::EventImpl::KHTML_KEYPRESS_EVENT);
+ return getListener(DOM::EventImpl::KEYPRESS_EVENT);
case OnKeyUp:
return getListener(DOM::EventImpl::KEYUP_EVENT);
case OnLoad:
@@ -326,7 +326,7 @@ void DOMNode::putValue(ExecState *exec, int token, const Value& value, int /*att
setListener(exec,DOM::EventImpl::KEYDOWN_EVENT,value);
break;
case OnKeyPress:
- setListener(exec,DOM::EventImpl::KHTML_KEYPRESS_EVENT,value);
+ setListener(exec,DOM::EventImpl::KEYPRESS_EVENT,value);
break;
case OnKeyUp:
setListener(exec,DOM::EventImpl::KEYUP_EVENT,value);
diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index e1e1baa..0ac73b6 100644
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -615,7 +615,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const
return Undefined();
case Onkeypress:
if (isSafeScript(exec))
- return getListener(exec,DOM::EventImpl::KHTML_KEYPRESS_EVENT);
+ return getListener(exec,DOM::EventImpl::KEYPRESS_EVENT);
else
return Undefined();
case Onkeyup:
@@ -810,7 +810,7 @@ void Window::put(ExecState* exec, const Identifier &propertyName, const Value &v
return;
case Onkeypress:
if (isSafeScript(exec))
- setListener(exec,DOM::EventImpl::KHTML_KEYPRESS_EVENT,value);
+ setListener(exec,DOM::EventImpl::KEYPRESS_EVENT,value);
return;
case Onkeyup:
if (isSafeScript(exec))
diff --git a/WebCore/khtml/html/html_elementimpl.cpp b/WebCore/khtml/html/html_elementimpl.cpp
index 8de86c5..d464897 100644
--- a/WebCore/khtml/html/html_elementimpl.cpp
+++ b/WebCore/khtml/html/html_elementimpl.cpp
@@ -199,7 +199,7 @@ void HTMLElementImpl::parseAttribute(AttributeImpl *attr)
getDocument()->createHTMLEventListener(attr->value().string()));
break;
case ATTR_ONKEYPRESS:
- setHTMLEventListener(EventImpl::KHTML_KEYPRESS_EVENT,
+ setHTMLEventListener(EventImpl::KEYPRESS_EVENT,
getDocument()->createHTMLEventListener(attr->value().string()));
break;
case ATTR_ONKEYUP:
diff --git a/WebCore/khtml/html/html_formimpl.cpp b/WebCore/khtml/html/html_formimpl.cpp
index 0d472bb..c058060 100644
--- a/WebCore/khtml/html/html_formimpl.cpp
+++ b/WebCore/khtml/html/html_formimpl.cpp
@@ -1768,7 +1768,7 @@ void HTMLInputElementImpl::defaultEventHandler(EventImpl *evt)
#if APPLE_CHANGES
// Use key press event here since sending simulated mouse events
// on key down blocks the proper sending of the key press event.
- if (evt->id() == EventImpl::KHTML_KEYPRESS_EVENT) {
+ if (evt->id() == EventImpl::KEYPRESS_EVENT) {
if (!m_form || !m_render || !evt->isKeyboardEvent())
return;
@@ -2315,7 +2315,7 @@ void HTMLSelectElementImpl::defaultEventHandler(EventImpl *evt)
{
// Use key press event here since sending simulated mouse events
// on key down blocks the proper sending of the key press event.
- if (evt->id() == EventImpl::KHTML_KEYPRESS_EVENT) {
+ if (evt->id() == EventImpl::KEYPRESS_EVENT) {
if (!m_form || !m_render || !evt->isKeyboardEvent())
return;
diff --git a/WebCore/khtml/xml/dom2_eventsimpl.cpp b/WebCore/khtml/xml/dom2_eventsimpl.cpp
index dfddeef..62b7c2a 100644
--- a/WebCore/khtml/xml/dom2_eventsimpl.cpp
+++ b/WebCore/khtml/xml/dom2_eventsimpl.cpp
@@ -299,6 +299,8 @@ DOMString EventImpl::idToType(EventImpl::EventId id)
return "keydown";
case KEYUP_EVENT:
return "keyup";
+ case KEYPRESS_EVENT:
+ return "keypress";
case TEXTINPUT_EVENT:
return "textInput";
// khtml extensions
@@ -310,8 +312,6 @@ DOMString EventImpl::idToType(EventImpl::EventId id)
return "khtml_dragdrop";
case KHTML_ERROR_EVENT:
return "khtml_error";
- case KHTML_KEYPRESS_EVENT:
- return "khtml_keypress";
case KHTML_MOVE_EVENT:
return "khtml_move";
case KHTML_ORIGCLICK_MOUSEUP_EVENT:
@@ -522,7 +522,7 @@ KeyboardEventImpl::KeyboardEventImpl()
}
KeyboardEventImpl::KeyboardEventImpl(QKeyEvent *key, AbstractViewImpl *view)
- : UIEventImpl(key->type() == QEvent::KeyRelease ? KEYUP_EVENT : key->isAutoRepeat() ? KHTML_KEYPRESS_EVENT : KEYDOWN_EVENT,
+ : UIEventImpl(key->type() == QEvent::KeyRelease ? KEYUP_EVENT : key->isAutoRepeat() ? KEYPRESS_EVENT : KEYDOWN_EVENT,
true,true,view,0)
{
#if APPLE_CHANGES
diff --git a/WebCore/khtml/xml/dom2_eventsimpl.h b/WebCore/khtml/xml/dom2_eventsimpl.h
index 31bce3b..26556f9 100644
--- a/WebCore/khtml/xml/dom2_eventsimpl.h
+++ b/WebCore/khtml/xml/dom2_eventsimpl.h
@@ -89,7 +89,7 @@ public:
KHTML_CLICK_EVENT, // for html onclick
KHTML_DRAGDROP_EVENT,
KHTML_ERROR_EVENT,
- KHTML_KEYPRESS_EVENT,
+ KEYPRESS_EVENT,
KHTML_MOVE_EVENT,
KHTML_ORIGCLICK_MOUSEUP_EVENT
};
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list