[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:14:45 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit c2eaba9e415817ea41c77bf5984521843a2fb5e5
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 13 19:24:50 2002 +0000
Reviewed by Ken.
- fixed 3083814 - dhtml at www.bayarea.com doesn't hide on some mouse movements
* khtml/ecma/kjs_events.h:
* khtml/ecma/kjs_events.cpp:
(DOMUIEvent::getValueProperty): Implemented pageX and pageY properties.
* khtml/ecma/kjs_events.lut.h: Regenerated.
* khtml/dom/dom2_events.h:
* khtml/dom/dom2_events.cpp:
(UIEvent::pageX): Get x coordinate if a mouse event.
(UIEvent::pageY): Get y coordinate if a mouse event.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3037 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 0c74fb9..19e0941 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,18 @@
+2002-12-13 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Ken.
+
+ - fixed 3083814 - dhtml at www.bayarea.com doesn't hide on some mouse movements
+
+ * khtml/ecma/kjs_events.h:
+ * khtml/ecma/kjs_events.cpp:
+ (DOMUIEvent::getValueProperty): Implemented pageX and pageY properties.
+ * khtml/ecma/kjs_events.lut.h: Regenerated.
+ * khtml/dom/dom2_events.h:
+ * khtml/dom/dom2_events.cpp:
+ (UIEvent::pageX): Get x coordinate if a mouse event.
+ (UIEvent::pageY): Get y coordinate if a mouse event.
+
2002-12-13 Richard Williamson <rjw at apple.com>
Fixed 3127225. Set WebCore object cache size when first bridge is created.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0c74fb9..19e0941 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,18 @@
+2002-12-13 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Ken.
+
+ - fixed 3083814 - dhtml at www.bayarea.com doesn't hide on some mouse movements
+
+ * khtml/ecma/kjs_events.h:
+ * khtml/ecma/kjs_events.cpp:
+ (DOMUIEvent::getValueProperty): Implemented pageX and pageY properties.
+ * khtml/ecma/kjs_events.lut.h: Regenerated.
+ * khtml/dom/dom2_events.h:
+ * khtml/dom/dom2_events.cpp:
+ (UIEvent::pageX): Get x coordinate if a mouse event.
+ (UIEvent::pageY): Get y coordinate if a mouse event.
+
2002-12-13 Richard Williamson <rjw at apple.com>
Fixed 3127225. Set WebCore object cache size when first bridge is created.
diff --git a/WebCore/khtml/dom/dom2_events.cpp b/WebCore/khtml/dom/dom2_events.cpp
index 2043395..ef6b5f7 100644
--- a/WebCore/khtml/dom/dom2_events.cpp
+++ b/WebCore/khtml/dom/dom2_events.cpp
@@ -267,6 +267,33 @@ int UIEvent::keyCode() const
return 0;
}
+int UIEvent::pageX() const
+{
+ if (!impl)
+ throw DOMException(DOMException::INVALID_STATE_ERR);
+
+ MouseEventImpl *mouseEvent = dynamic_cast<MouseEventImpl*>(impl);
+ if (mouseEvent)
+ return mouseEvent->clientX();
+ else
+ return 0;
+}
+
+
+int UIEvent::pageY() const
+{
+ if (!impl)
+ throw DOMException(DOMException::INVALID_STATE_ERR);
+
+ MouseEventImpl *mouseEvent = dynamic_cast<MouseEventImpl*>(impl);
+ if (mouseEvent)
+ return mouseEvent->clientY();
+ else
+ return 0;
+}
+
+
+
void UIEvent::initUIEvent(const DOMString &typeArg,
bool canBubbleArg,
bool cancelableArg,
diff --git a/WebCore/khtml/dom/dom2_events.h b/WebCore/khtml/dom/dom2_events.h
index 970bf94..c535b23 100644
--- a/WebCore/khtml/dom/dom2_events.h
+++ b/WebCore/khtml/dom/dom2_events.h
@@ -328,6 +328,13 @@ public:
int keyCode() const;
/**
+ * Non-standard extensions to support Netscape-style pageX and pageY event property.
+ *
+ */
+ int pageX() const;
+ int pageY() const;
+
+ /**
* The initUIEvent method is used to initialize the value of a UIEvent
* created through the DocumentEvent interface. This method may only be
* called before the UIEvent has been dispatched via the dispatchEvent
diff --git a/WebCore/khtml/ecma/kjs_events.cpp b/WebCore/khtml/ecma/kjs_events.cpp
index 2c7f995..0f245fe 100644
--- a/WebCore/khtml/ecma/kjs_events.cpp
+++ b/WebCore/khtml/ecma/kjs_events.cpp
@@ -339,10 +339,12 @@ Value KJS::getEventExceptionConstructor(ExecState *exec)
const ClassInfo DOMUIEvent::info = { "UIEvent", &DOMEvent::info, &DOMUIEventTable, 0 };
/*
- at begin DOMUIEventTable 3
+ at begin DOMUIEventTable 5
view DOMUIEvent::View DontDelete|ReadOnly
detail DOMUIEvent::Detail DontDelete|ReadOnly
keyCode DOMUIEvent::KeyCode DontDelete|ReadOnly
+ pageX DOMUIEvent::PageX DontDelete|ReadOnly
+ pageY DOMUIEvent::PageY DontDelete|ReadOnly
@end
@begin DOMUIEventProtoTable 1
initUIEvent DOMUIEvent::InitUIEvent DontDelete|Function 5
@@ -370,9 +372,13 @@ Value DOMUIEvent::getValueProperty(ExecState *exec, int token) const
return Number(static_cast<DOM::UIEvent>(event).detail());
case KeyCode:
return Number(static_cast<DOM::UIEvent>(event).keyCode());
+ case PageX:
+ return Number(static_cast<DOM::UIEvent>(event).pageX());
+ case PageY:
+ return Number(static_cast<DOM::UIEvent>(event).pageY());
default:
kdWarning() << "Unhandled token in DOMUIEvent::getValueProperty : " << token << endl;
- return Value();
+ return Undefined();
}
}
diff --git a/WebCore/khtml/ecma/kjs_events.h b/WebCore/khtml/ecma/kjs_events.h
index ed02cb0..c4e309b 100644
--- a/WebCore/khtml/ecma/kjs_events.h
+++ b/WebCore/khtml/ecma/kjs_events.h
@@ -107,7 +107,7 @@ namespace KJS {
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info;
- enum { View, Detail, KeyCode, InitUIEvent };
+ enum { View, Detail, KeyCode, PageX, PageY, InitUIEvent };
DOM::UIEvent toUIEvent() const { return static_cast<DOM::UIEvent>(event); }
};
diff --git a/WebCore/khtml/ecma/kjs_events.lut.h b/WebCore/khtml/ecma/kjs_events.lut.h
index cd97e19..7452dc5 100644
--- a/WebCore/khtml/ecma/kjs_events.lut.h
+++ b/WebCore/khtml/ecma/kjs_events.lut.h
@@ -76,13 +76,16 @@ const struct HashTable EventExceptionConstructorTable = { 2, 1, EventExceptionCo
namespace KJS {
const struct HashEntry DOMUIEventTableEntries[] = {
- { "detail", DOMUIEvent::Detail, DontDelete|ReadOnly, 0, &DOMUIEventTableEntries[3] },
{ 0, 0, 0, 0, 0 },
- { "view", DOMUIEvent::View, DontDelete|ReadOnly, 0, 0 },
- { "keyCode", DOMUIEvent::KeyCode, DontDelete|ReadOnly, 0, 0 }
+ { "pageX", DOMUIEvent::PageX, DontDelete|ReadOnly, 0, 0 },
+ { "detail", DOMUIEvent::Detail, DontDelete|ReadOnly, 0, &DOMUIEventTableEntries[6] },
+ { "view", DOMUIEvent::View, DontDelete|ReadOnly, 0, &DOMUIEventTableEntries[5] },
+ { 0, 0, 0, 0, 0 },
+ { "keyCode", DOMUIEvent::KeyCode, DontDelete|ReadOnly, 0, 0 },
+ { "pageY", DOMUIEvent::PageY, DontDelete|ReadOnly, 0, 0 }
};
-const struct HashTable DOMUIEventTable = { 2, 4, DOMUIEventTableEntries, 3 };
+const struct HashTable DOMUIEventTable = { 2, 7, DOMUIEventTableEntries, 5 };
}; // namespace
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list