[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 08:46:32 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 77b5c3e919eb484d51d2c6bb6be7df2fe429e071
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jun 15 08:49:17 2004 +0000
Reviewed by Darin.
Fix crash with last checkin.
* khtml/ecma/kjs_binding.cpp:
(ScriptInterpreter::domObjectsPerDocument): check the same
property we want to initialize.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6853 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 10230d3..61ff892 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -2,6 +2,16 @@
Reviewed by Darin.
+ Fix crash with last checkin.
+
+ * khtml/ecma/kjs_binding.cpp:
+ (ScriptInterpreter::domObjectsPerDocument): check the same
+ property we want to initialize.
+
+2004-06-15 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Darin.
+
<rdar://problem/3685309>: (properties not shared for JS wrappers of same DOM object, accessed from different frames)
* khtml/ecma/kjs_binding.cpp:
diff --git a/WebCore/khtml/ecma/kjs_binding.cpp b/WebCore/khtml/ecma/kjs_binding.cpp
index 5219686..9d2409f 100644
--- a/WebCore/khtml/ecma/kjs_binding.cpp
+++ b/WebCore/khtml/ecma/kjs_binding.cpp
@@ -153,7 +153,7 @@ QPtrDict<DOMObject> & ScriptInterpreter::domObjects()
QPtrDict< QPtrDict<DOMObject> > & ScriptInterpreter::domObjectsPerDocument()
{
- if (!staticDomObjects) {
+ if (!staticDomObjectsPerDocument) {
staticDomObjectsPerDocument = new QPtrDict<QPtrDict<DOMObject> >();
staticDomObjectsPerDocument->setAutoDelete(true);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list