[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:13:04 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 2222d32802db1ee3078fc2190a32646b3b212b52
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Dec 10 04:16:10 2002 +0000
Reviewed by Dave.
- fixed 3117734 - fail at document.releaseEvents in js at rollingstone.com
* khtml/ecma/kjs_html.cpp:
(KJS::HTMLDocFunction::tryCall): Added no-op implementations of
captureEvents and releaseEvents.
(KJS::HTMLDocument::tryGet):
* khtml/ecma/kjs_html.h:
* khtml/ecma/kjs_window.cpp:
(Window::get, WindowFunc::tryCall): Added no-op implementation of
releaseEvents.
* khtml/ecma/kjs_window.h:
* khtml/ecma/kjs_html.lut.h: Regenerated.
* khtml/ecma/kjs_window.lut.h: Regenerated.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2984 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3b1ff28..0bc6229 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,21 @@
+2002-12-09 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Dave.
+
+ - fixed 3117734 - fail at document.releaseEvents in js at rollingstone.com
+
+ * khtml/ecma/kjs_html.cpp:
+ (KJS::HTMLDocFunction::tryCall): Added no-op implementations of
+ captureEvents and releaseEvents.
+ (KJS::HTMLDocument::tryGet):
+ * khtml/ecma/kjs_html.h:
+ * khtml/ecma/kjs_window.cpp:
+ (Window::get, WindowFunc::tryCall): Added no-op implementation of
+ releaseEvents.
+ * khtml/ecma/kjs_window.h:
+ * khtml/ecma/kjs_html.lut.h: Regenerated.
+ * khtml/ecma/kjs_window.lut.h: Regenerated.
+
2002-12-09 David Hyatt <hyatt at apple.com>
Fix for the CSS test suite link. Need to make sure inlines
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3b1ff28..0bc6229 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,21 @@
+2002-12-09 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Dave.
+
+ - fixed 3117734 - fail at document.releaseEvents in js at rollingstone.com
+
+ * khtml/ecma/kjs_html.cpp:
+ (KJS::HTMLDocFunction::tryCall): Added no-op implementations of
+ captureEvents and releaseEvents.
+ (KJS::HTMLDocument::tryGet):
+ * khtml/ecma/kjs_html.h:
+ * khtml/ecma/kjs_window.cpp:
+ (Window::get, WindowFunc::tryCall): Added no-op implementation of
+ releaseEvents.
+ * khtml/ecma/kjs_window.h:
+ * khtml/ecma/kjs_html.lut.h: Regenerated.
+ * khtml/ecma/kjs_window.lut.h: Regenerated.
+
2002-12-09 David Hyatt <hyatt at apple.com>
Fix for the CSS test suite link. Need to make sure inlines
diff --git a/WebCore/khtml/ecma/kjs_html.cpp b/WebCore/khtml/ecma/kjs_html.cpp
index 25fdee2..87b0bc2 100644
--- a/WebCore/khtml/ecma/kjs_html.cpp
+++ b/WebCore/khtml/ecma/kjs_html.cpp
@@ -87,6 +87,10 @@ Value KJS::HTMLDocFunction::tryCall(ExecState *exec, Object &thisObj, const List
}
case HTMLDocument::GetElementsByName:
return getDOMNodeList(exec,doc.getElementsByName(v.toString(exec).string()));
+ case HTMLDocument::CaptureEvents:
+ case HTMLDocument::ReleaseEvents:
+ // Do nothing for now. These are NS-specific legacy calls.
+ break;
}
return Undefined();
@@ -116,6 +120,8 @@ const ClassInfo KJS::HTMLDocument::info =
write HTMLDocument::Write DontDelete|Function 1
writeln HTMLDocument::WriteLn DontDelete|Function 1
getElementsByName HTMLDocument::GetElementsByName DontDelete|Function 1
+ captureEvents HTMLDocument::CaptureEvents DontDelete|Function 0
+ releaseEvents HTMLDocument::ReleaseEvents DontDelete|Function 0
bgColor HTMLDocument::BgColor DontDelete
fgColor HTMLDocument::FgColor DontDelete
alinkColor HTMLDocument::AlinkColor DontDelete
@@ -212,6 +218,8 @@ Value KJS::HTMLDocument::tryGet(ExecState *exec, const Identifier &propertyName)
case Write:
case WriteLn:
case GetElementsByName:
+ case CaptureEvents:
+ case ReleaseEvents:
return lookupOrCreateFunction<HTMLDocFunction>( exec, propertyName, this, entry->value, entry->params, entry->attr );
}
}
diff --git a/WebCore/khtml/ecma/kjs_html.h b/WebCore/khtml/ecma/kjs_html.h
index ef71ac5..5a31882 100644
--- a/WebCore/khtml/ecma/kjs_html.h
+++ b/WebCore/khtml/ecma/kjs_html.h
@@ -47,7 +47,7 @@ namespace KJS {
static const ClassInfo info;
enum { Title, Referrer, Domain, URL, Body, Location, Cookie,
Images, Applets, Links, Forms, Anchors, Scripts, All, Clear, Open, Close,
- Write, WriteLn, GetElementsByName,
+ Write, WriteLn, GetElementsByName, CaptureEvents, ReleaseEvents,
BgColor, FgColor, AlinkColor, LinkColor, VlinkColor, LastModified, Height, Width, Dir };
DOM::Document toDocument() const { return static_cast<DOM::Document>( node ); }
};
diff --git a/WebCore/khtml/ecma/kjs_html.lut.h b/WebCore/khtml/ecma/kjs_html.lut.h
index f499240..b5d5f75 100644
--- a/WebCore/khtml/ecma/kjs_html.lut.h
+++ b/WebCore/khtml/ecma/kjs_html.lut.h
@@ -5,7 +5,7 @@ namespace KJS {
const struct HashEntry HTMLDocumentTableEntries[] = {
{ "open", HTMLDocument::Open, DontDelete|Function, 0, 0 },
{ "scripts", HTMLDocument::Scripts, DontDelete|ReadOnly, 0, 0 },
- { 0, 0, 0, 0, 0 },
+ { "releaseEvents", HTMLDocument::ReleaseEvents, DontDelete|Function, 0, 0 },
{ "all", HTMLDocument::All, DontDelete|ReadOnly, 0, &HTMLDocumentTableEntries[32] },
{ 0, 0, 0, 0, 0 },
{ "vlinkColor", HTMLDocument::VlinkColor, DontDelete, 0, 0 },
@@ -24,7 +24,7 @@ const struct HashEntry HTMLDocumentTableEntries[] = {
{ "links", HTMLDocument::Links, DontDelete|ReadOnly, 0, 0 },
{ "title", HTMLDocument::Title, DontDelete, 0, 0 },
{ "location", HTMLDocument::Location, DontDelete, 0, 0 },
- { 0, 0, 0, 0, 0 },
+ { "captureEvents", HTMLDocument::CaptureEvents, DontDelete|Function, 0, 0 },
{ 0, 0, 0, 0, 0 },
{ "clear", HTMLDocument::Clear, DontDelete|Function, 0, 0 },
{ "referrer", HTMLDocument::Referrer, DontDelete|ReadOnly, 0, &HTMLDocumentTableEntries[31] },
diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index 78d8c20..f4581d3 100644
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -170,7 +170,7 @@ Value Screen::getValueProperty(ExecState *exec, int token) const
const ClassInfo Window::info = { "Window", 0, &WindowTable, 0 };
/*
- at begin WindowTable 79
+ at begin WindowTable 89
closed Window::Closed DontDelete|ReadOnly
crypto Window::Crypto DontDelete|ReadOnly
defaultStatus Window::DefaultStatus DontDelete
@@ -234,6 +234,7 @@ const ClassInfo Window::info = { "Window", 0, &WindowTable, 0 };
setInterval Window::SetInterval DontDelete|Function 2
clearInterval Window::ClearInterval DontDelete|Function 1
captureEvents Window::CaptureEvents DontDelete|Function 0
+ releaseEvents Window::ReleaseEvents DontDelete|Function 0
# Warning, when adding a function to this object you need to add a case in Window::get
addEventListener Window::AddEventListener DontDelete|Function 3
removeEventListener Window::RemoveEventListener DontDelete|Function 3
@@ -525,6 +526,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const
case ResizeBy:
case ResizeTo:
case CaptureEvents:
+ case ReleaseEvents:
case AddEventListener:
case RemoveEventListener:
return lookupOrCreateFunction<WindowFunc>(exec,p,this,entry->value,entry->params,entry->attr);
@@ -1372,7 +1374,8 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
}
return Undefined();
case Window::CaptureEvents:
- // Do nothing. This is a NS-specific call that isn't needed in Konqueror.
+ case Window::ReleaseEvents:
+ // Do nothing for now. These are NS-specific legacy calls.
break;
case Window::AddEventListener: {
JSEventListener *listener = Window::retrieveActive(exec)->getJSEventListener(args[1]);
diff --git a/WebCore/khtml/ecma/kjs_window.h b/WebCore/khtml/ecma/kjs_window.h
index 7ccdcb0..55ba89e 100644
--- a/WebCore/khtml/ecma/kjs_window.h
+++ b/WebCore/khtml/ecma/kjs_window.h
@@ -114,7 +114,7 @@ namespace KJS {
ScrollTo, ScrollX, ScrollY, MoveBy, MoveTo, ResizeBy, ResizeTo, Self, _Window, Top, _Screen,
Image, Option, Alert, Confirm, Prompt, Open, SetTimeout, ClearTimeout,
Focus, Blur, Close, SetInterval, ClearInterval, CaptureEvents,
- AddEventListener, RemoveEventListener, Onabort, Onblur,
+ ReleaseEvents, AddEventListener, RemoveEventListener, Onabort, Onblur,
Onchange, Onclick, Ondblclick, Ondragdrop, Onerror, Onfocus,
Onkeydown, Onkeypress, Onkeyup, Onload, Onmousedown, Onmousemove,
Onmouseout, Onmouseover, Onmouseup, Onmove, Onreset, Onresize,
diff --git a/WebCore/khtml/ecma/kjs_window.lut.h b/WebCore/khtml/ecma/kjs_window.lut.h
index f117d2e..a2801fb 100644
--- a/WebCore/khtml/ecma/kjs_window.lut.h
+++ b/WebCore/khtml/ecma/kjs_window.lut.h
@@ -23,7 +23,7 @@ namespace KJS {
const struct HashEntry WindowTableEntries[] = {
{ 0, 0, 0, 0, 0 },
- { "Option", Window::Option, DontDelete|ReadOnly, 0, &WindowTableEntries[103] },
+ { "Option", Window::Option, DontDelete|ReadOnly, 0, &WindowTableEntries[104] },
{ "closed", Window::Closed, DontDelete|ReadOnly, 0, &WindowTableEntries[87] },
{ 0, 0, 0, 0, 0 },
{ 0, 0, 0, 0, 0 },
@@ -34,7 +34,7 @@ const struct HashEntry WindowTableEntries[] = {
{ "CSSRule", Window::CSSRule, DontDelete, 0, &WindowTableEntries[91] },
{ "length", Window::Length, DontDelete|ReadOnly, 0, &WindowTableEntries[81] },
{ "pageYOffset", Window::PageYOffset, DontDelete|ReadOnly, 0, 0 },
- { "onmouseout", Window::Onmouseout, DontDelete, 0, &WindowTableEntries[110] },
+ { "onmouseout", Window::Onmouseout, DontDelete, 0, &WindowTableEntries[111] },
{ "clearInterval", Window::ClearInterval, DontDelete|Function, 1, 0 },
{ 0, 0, 0, 0, 0 },
{ 0, 0, 0, 0, 0 },
@@ -50,12 +50,12 @@ const struct HashEntry WindowTableEntries[] = {
{ "innerWidth", Window::InnerWidth, DontDelete|ReadOnly, 0, 0 },
{ "onblur", Window::Onblur, DontDelete, 0, 0 },
{ 0, 0, 0, 0, 0 },
- { "onclick", Window::Onclick, DontDelete, 0, &WindowTableEntries[104] },
+ { "onclick", Window::Onclick, DontDelete, 0, &WindowTableEntries[105] },
{ "onmousedown", Window::Onmousedown, DontDelete, 0, 0 },
{ 0, 0, 0, 0, 0 },
- { "self", Window::Self, DontDelete|ReadOnly, 0, &WindowTableEntries[98] },
+ { "self", Window::Self, DontDelete|ReadOnly, 0, &WindowTableEntries[99] },
{ "scrollX", Window::ScrollX, DontDelete|ReadOnly, 0, &WindowTableEntries[88] },
- { "scrollY", Window::ScrollY, DontDelete|ReadOnly, 0, &WindowTableEntries[105] },
+ { "scrollY", Window::ScrollY, DontDelete|ReadOnly, 0, &WindowTableEntries[106] },
{ 0, 0, 0, 0, 0 },
{ "innerHeight", Window::InnerHeight, DontDelete|ReadOnly, 0, 0 },
{ 0, 0, 0, 0, 0 },
@@ -67,7 +67,7 @@ const struct HashEntry WindowTableEntries[] = {
{ "defaultStatus", Window::DefaultStatus, DontDelete, 0, &WindowTableEntries[92] },
{ 0, 0, 0, 0, 0 },
{ "status", Window::Status, DontDelete, 0, &WindowTableEntries[80] },
- { "onchange", Window::Onchange, DontDelete, 0, &WindowTableEntries[100] },
+ { "onchange", Window::Onchange, DontDelete, 0, &WindowTableEntries[101] },
{ "onabort", Window::Onabort, DontDelete, 0, 0 },
{ 0, 0, 0, 0, 0 },
{ "setTimeout", Window::SetTimeout, DontDelete|Function, 2, 0 },
@@ -76,8 +76,8 @@ const struct HashEntry WindowTableEntries[] = {
{ 0, 0, 0, 0, 0 },
{ "scrollbars", Window::Scrollbars, DontDelete|ReadOnly, 0, &WindowTableEntries[85] },
{ 0, 0, 0, 0, 0 },
- { "outerHeight", Window::OuterHeight, DontDelete|ReadOnly, 0, &WindowTableEntries[101] },
- { "resizeBy", Window::ResizeBy, DontDelete|Function, 2, &WindowTableEntries[106] },
+ { "outerHeight", Window::OuterHeight, DontDelete|ReadOnly, 0, &WindowTableEntries[102] },
+ { "resizeBy", Window::ResizeBy, DontDelete|Function, 2, &WindowTableEntries[107] },
{ "NodeFilter", Window::NodeFilter, DontDelete, 0, 0 },
{ "onreset", Window::Onreset, DontDelete, 0, 0 },
{ "offscreenBuffering", Window::OffscreenBuffering, DontDelete|ReadOnly, 0, 0 },
@@ -93,7 +93,7 @@ const struct HashEntry WindowTableEntries[] = {
{ "onkeyup", Window::Onkeyup, DontDelete, 0, 0 },
{ "addEventListener", Window::AddEventListener, DontDelete|Function, 3, 0 },
{ "focus", Window::Focus, DontDelete|Function, 0, 0 },
- { "personalbar", Window::Personalbar, DontDelete|ReadOnly, 0, &WindowTableEntries[109] },
+ { "personalbar", Window::Personalbar, DontDelete|ReadOnly, 0, &WindowTableEntries[110] },
{ "event", Window::Event, DontDelete|ReadOnly, 0, 0 },
{ "document", Window::Document, DontDelete|ReadOnly, 0, &WindowTableEntries[86] },
{ "defaultstatus", Window::DefaultStatus, DontDelete, 0, &WindowTableEntries[79] },
@@ -101,17 +101,17 @@ const struct HashEntry WindowTableEntries[] = {
{ 0, 0, 0, 0, 0 },
{ "clearTimeout", Window::ClearTimeout, DontDelete|Function, 1, 0 },
{ "screenTop", Window::ScreenTop, DontDelete|ReadOnly, 0, 0 },
- { "Node", Window::Node, DontDelete, 0, &WindowTableEntries[111] },
+ { "Node", Window::Node, DontDelete, 0, &WindowTableEntries[112] },
{ "outerWidth", Window::OuterWidth, DontDelete|ReadOnly, 0, 0 },
- { "pageXOffset", Window::PageXOffset, DontDelete|ReadOnly, 0, &WindowTableEntries[108] },
+ { "pageXOffset", Window::PageXOffset, DontDelete|ReadOnly, 0, &WindowTableEntries[109] },
{ "screenX", Window::ScreenX, DontDelete|ReadOnly, 0, 0 },
- { "screenY", Window::ScreenY, DontDelete|ReadOnly, 0, &WindowTableEntries[99] },
+ { "screenY", Window::ScreenY, DontDelete|ReadOnly, 0, &WindowTableEntries[100] },
{ "scroll", Window::Scroll, DontDelete|Function, 2, &WindowTableEntries[89] },
{ "scrollBy", Window::ScrollBy, DontDelete|Function, 2, 0 },
{ "moveBy", Window::MoveBy, DontDelete|Function, 2, 0 },
{ "moveTo", Window::MoveTo, DontDelete|Function, 2, 0 },
{ "window", Window::_Window, DontDelete|ReadOnly, 0, 0 },
- { "top", Window::Top, DontDelete|ReadOnly, 0, 0 },
+ { "top", Window::Top, DontDelete|ReadOnly, 0, &WindowTableEntries[98] },
{ "screen", Window::_Screen, DontDelete|ReadOnly, 0, 0 },
{ "Image", Window::Image, DontDelete|ReadOnly, 0, 0 },
{ "prompt", Window::Prompt, DontDelete|Function, 2, &WindowTableEntries[94] },
@@ -119,14 +119,15 @@ const struct HashEntry WindowTableEntries[] = {
{ "blur", Window::Blur, DontDelete|Function, 0, &WindowTableEntries[97] },
{ "close", Window::Close, DontDelete|Function, 0, 0 },
{ "setInterval", Window::SetInterval, DontDelete|Function, 2, 0 },
- { "captureEvents", Window::CaptureEvents, DontDelete|Function, 0, &WindowTableEntries[102] },
+ { "captureEvents", Window::CaptureEvents, DontDelete|Function, 0, &WindowTableEntries[103] },
+ { "releaseEvents", Window::ReleaseEvents, DontDelete|Function, 0, 0 },
{ "removeEventListener", Window::RemoveEventListener, DontDelete|Function, 3, 0 },
{ "ondblclick", Window::Ondblclick, DontDelete, 0, 0 },
{ "ondragdrop", Window::Ondragdrop, DontDelete, 0, 0 },
{ "onfocus", Window::Onfocus, DontDelete, 0, 0 },
{ "onkeydown", Window::Onkeydown, DontDelete, 0, 0 },
{ "onkeypress", Window::Onkeypress, DontDelete, 0, 0 },
- { "onmousemove", Window::Onmousemove, DontDelete, 0, &WindowTableEntries[107] },
+ { "onmousemove", Window::Onmousemove, DontDelete, 0, &WindowTableEntries[108] },
{ "onmouseover", Window::Onmouseover, DontDelete, 0, 0 },
{ "onmouseup", Window::Onmouseup, DontDelete, 0, 0 },
{ "onmove", Window::Onmove, DontDelete, 0, 0 },
@@ -136,7 +137,7 @@ const struct HashEntry WindowTableEntries[] = {
{ "onunload", Window::Onunload, DontDelete, 0, 0 }
};
-const struct HashTable WindowTable = { 2, 112, WindowTableEntries, 79 };
+const struct HashTable WindowTable = { 2, 113, WindowTableEntries, 79 };
}; // namespace
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list