[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:00 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 7fcca6d0f81754478308058511e54617a86c5f45
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 11 20:59:33 2003 +0000
Reviewed by John
In the DOM Level 3 Events specification, keydown and keyup are
standard events. We can remove the KHTML component in the names
of these constants. Note that the keypress event is still
nonstandard and will retain the KHTML name component.
* khtml/ecma/kjs_binding.cpp:
(ScriptInterpreter::wasRunByUserGesture)
* khtml/ecma/kjs_dom.cpp:
(DOMNode::getValueProperty)
(DOMNode::putValue)
* khtml/ecma/kjs_window.cpp:
(Window::get)
(Window::put)
* khtml/html/html_elementimpl.cpp:
(HTMLElementImpl::parseAttribute)
* khtml/html/html_formimpl.cpp:
(HTMLGenericFormElementImpl::defaultEventHandler)
* khtml/html/html_inlineimpl.cpp:
(HTMLAnchorElementImpl::defaultEventHandler)
* khtml/xml/dom2_eventsimpl.cpp:
(EventImpl::typeToId)
(EventImpl::idToType)
(KeyboardEventImpl::KeyboardEventImpl)
* khtml/xml/dom2_eventsimpl.h:
(DOM::EventImpl::)
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5454 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7733d03..43591fb 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,33 @@
+2003-11-11 Ken Kocienda <kocienda at apple.com>
+
+ Reviewed by John
+
+ In the DOM Level 3 Events specification, keydown and keyup are
+ standard events. We can remove the KHTML component in the names
+ of these constants. Note that the keypress event is still
+ nonstandard and will retain the KHTML name component.
+
+ * khtml/ecma/kjs_binding.cpp:
+ (ScriptInterpreter::wasRunByUserGesture)
+ * khtml/ecma/kjs_dom.cpp:
+ (DOMNode::getValueProperty)
+ (DOMNode::putValue)
+ * khtml/ecma/kjs_window.cpp:
+ (Window::get)
+ (Window::put)
+ * khtml/html/html_elementimpl.cpp:
+ (HTMLElementImpl::parseAttribute)
+ * khtml/html/html_formimpl.cpp:
+ (HTMLGenericFormElementImpl::defaultEventHandler)
+ * khtml/html/html_inlineimpl.cpp:
+ (HTMLAnchorElementImpl::defaultEventHandler)
+ * khtml/xml/dom2_eventsimpl.cpp:
+ (EventImpl::typeToId)
+ (EventImpl::idToType)
+ (KeyboardEventImpl::KeyboardEventImpl)
+ * khtml/xml/dom2_eventsimpl.h:
+ (DOM::EventImpl::)
+
2003-11-11 Chris Blumenberg <cblu at apple.com>
Fixed: <rdar://problem/3480281>: drag image of selected text and images include broken images
diff --git a/WebCore/khtml/ecma/kjs_binding.cpp b/WebCore/khtml/ecma/kjs_binding.cpp
index d020524..86d8e0a 100644
--- a/WebCore/khtml/ecma/kjs_binding.cpp
+++ b/WebCore/khtml/ecma/kjs_binding.cpp
@@ -237,8 +237,8 @@ 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::KHTML_KEYDOWN_EVENT || id == DOM::EventImpl::KHTML_KEYPRESS_EVENT ||
- id == DOM::EventImpl::KHTML_KEYUP_EVENT ||
+ id == DOM::EventImpl::KEYDOWN_EVENT || id == DOM::EventImpl::KHTML_KEYPRESS_EVENT ||
+ id == DOM::EventImpl::KEYUP_EVENT ||
// other accepted events
id == DOM::EventImpl::SELECT_EVENT || id == DOM::EventImpl::CHANGE_EVENT ||
id == DOM::EventImpl::FOCUS_EVENT || id == DOM::EventImpl::BLUR_EVENT ||
diff --git a/WebCore/khtml/ecma/kjs_dom.cpp b/WebCore/khtml/ecma/kjs_dom.cpp
index 74db715..86f2f1c 100644
--- a/WebCore/khtml/ecma/kjs_dom.cpp
+++ b/WebCore/khtml/ecma/kjs_dom.cpp
@@ -203,11 +203,11 @@ Value DOMNode::getValueProperty(ExecState *exec, int token) const
case OnFocus:
return getListener(DOM::EventImpl::FOCUS_EVENT);
case OnKeyDown:
- return getListener(DOM::EventImpl::KHTML_KEYDOWN_EVENT);
+ return getListener(DOM::EventImpl::KEYDOWN_EVENT);
case OnKeyPress:
return getListener(DOM::EventImpl::KHTML_KEYPRESS_EVENT);
case OnKeyUp:
- return getListener(DOM::EventImpl::KHTML_KEYUP_EVENT);
+ return getListener(DOM::EventImpl::KEYUP_EVENT);
case OnLoad:
return getListener(DOM::EventImpl::LOAD_EVENT);
case OnMouseDown:
@@ -323,13 +323,13 @@ void DOMNode::putValue(ExecState *exec, int token, const Value& value, int /*att
setListener(exec,DOM::EventImpl::FOCUS_EVENT,value);
break;
case OnKeyDown:
- setListener(exec,DOM::EventImpl::KHTML_KEYDOWN_EVENT,value);
+ setListener(exec,DOM::EventImpl::KEYDOWN_EVENT,value);
break;
case OnKeyPress:
setListener(exec,DOM::EventImpl::KHTML_KEYPRESS_EVENT,value);
break;
case OnKeyUp:
- setListener(exec,DOM::EventImpl::KHTML_KEYUP_EVENT,value);
+ setListener(exec,DOM::EventImpl::KEYUP_EVENT,value);
break;
case OnLoad:
setListener(exec,DOM::EventImpl::LOAD_EVENT,value);
diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index 2cfeffd..f1607fa 100644
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -610,7 +610,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const
return Undefined();
case Onkeydown:
if (isSafeScript(exec))
- return getListener(exec,DOM::EventImpl::KHTML_KEYDOWN_EVENT);
+ return getListener(exec,DOM::EventImpl::KEYDOWN_EVENT);
else
return Undefined();
case Onkeypress:
@@ -620,7 +620,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const
return Undefined();
case Onkeyup:
if (isSafeScript(exec))
- return getListener(exec,DOM::EventImpl::KHTML_KEYUP_EVENT);
+ return getListener(exec,DOM::EventImpl::KEYUP_EVENT);
else
return Undefined();
case Onload:
@@ -806,7 +806,7 @@ void Window::put(ExecState* exec, const Identifier &propertyName, const Value &v
return;
case Onkeydown:
if (isSafeScript(exec))
- setListener(exec,DOM::EventImpl::KHTML_KEYDOWN_EVENT,value);
+ setListener(exec,DOM::EventImpl::KEYDOWN_EVENT,value);
return;
case Onkeypress:
if (isSafeScript(exec))
@@ -814,7 +814,7 @@ void Window::put(ExecState* exec, const Identifier &propertyName, const Value &v
return;
case Onkeyup:
if (isSafeScript(exec))
- setListener(exec,DOM::EventImpl::KHTML_KEYUP_EVENT,value);
+ setListener(exec,DOM::EventImpl::KEYUP_EVENT,value);
return;
case Onload:
if (isSafeScript(exec))
diff --git a/WebCore/khtml/html/html_elementimpl.cpp b/WebCore/khtml/html/html_elementimpl.cpp
index af8f156..28c98bf 100644
--- a/WebCore/khtml/html/html_elementimpl.cpp
+++ b/WebCore/khtml/html/html_elementimpl.cpp
@@ -195,7 +195,7 @@ void HTMLElementImpl::parseAttribute(AttributeImpl *attr)
getDocument()->createHTMLEventListener(attr->value().string()));
break;
case ATTR_ONKEYDOWN:
- setHTMLEventListener(EventImpl::KHTML_KEYDOWN_EVENT,
+ setHTMLEventListener(EventImpl::KEYDOWN_EVENT,
getDocument()->createHTMLEventListener(attr->value().string()));
break;
case ATTR_ONKEYPRESS:
@@ -203,7 +203,7 @@ void HTMLElementImpl::parseAttribute(AttributeImpl *attr)
getDocument()->createHTMLEventListener(attr->value().string()));
break;
case ATTR_ONKEYUP:
- setHTMLEventListener(EventImpl::KHTML_KEYUP_EVENT,
+ setHTMLEventListener(EventImpl::KEYUP_EVENT,
getDocument()->createHTMLEventListener(attr->value().string()));
break;
// other misc attributes
diff --git a/WebCore/khtml/html/html_formimpl.cpp b/WebCore/khtml/html/html_formimpl.cpp
index 20d8f19..1d31e10 100644
--- a/WebCore/khtml/html/html_formimpl.cpp
+++ b/WebCore/khtml/html/html_formimpl.cpp
@@ -889,11 +889,11 @@ void HTMLGenericFormElementImpl::defaultEventHandler(EventImpl *evt)
if (ext)
ext->editableWidgetFocused(widget);
}
- if (evt->id()==EventImpl::MOUSEDOWN_EVENT || evt->id()==EventImpl::KHTML_KEYDOWN_EVENT)
+ if (evt->id()==EventImpl::MOUSEDOWN_EVENT || evt->id()==EventImpl::KEYDOWN_EVENT)
{
setActive();
}
- else if (evt->id() == EventImpl::MOUSEUP_EVENT || evt->id()==EventImpl::KHTML_KEYUP_EVENT)
+ else if (evt->id() == EventImpl::MOUSEUP_EVENT || evt->id()==EventImpl::KEYUP_EVENT)
{
if (m_active)
{
@@ -909,8 +909,8 @@ void HTMLGenericFormElementImpl::defaultEventHandler(EventImpl *evt)
// We don't want this default key event handling, we'll count on
// Cocoa event dispatch if the event doesn't get blocked.
#else
- if (evt->id()==EventImpl::KHTML_KEYDOWN_EVENT ||
- evt->id()==EventImpl::KHTML_KEYUP_EVENT)
+ if (evt->id()==EventImpl::KEYDOWN_EVENT ||
+ evt->id()==EventImpl::KEYUP_EVENT)
{
KeyboardEventImpl * k = static_cast<KeyboardEventImpl *>(evt);
if (k->keyVal() == QChar('\n').unicode() && m_render && m_render->isWidget() && k->qKeyEvent)
diff --git a/WebCore/khtml/html/html_inlineimpl.cpp b/WebCore/khtml/html/html_inlineimpl.cpp
index d87157c..49d4d60 100644
--- a/WebCore/khtml/html/html_inlineimpl.cpp
+++ b/WebCore/khtml/html/html_inlineimpl.cpp
@@ -68,16 +68,16 @@ NodeImpl::Id HTMLAnchorElementImpl::id() const
void HTMLAnchorElementImpl::defaultEventHandler(EventImpl *evt)
{
// React on clicks and on keypresses.
- // Don't make this KHTML_KEYUP_EVENT again, it makes khtml follow links it shouldn't,
+ // Don't make this KEYUP_EVENT again, it makes khtml follow links it shouldn't,
// when pressing Enter in the combo.
if ( ( evt->id() == EventImpl::KHTML_CLICK_EVENT ||
- ( evt->id() == EventImpl::KHTML_KEYDOWN_EVENT && m_focused)) && m_hasAnchor) {
+ ( evt->id() == EventImpl::KEYDOWN_EVENT && m_focused)) && m_hasAnchor) {
MouseEventImpl *e = 0;
if ( evt->id() == EventImpl::KHTML_CLICK_EVENT )
e = static_cast<MouseEventImpl*>( evt );
KeyboardEventImpl *k = 0;
- if (evt->id() == EventImpl::KHTML_KEYDOWN_EVENT)
+ if (evt->id() == EventImpl::KEYDOWN_EVENT)
k = static_cast<KeyboardEventImpl *>( evt );
QString utarget;
diff --git a/WebCore/khtml/xml/dom2_eventsimpl.cpp b/WebCore/khtml/xml/dom2_eventsimpl.cpp
index 2a28759..2f2cf6a 100644
--- a/WebCore/khtml/xml/dom2_eventsimpl.cpp
+++ b/WebCore/khtml/xml/dom2_eventsimpl.cpp
@@ -224,9 +224,9 @@ EventImpl::EventId EventImpl::typeToId(DOMString type)
else if (type == "contextmenu")
return CONTEXTMENU_EVENT;
else if (type == "keydown")
- return KHTML_KEYDOWN_EVENT;
+ return KEYDOWN_EVENT;
else if (type == "keyup")
- return KHTML_KEYUP_EVENT;
+ return KEYUP_EVENT;
else if (type == "textInput")
return TEXTINPUT_EVENT;
// ignore: KHTML_DBLCLICK_EVENT
@@ -295,9 +295,9 @@ DOMString EventImpl::idToType(EventImpl::EventId id)
return "scroll";
case CONTEXTMENU_EVENT:
return "contextmenu";
- case KHTML_KEYDOWN_EVENT:
+ case KEYDOWN_EVENT:
return "keydown";
- case KHTML_KEYUP_EVENT:
+ case KEYUP_EVENT:
return "keyup";
case TEXTINPUT_EVENT:
return "textInput";
@@ -522,7 +522,7 @@ KeyboardEventImpl::KeyboardEventImpl()
}
KeyboardEventImpl::KeyboardEventImpl(QKeyEvent *key, AbstractViewImpl *view)
- : UIEventImpl(key->type() == QEvent::KeyRelease ? KHTML_KEYUP_EVENT : key->isAutoRepeat() ? KHTML_KEYPRESS_EVENT : KHTML_KEYDOWN_EVENT,
+ : UIEventImpl(key->type() == QEvent::KeyRelease ? KEYUP_EVENT : key->isAutoRepeat() ? KHTML_KEYPRESS_EVENT : KEYDOWN_EVENT,
true,true,view,0)
{
m_keyEvent = new QKeyEvent(key->type(), key->key(), key->ascii(), key->state(), key->text(), key->isAutoRepeat(), key->count());
diff --git a/WebCore/khtml/xml/dom2_eventsimpl.h b/WebCore/khtml/xml/dom2_eventsimpl.h
index 39656f7..31bce3b 100644
--- a/WebCore/khtml/xml/dom2_eventsimpl.h
+++ b/WebCore/khtml/xml/dom2_eventsimpl.h
@@ -80,8 +80,8 @@ public:
SCROLL_EVENT,
CONTEXTMENU_EVENT,
// Keyboard events
- KHTML_KEYDOWN_EVENT,
- KHTML_KEYUP_EVENT,
+ KEYDOWN_EVENT,
+ KEYUP_EVENT,
// Text events
TEXTINPUT_EVENT,
// khtml events (not part of DOM)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list