[webkit-changes] cvs commit: WebCore/khtml/html
html_documentimpl.cpp
Timothy
thatcher at opensource.apple.com
Fri Oct 21 13:58:43 PDT 2005
thatcher 05/10/21 13:58:42
Modified: . Tag: Safari-2-0-branch ChangeLog
khtml/ecma Tag: Safari-2-0-branch kjs_binding.cpp
khtml/html Tag: Safari-2-0-branch html_documentimpl.cpp
Log:
Merged fix from TOT to Safari-2-0-branch
2005-10-19 Adele Peterson <adele at apple.com>
Reviewed by Hyatt.
Fixed <rdar://problem/4243807> Denver Regression: DOM returns lower case strings for tags in empty document
* khtml/html/html_documentimpl.cpp:
(HTMLDocumentImpl::HTMLDocumentImpl): initialize hMode to Html4.
Revision Changes Path
No revision
No revision
1.1.2.38 +13 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.1.2.37
retrieving revision 1.1.2.38
diff -u -r1.1.2.37 -r1.1.2.38
--- ChangeLog 11 Oct 2005 21:12:13 -0000 1.1.2.37
+++ ChangeLog 21 Oct 2005 20:58:38 -0000 1.1.2.38
@@ -1,3 +1,16 @@
+2005-10-21 Timothy Hatcher <timothy at apple.com>
+
+ Merged fix from TOT to Safari-2-0-branch
+
+ 2005-10-19 Adele Peterson <adele at apple.com>
+
+ Reviewed by Hyatt.
+
+ Fixed <rdar://problem/4243807> Denver Regression: DOM returns lower case strings for tags in empty document
+
+ * khtml/html/html_documentimpl.cpp:
+ (HTMLDocumentImpl::HTMLDocumentImpl): initialize hMode to Html4.
+
2005-10-11 Timothy Hatcher <timothy at apple.com>
Merged fix from TOT to Safari-2-0-branch
No revision
No revision
1.26.8.6 +24 -12 WebCore/khtml/ecma/kjs_binding.cpp
Index: kjs_binding.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_binding.cpp,v
retrieving revision 1.26.8.5
retrieving revision 1.26.8.6
diff -u -r1.26.8.5 -r1.26.8.6
--- kjs_binding.cpp 4 Aug 2005 17:55:23 -0000 1.26.8.5
+++ kjs_binding.cpp 21 Oct 2005 20:58:41 -0000 1.26.8.6
@@ -34,7 +34,7 @@
using DOM::DOMString;
namespace KJS {
-
+#if 0
/* TODO:
* The catch all (...) clauses below shouldn't be necessary.
* But they helped to view for example www.faz.net in an stable manner.
@@ -46,9 +46,10 @@
Value DOMObject::get(ExecState *exec, const Identifier &p) const
{
Value result;
- try {
+// try {
result = tryGet(exec,p);
- }
+// }
+#if 0
catch (DOM::DOMException e) {
// ### translate code into readable string ?
// ### oh, and s/QString/i18n or I18N_NOOP (the code in kjs uses I18N_NOOP... but where is it translated ?)
@@ -62,16 +63,17 @@
kdError(6070) << "Unknown exception in DOMObject::get()" << endl;
result = String("Unknown exception");
}
-
+#endif
return result;
}
void DOMObject::put(ExecState *exec, const Identifier &propertyName,
const Value &value, int attr)
{
- try {
+// try {
tryPut(exec, propertyName, value, attr);
- }
+// }
+#if 0
catch (DOM::DOMException e) {
Object err = Error::create(exec, GeneralError, QString("DOM exception %1").arg(e.code).local8Bit());
err.put(exec, "code", Number(e.code));
@@ -80,6 +82,7 @@
catch (...) {
kdError(6070) << "Unknown exception in DOMObject::put()" << endl;
}
+#endif
}
UString DOMObject::toString(ExecState *) const
@@ -90,9 +93,10 @@
Value DOMFunction::get(ExecState *exec, const Identifier &propertyName) const
{
Value result;
- try {
+// try {
result = tryGet(exec, propertyName);
- }
+// }
+#if 0
catch (DOM::DOMException e) {
result = Undefined();
Object err = Error::create(exec, GeneralError, QString("DOM exception %1").arg(e.code).local8Bit());
@@ -103,17 +107,18 @@
kdError(6070) << "Unknown exception in DOMFunction::get()" << endl;
result = String("Unknown exception");
}
-
+#endif
return result;
}
Value DOMFunction::call(ExecState *exec, Object &thisObj, const List &args)
{
Value val;
- try {
+// try {
val = tryCall(exec, thisObj, args);
- }
+// }
// pity there's no way to distinguish between these in JS code
+#if 0
catch (DOM::DOMException e) {
Object err = Error::create(exec, GeneralError, QString("DOM Exception %1").arg(e.code).local8Bit());
err.put(exec, "code", Number(e.code));
@@ -139,6 +144,7 @@
Object err = Error::create(exec, GeneralError, "Unknown exception");
exec->setException(err);
}
+#endif
return val;
}
@@ -172,6 +178,8 @@
#endif
}
+#endif
+
ScriptInterpreter::~ScriptInterpreter()
{
#ifdef KJS_VERBOSE
@@ -179,6 +187,8 @@
#endif
}
+#if 0
+
void ScriptInterpreter::forgetDOMObject( void* objectHandle )
{
deleteDOMObject( objectHandle );
@@ -418,4 +428,6 @@
return res;
}
-}
+#endif
+
+}
\ No newline at end of file
No revision
No revision
1.57.16.1 +1 -0 WebCore/khtml/html/html_documentimpl.cpp
Index: html_documentimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_documentimpl.cpp,v
retrieving revision 1.57
retrieving revision 1.57.16.1
diff -u -r1.57 -r1.57.16.1
--- html_documentimpl.cpp 18 May 2004 20:20:40 -0000 1.57
+++ html_documentimpl.cpp 21 Oct 2005 20:58:42 -0000 1.57.16.1
@@ -113,6 +113,7 @@
// kdDebug( 6090 ) << "HTMLDocumentImpl constructor this = " << this << endl;
bodyElement = 0;
htmlElement = 0;
+ hMode = Html4;
/* dynamic history stuff to be fixed later (pfeiffer)
connect( KHTMLFactory::vLinks(), SIGNAL( inserted( const QString& )),
More information about the webkit-changes
mailing list