[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:10:20 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 81a3066d362522dc937f1663b061dc5f50139c0c
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Nov 8 17:39:17 2003 +0000
Reviewed by Richard.
- event cleanup motivated by questions on khtml-devel
* khtml/dom/dom2_events.h: Removed eventModuleName.
* khtml/dom/dom2_events.cpp: Removed eventModuleName.
* khtml/xml/dom2_eventsimpl.h: Removed eventModuleName, made many trivially simple
functions inline, made virtual functions no longer inline. Also made some functions const.
(DOM::EventImpl::propagationStopped): Made this non-virtual; there was no reason for
it to be virtual I could see.
(DOM::EventImpl::defaultPrevented): Ditto.
(DOM::EventImpl::setDefaultHandled): Ditto.
(DOM::UIEventImpl::view): Made this inline.
(DOM::UIEventImpl::detail): Ditto.
(DOM::MouseEventImpl::screenX): Ditto.
(DOM::MouseEventImpl::screenY): Ditto.
(DOM::MouseEventImpl::clientX): Ditto.
(DOM::MouseEventImpl::clientY): Ditto.
(DOM::MouseEventImpl::layerX): Ditto.
(DOM::MouseEventImpl::layerY): Ditto.
(DOM::MouseEventImpl::ctrlKey): Ditto.
(DOM::MouseEventImpl::shiftKey): Ditto.
(DOM::MouseEventImpl::altKey): Ditto.
(DOM::MouseEventImpl::metaKey): Ditto.
(DOM::MouseEventImpl::button): Ditto.
(DOM::MouseEventImpl::relatedTarget): Ditto.
(DOM::MutationEventImpl::relatedNode): Ditto.
(DOM::MutationEventImpl::prevValue): Ditto.
(DOM::MutationEventImpl::newValue): Ditto.
(DOM::MutationEventImpl::attrName): Ditto.
(DOM::MutationEventImpl::attrChange): Ditto.
* khtml/ecma/kjs_events.cpp: (KJS::getDOMEvent): Changed implementation to no longer
require eventModuleName(), and removed some unneeded casts.
* khtml/xml/dom2_eventsimpl.cpp: Made lots of functions inline.
(EventImpl::isUIEvent): Since this is virtual, make it no longer inline.
(EventImpl::isMouseEvent): Ditto.
(EventImpl::isMutationEvent): Ditto.
(EventImpl::isKeyboardEvent): Ditto.
(UIEventImpl::isUIEvent): Ditto.
(MouseEventImpl::isMouseEvent): Ditto.
(KeyboardEventImpl::isKeyboardEvent): Ditto.
(MutationEventImpl::isMutationEvent): Ditto.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5427 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8561bbf..4c4a7b3 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,51 @@
+2003-11-08 Darin Adler <darin at apple.com>
+
+ Reviewed by Richard.
+
+ - event cleanup motivated by questions on khtml-devel
+
+ * khtml/dom/dom2_events.h: Removed eventModuleName.
+ * khtml/dom/dom2_events.cpp: Removed eventModuleName.
+
+ * khtml/xml/dom2_eventsimpl.h: Removed eventModuleName, made many trivially simple
+ functions inline, made virtual functions no longer inline. Also made some functions const.
+ (DOM::EventImpl::propagationStopped): Made this non-virtual; there was no reason for
+ it to be virtual I could see.
+ (DOM::EventImpl::defaultPrevented): Ditto.
+ (DOM::EventImpl::setDefaultHandled): Ditto.
+ (DOM::UIEventImpl::view): Made this inline.
+ (DOM::UIEventImpl::detail): Ditto.
+ (DOM::MouseEventImpl::screenX): Ditto.
+ (DOM::MouseEventImpl::screenY): Ditto.
+ (DOM::MouseEventImpl::clientX): Ditto.
+ (DOM::MouseEventImpl::clientY): Ditto.
+ (DOM::MouseEventImpl::layerX): Ditto.
+ (DOM::MouseEventImpl::layerY): Ditto.
+ (DOM::MouseEventImpl::ctrlKey): Ditto.
+ (DOM::MouseEventImpl::shiftKey): Ditto.
+ (DOM::MouseEventImpl::altKey): Ditto.
+ (DOM::MouseEventImpl::metaKey): Ditto.
+ (DOM::MouseEventImpl::button): Ditto.
+ (DOM::MouseEventImpl::relatedTarget): Ditto.
+ (DOM::MutationEventImpl::relatedNode): Ditto.
+ (DOM::MutationEventImpl::prevValue): Ditto.
+ (DOM::MutationEventImpl::newValue): Ditto.
+ (DOM::MutationEventImpl::attrName): Ditto.
+ (DOM::MutationEventImpl::attrChange): Ditto.
+
+ * khtml/ecma/kjs_events.cpp: (KJS::getDOMEvent): Changed implementation to no longer
+ require eventModuleName(), and removed some unneeded casts.
+
+ * khtml/xml/dom2_eventsimpl.cpp: Made lots of functions inline.
+ (EventImpl::isUIEvent): Since this is virtual, make it no longer inline.
+ (EventImpl::isMouseEvent): Ditto.
+ (EventImpl::isMutationEvent): Ditto.
+ (EventImpl::isKeyboardEvent): Ditto.
+ (UIEventImpl::isUIEvent): Ditto.
+ (MouseEventImpl::isMouseEvent): Ditto.
+ (KeyboardEventImpl::isKeyboardEvent): Ditto.
+ (MutationEventImpl::isMutationEvent): Ditto.
+
2003-11-07 Chris Blumenberg <cblu at apple.com>
Fixed: <rdar://problem/3020196>: links with href="" don't show hand cursor when you mouse over them
diff --git a/WebCore/khtml/dom/dom2_events.cpp b/WebCore/khtml/dom/dom2_events.cpp
index 240b622..b6b6b19 100644
--- a/WebCore/khtml/dom/dom2_events.cpp
+++ b/WebCore/khtml/dom/dom2_events.cpp
@@ -169,14 +169,6 @@ bool Event::isNull() const
return (impl == 0);
}
-DOMString Event::eventModuleName()
-{
- if (!impl)
- throw DOMException(DOMException::INVALID_STATE_ERR);
-
- return impl->eventModuleName();
-}
-
void Event::setCancelBubble(bool cancel)
{
if (!impl)
diff --git a/WebCore/khtml/dom/dom2_events.h b/WebCore/khtml/dom/dom2_events.h
index 301e93e..3c5bd19 100644
--- a/WebCore/khtml/dom/dom2_events.h
+++ b/WebCore/khtml/dom/dom2_events.h
@@ -249,15 +249,6 @@ public:
EventImpl *handle() const;
bool isNull() const;
- /**
- * @internal
- * not part of the DOM
- *
- * Returns the module name of the event - this is the same as passed to
- * Document::createEvent() (e.g. UIEvents)
- */
- DOMString eventModuleName();
-
/* Nonstandard extensions needed to support widely used JS event properties */
void setCancelBubble(bool cancel);
void setDefaultPrevented(bool returnValue);
diff --git a/WebCore/khtml/ecma/kjs_events.cpp b/WebCore/khtml/ecma/kjs_events.cpp
index b523184..b1cdb96 100644
--- a/WebCore/khtml/ecma/kjs_events.cpp
+++ b/WebCore/khtml/ecma/kjs_events.cpp
@@ -375,26 +375,25 @@ Value DOMEventProtoFunc::tryCall(ExecState *exec, Object & thisObj, const List &
Value KJS::getDOMEvent(ExecState *exec, DOM::Event e)
{
- DOMObject *ret;
- if (e.isNull())
+ DOM::EventImpl *ei = e.handle();
+ if (!ei)
return Null();
ScriptInterpreter* interp = static_cast<ScriptInterpreter *>(exec->interpreter());
- if ((ret = interp->getDOMObject(e.handle())))
- return Value(ret);
-
- DOM::DOMString module = e.eventModuleName();
- if (e.handle()->isKeyboardEvent())
- ret = new DOMKeyboardEvent(exec, static_cast<DOM::KeyboardEvent>(e));
- else if (module == "UIEvents")
- ret = new DOMUIEvent(exec, static_cast<DOM::UIEvent>(e));
- else if (module == "MouseEvents")
- ret = new DOMMouseEvent(exec, static_cast<DOM::MouseEvent>(e));
- else if (module == "MutationEvents")
- ret = new DOMMutationEvent(exec, static_cast<DOM::MutationEvent>(e));
- else
- ret = new DOMEvent(exec, e);
-
- interp->putDOMObject(e.handle(),ret);
+ DOMObject *ret = interp->getDOMObject(ei);
+ if (!ret) {
+ if (ei->isKeyboardEvent())
+ ret = new DOMKeyboardEvent(exec, e);
+ else if (ei->isMouseEvent())
+ ret = new DOMMouseEvent(exec, e);
+ else if (ei->isUIEvent())
+ ret = new DOMUIEvent(exec, e);
+ else if (ei->isMutationEvent())
+ ret = new DOMMutationEvent(exec, e);
+ else
+ ret = new DOMEvent(exec, e);
+
+ interp->putDOMObject(ei, ret);
+ }
return Value(ret);
}
diff --git a/WebCore/khtml/xml/dom2_eventsimpl.cpp b/WebCore/khtml/xml/dom2_eventsimpl.cpp
index 1e72c2f..2a28759 100644
--- a/WebCore/khtml/xml/dom2_eventsimpl.cpp
+++ b/WebCore/khtml/xml/dom2_eventsimpl.cpp
@@ -322,9 +322,24 @@ DOMString EventImpl::idToType(EventImpl::EventId id)
}
}
-void EventImpl::setDefaultHandled()
+bool EventImpl::isUIEvent() const
{
- m_defaultHandled = true;
+ return false;
+}
+
+bool EventImpl::isMouseEvent() const
+{
+ return false;
+}
+
+bool EventImpl::isMutationEvent() const
+{
+ return false;
+}
+
+bool EventImpl::isKeyboardEvent() const
+{
+ return false;
}
// -----------------------------------------------------------------------------
@@ -351,16 +366,6 @@ UIEventImpl::~UIEventImpl()
m_view->deref();
}
-AbstractViewImpl *UIEventImpl::view() const
-{
- return m_view;
-}
-
-long UIEventImpl::detail() const
-{
- return m_detail;
-}
-
void UIEventImpl::initUIEvent(const DOMString &typeArg,
bool canBubbleArg,
bool cancelableArg,
@@ -378,6 +383,11 @@ void UIEventImpl::initUIEvent(const DOMString &typeArg,
m_detail = detailArg;
}
+bool UIEventImpl::isUIEvent() const
+{
+ return true;
+}
+
// -----------------------------------------------------------------------------
MouseEventImpl::MouseEventImpl()
@@ -463,66 +473,6 @@ MouseEventImpl::~MouseEventImpl()
m_relatedTarget->deref();
}
-long MouseEventImpl::screenX() const
-{
- return m_screenX;
-}
-
-long MouseEventImpl::screenY() const
-{
- return m_screenY;
-}
-
-long MouseEventImpl::clientX() const
-{
- return m_clientX;
-}
-
-long MouseEventImpl::clientY() const
-{
- return m_clientY;
-}
-
-long MouseEventImpl::layerX() const
-{
- return m_layerX;
-}
-
-long MouseEventImpl::layerY() const
-{
- return m_layerY;
-}
-
-bool MouseEventImpl::ctrlKey() const
-{
- return m_ctrlKey;
-}
-
-bool MouseEventImpl::shiftKey() const
-{
- return m_shiftKey;
-}
-
-bool MouseEventImpl::altKey() const
-{
- return m_altKey;
-}
-
-bool MouseEventImpl::metaKey() const
-{
- return m_metaKey;
-}
-
-unsigned short MouseEventImpl::button() const
-{
- return m_button;
-}
-
-NodeImpl *MouseEventImpl::relatedTarget() const
-{
- return m_relatedTarget;
-}
-
void MouseEventImpl::initMouseEvent(const DOMString &typeArg,
bool canBubbleArg,
bool cancelableArg,
@@ -559,6 +509,11 @@ void MouseEventImpl::initMouseEvent(const DOMString &typeArg,
computeLayerPos();
}
+bool MouseEventImpl::isMouseEvent() const
+{
+ return true;
+}
+
//---------------------------------------------------------------------------------------------
KeyboardEventImpl::KeyboardEventImpl()
@@ -663,6 +618,11 @@ void KeyboardEventImpl::initKeyboardEvent(const DOMString &typeArg,
m_altGraphKey = altGraphKeyArg;
}
+bool KeyboardEventImpl::isKeyboardEvent() const
+{
+ return true;
+}
+
// -----------------------------------------------------------------------------
MutationEventImpl::MutationEventImpl()
@@ -711,31 +671,6 @@ MutationEventImpl::~MutationEventImpl()
m_attrName->deref();
}
-Node MutationEventImpl::relatedNode() const
-{
- return m_relatedNode;
-}
-
-DOMString MutationEventImpl::prevValue() const
-{
- return m_prevValue;
-}
-
-DOMString MutationEventImpl::newValue() const
-{
- return m_newValue;
-}
-
-DOMString MutationEventImpl::attrName() const
-{
- return m_attrName;
-}
-
-unsigned short MutationEventImpl::attrChange() const
-{
- return m_attrChange;
-}
-
void MutationEventImpl::initMutationEvent(const DOMString &typeArg,
bool canBubbleArg,
bool cancelableArg,
@@ -771,6 +706,11 @@ void MutationEventImpl::initMutationEvent(const DOMString &typeArg,
m_attrChange = attrChangeArg;
}
+bool MutationEventImpl::isMutationEvent() const
+{
+ return true;
+}
+
// -----------------------------------------------------------------------------
RegisteredEventListener::RegisteredEventListener(EventImpl::EventId _id, EventListener *_listener, bool _useCapture)
diff --git a/WebCore/khtml/xml/dom2_eventsimpl.h b/WebCore/khtml/xml/dom2_eventsimpl.h
index 215b891..39656f7 100644
--- a/WebCore/khtml/xml/dom2_eventsimpl.h
+++ b/WebCore/khtml/xml/dom2_eventsimpl.h
@@ -1,8 +1,9 @@
/*
* This file is part of the DOM implementation for KDE.
*
- * (C) 2001 Peter Kelly (pmk at post.com)
- * (C) 2001 Tobias Anton (anton at stud.fbi.fh-darmstadt.de)
+ * Copyright (C) 2001 Peter Kelly (pmk at post.com)
+ * Copyright (C) 2001 Tobias Anton (anton at stud.fbi.fh-darmstadt.de)
+ * Copyright (C) 2003 Apple Computer, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -113,19 +114,18 @@ public:
void preventDefault();
void initEvent(const DOMString &eventTypeArg, bool canBubbleArg, bool cancelableArg);
- virtual bool isUIEvent() { return false; }
- virtual bool isMouseEvent() { return false; }
- virtual bool isMutationEvent() { return false; }
- virtual bool isKeyboardEvent() { return false; }
- virtual DOMString eventModuleName() { return ""; }
+ virtual bool isUIEvent() const;
+ virtual bool isMouseEvent() const;
+ virtual bool isMutationEvent() const;
+ virtual bool isKeyboardEvent() const;
- virtual bool propagationStopped() const { return m_propagationStopped; }
- virtual bool defaultPrevented() const { return m_defaultPrevented; }
+ bool propagationStopped() const { return m_propagationStopped; }
+ bool defaultPrevented() const { return m_defaultPrevented; }
static EventId typeToId(DOMString type);
static DOMString idToType(EventId id);
- virtual void setDefaultHandled();
+ void setDefaultHandled() { m_defaultHandled = true; }
bool defaultHandled() const { return m_defaultHandled; }
void setCancelBubble(bool cancel) { m_cancelBubble = cancel; }
@@ -161,15 +161,14 @@ public:
AbstractViewImpl *viewArg,
long detailArg);
virtual ~UIEventImpl();
- AbstractViewImpl *view() const;
- long detail() const;
+ AbstractViewImpl *view() const { return m_view; }
+ long detail() const { return m_detail; }
void initUIEvent(const DOMString &typeArg,
bool canBubbleArg,
bool cancelableArg,
const AbstractView &viewArg,
long detailArg);
- virtual bool isUIEvent() { return true; }
- virtual DOMString eventModuleName() { return "UIEvents"; }
+ virtual bool isUIEvent() const;
protected:
AbstractViewImpl *m_view;
@@ -200,18 +199,18 @@ public:
unsigned short buttonArg,
NodeImpl *relatedTargetArg);
virtual ~MouseEventImpl();
- long screenX() const;
- long screenY() const;
- long clientX() const;
- long clientY() const;
- long layerX() const;
- long layerY() const;
- bool ctrlKey() const;
- bool shiftKey() const;
- bool altKey() const;
- bool metaKey() const;
- unsigned short button() const;
- NodeImpl *relatedTarget() const;
+ long screenX() const { return m_screenX; }
+ long screenY() const { return m_screenY; }
+ long clientX() const { return m_clientX; }
+ long clientY() const { return m_clientY; }
+ long layerX() const { return m_layerX; }
+ long layerY() const { return m_layerY; }
+ bool ctrlKey() const { return m_ctrlKey; }
+ bool shiftKey() const { return m_shiftKey; }
+ bool altKey() const { return m_altKey; }
+ bool metaKey() const { return m_metaKey; }
+ unsigned short button() const { return m_button; }
+ NodeImpl *relatedTarget() const { return m_relatedTarget; }
void initMouseEvent(const DOMString &typeArg,
bool canBubbleArg,
bool cancelableArg,
@@ -227,8 +226,7 @@ public:
bool metaKeyArg,
unsigned short buttonArg,
const Node &relatedTargetArg);
- virtual bool isMouseEvent() { return true; }
- virtual DOMString eventModuleName() { return "MouseEvents"; }
+ virtual bool isMouseEvent() const;
protected:
long m_screenX;
long m_screenY;
@@ -288,7 +286,7 @@ public:
QKeyEvent *qKeyEvent() const { return m_keyEvent; }
- virtual bool isKeyboardEvent() { return true; }
+ virtual bool isKeyboardEvent() const;
private:
QKeyEvent *m_keyEvent;
@@ -315,11 +313,11 @@ public:
unsigned short attrChangeArg);
~MutationEventImpl();
- Node relatedNode() const;
- DOMString prevValue() const;
- DOMString newValue() const;
- DOMString attrName() const;
- unsigned short attrChange() const;
+ Node relatedNode() const { return m_relatedNode; }
+ DOMString prevValue() const { return m_prevValue; }
+ DOMString newValue() const { return m_newValue; }
+ DOMString attrName() const { return m_attrName; }
+ unsigned short attrChange() const { return m_attrChange; }
void initMutationEvent(const DOMString &typeArg,
bool canBubbleArg,
bool cancelableArg,
@@ -328,8 +326,7 @@ public:
const DOMString &newValueArg,
const DOMString &attrNameArg,
unsigned short attrChangeArg);
- virtual bool isMutationEvent() { return true; }
- virtual DOMString eventModuleName() { return "MutationEvents"; }
+ virtual bool isMutationEvent() const;
protected:
NodeImpl *m_relatedNode;
DOMStringImpl *m_prevValue;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list