[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:37:52 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 6641479658ff5edf3fe25bc855ffe7ccca196769
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Apr 18 21:14:11 2003 +0000
Reviewed by Darin.
- fixed 3081926 - bookmarklet to count and display mailto links fails
* khtml/ecma/kjs_html.cpp:
(KJS::HTMLElementFunction::tryCall): Implement custom toString JavaScript method
which calls the existing toString C++ custom method.
* khtml/ecma/kjs_html.h: Added AnchorToString.
* khtml/ecma/kjs_html.lut.h: Regenerated.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4143 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index ea0b387..78e5858 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2003-04-18 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Darin.
+
+ - fixed 3081926 - bookmarklet to count and display mailto links fails
+
+ * khtml/ecma/kjs_html.cpp:
+ (KJS::HTMLElementFunction::tryCall): Implement custom toString JavaScript method
+ which calls the existing toString C++ custom method.
+ * khtml/ecma/kjs_html.h: Added AnchorToString.
+ * khtml/ecma/kjs_html.lut.h: Regenerated.
+
2003-04-18 Chris Blumenberg <cblu at apple.com>
Fixed: 3172389 - Safari doesn't parse attributes within the OBJECT tag
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index ea0b387..78e5858 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2003-04-18 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Darin.
+
+ - fixed 3081926 - bookmarklet to count and display mailto links fails
+
+ * khtml/ecma/kjs_html.cpp:
+ (KJS::HTMLElementFunction::tryCall): Implement custom toString JavaScript method
+ which calls the existing toString C++ custom method.
+ * khtml/ecma/kjs_html.h: Added AnchorToString.
+ * khtml/ecma/kjs_html.lut.h: Regenerated.
+
2003-04-18 Chris Blumenberg <cblu at apple.com>
Fixed: 3172389 - Safari doesn't parse attributes within the OBJECT tag
diff --git a/WebCore/khtml/ecma/kjs_html.cpp b/WebCore/khtml/ecma/kjs_html.cpp
index 12ecaf0..9935bab 100644
--- a/WebCore/khtml/ecma/kjs_html.cpp
+++ b/WebCore/khtml/ecma/kjs_html.cpp
@@ -833,7 +833,7 @@ const ClassInfo* KJS::HTMLElement::classInfo() const
cite KJS::HTMLElement::ModCite DontDelete
dateTime KJS::HTMLElement::ModDateTime DontDelete
@end
- at begin HTMLAnchorElementTable 23
+ at begin HTMLAnchorElementTable 24
accessKey KJS::HTMLElement::AnchorAccessKey DontDelete
charset KJS::HTMLElement::AnchorCharset DontDelete
coords KJS::HTMLElement::AnchorCoords DontDelete
@@ -856,6 +856,7 @@ const ClassInfo* KJS::HTMLElement::classInfo() const
type KJS::HTMLElement::AnchorType DontDelete
blur KJS::HTMLElement::AnchorBlur DontDelete|Function 0
focus KJS::HTMLElement::AnchorFocus DontDelete|Function 0
+ toString KJS::HTMLElement::AnchorToString DontDelete|Function 0
@end
@begin HTMLImageElementTable 14
name KJS::HTMLElement::ImageName DontDelete
@@ -1997,6 +1998,9 @@ Value KJS::HTMLElementFunction::tryCall(ExecState *exec, Object &thisObj, const
else if (id == KJS::HTMLElement::AnchorFocus) {
anchor.focus();
return Undefined();
+ }
+ else if (id == KJS::HTMLElement::AnchorToString) {
+ return String(thisObj.toString(exec));
}
}
break;
diff --git a/WebCore/khtml/ecma/kjs_html.h b/WebCore/khtml/ecma/kjs_html.h
index 1de3cb7..f70b4a4 100644
--- a/WebCore/khtml/ecma/kjs_html.h
+++ b/WebCore/khtml/ecma/kjs_html.h
@@ -110,7 +110,7 @@ namespace KJS {
AnchorAccessKey, AnchorCoords, AnchorHref, AnchorProtocol, AnchorHost,
AnchorCharset, AnchorHrefLang, AnchorHostname, AnchorType, AnchorFocus,
AnchorPort, AnchorPathName, AnchorHash, AnchorSearch, AnchorName,
- AnchorRev, AnchorTabIndex, AnchorTarget, AnchorText, AnchorBlur,
+ AnchorRev, AnchorTabIndex, AnchorTarget, AnchorText, AnchorBlur, AnchorToString,
ImageName, ImageAlign, ImageHspace, ImageVspace, ImageUseMap, ImageAlt,
ImageLowSrc, ImageWidth, ImageIsMap, ImageBorder, ImageHeight,
ImageLongDesc, ImageSrc, ImageX, ImageY, ObjectHspace, ObjectHeight, ObjectAlign,
diff --git a/WebCore/khtml/ecma/kjs_html.lut.h b/WebCore/khtml/ecma/kjs_html.lut.h
index b5d5f75..ee7b305 100644
--- a/WebCore/khtml/ecma/kjs_html.lut.h
+++ b/WebCore/khtml/ecma/kjs_html.lut.h
@@ -582,40 +582,43 @@ const struct HashTable HTMLModElementTable = { 2, 3, HTMLModElementTableEntries,
namespace KJS {
const struct HashEntry HTMLAnchorElementTableEntries[] = {
- { "shape", KJS::HTMLElement::AnchorShape, DontDelete, 0, &HTMLAnchorElementTableEntries[30] },
- { "rel", KJS::HTMLElement::AnchorRel, DontDelete, 0, 0 },
{ 0, 0, 0, 0, 0 },
- { "accessKey", KJS::HTMLElement::AnchorAccessKey, DontDelete, 0, &HTMLAnchorElementTableEntries[24] },
+ { "shape", KJS::HTMLElement::AnchorShape, DontDelete, 0, 0 },
+ { "charset", KJS::HTMLElement::AnchorCharset, DontDelete, 0, &HTMLAnchorElementTableEntries[24] },
+ { 0, 0, 0, 0, 0 },
+ { 0, 0, 0, 0, 0 },
+ { "blur", KJS::HTMLElement::AnchorBlur, DontDelete|Function, 0, 0 },
+ { "pathname", KJS::HTMLElement::AnchorPathName, DontDelete|ReadOnly, 0, &HTMLAnchorElementTableEntries[28] },
{ 0, 0, 0, 0, 0 },
{ 0, 0, 0, 0, 0 },
- { "coords", KJS::HTMLElement::AnchorCoords, DontDelete, 0, &HTMLAnchorElementTableEntries[23] },
+ { "name", KJS::HTMLElement::AnchorName, DontDelete, 0, 0 },
+ { 0, 0, 0, 0, 0 },
+ { "accessKey", KJS::HTMLElement::AnchorAccessKey, DontDelete, 0, &HTMLAnchorElementTableEntries[26] },
+ { "hash", KJS::HTMLElement::AnchorHash, DontDelete|ReadOnly, 0, 0 },
{ "href", KJS::HTMLElement::AnchorHref, DontDelete, 0, 0 },
- { "protocol", KJS::HTMLElement::AnchorProtocol, DontDelete|ReadOnly, 0, 0 },
- { "host", KJS::HTMLElement::AnchorHost, DontDelete|ReadOnly, 0, &HTMLAnchorElementTableEntries[26] },
- { "charset", KJS::HTMLElement::AnchorCharset, DontDelete, 0, &HTMLAnchorElementTableEntries[27] },
- { "hreflang", KJS::HTMLElement::AnchorHrefLang, DontDelete, 0, &HTMLAnchorElementTableEntries[25] },
- { "hostname", KJS::HTMLElement::AnchorHostname, DontDelete|ReadOnly, 0, 0 },
- { "type", KJS::HTMLElement::AnchorType, DontDelete, 0, 0 },
+ { "host", KJS::HTMLElement::AnchorHost, DontDelete|ReadOnly, 0, 0 },
{ 0, 0, 0, 0, 0 },
{ "focus", KJS::HTMLElement::AnchorFocus, DontDelete|Function, 0, 0 },
- { "port", KJS::HTMLElement::AnchorPort, DontDelete|ReadOnly, 0, &HTMLAnchorElementTableEntries[29] },
- { 0, 0, 0, 0, 0 },
- { "pathname", KJS::HTMLElement::AnchorPathName, DontDelete|ReadOnly, 0, 0 },
{ 0, 0, 0, 0, 0 },
+ { "protocol", KJS::HTMLElement::AnchorProtocol, DontDelete|ReadOnly, 0, &HTMLAnchorElementTableEntries[32] },
{ 0, 0, 0, 0, 0 },
{ 0, 0, 0, 0, 0 },
+ { "port", KJS::HTMLElement::AnchorPort, DontDelete|ReadOnly, 0, &HTMLAnchorElementTableEntries[27] },
{ 0, 0, 0, 0, 0 },
- { "hash", KJS::HTMLElement::AnchorHash, DontDelete|ReadOnly, 0, 0 },
- { "name", KJS::HTMLElement::AnchorName, DontDelete, 0, &HTMLAnchorElementTableEntries[28] },
- { "rev", KJS::HTMLElement::AnchorRev, DontDelete, 0, 0 },
+ { "hreflang", KJS::HTMLElement::AnchorHrefLang, DontDelete, 0, &HTMLAnchorElementTableEntries[25] },
+ { "coords", KJS::HTMLElement::AnchorCoords, DontDelete, 0, 0 },
+ { "hostname", KJS::HTMLElement::AnchorHostname, DontDelete|ReadOnly, 0, &HTMLAnchorElementTableEntries[29] },
+ { "rel", KJS::HTMLElement::AnchorRel, DontDelete, 0, 0 },
+ { "rev", KJS::HTMLElement::AnchorRev, DontDelete, 0, &HTMLAnchorElementTableEntries[31] },
{ "search", KJS::HTMLElement::AnchorSearch, DontDelete|ReadOnly, 0, 0 },
- { "tabIndex", KJS::HTMLElement::AnchorTabIndex, DontDelete, 0, 0 },
+ { "tabIndex", KJS::HTMLElement::AnchorTabIndex, DontDelete, 0, &HTMLAnchorElementTableEntries[30] },
{ "target", KJS::HTMLElement::AnchorTarget, DontDelete, 0, 0 },
{ "text", KJS::HTMLElement::AnchorText, DontDelete|ReadOnly, 0, 0 },
- { "blur", KJS::HTMLElement::AnchorBlur, DontDelete|Function, 0, 0 }
+ { "type", KJS::HTMLElement::AnchorType, DontDelete, 0, &HTMLAnchorElementTableEntries[33] },
+ { "toString", KJS::HTMLElement::AnchorToString, DontDelete|Function, 0, 0 }
};
-const struct HashTable HTMLAnchorElementTable = { 2, 31, HTMLAnchorElementTableEntries, 23 };
+const struct HashTable HTMLAnchorElementTable = { 2, 34, HTMLAnchorElementTableEntries, 24 };
}; // namespace
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list