[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit a93db72233bd5a222eebe303310832ab2c34c744
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 16 08:16:21 2002 +0000

            Reviewed by Maciej.
    
    	- fixed 3128766 -- macconnection.com tries to add properties to the navigator DOM object, which fails
    
            * khtml/ecma/kjs_window.cpp: (Window::get): Set up properties named navigator and clientInformation
    	the first time either is queried. These will hold a persistent shared object rather than making one
    	every time it's asked for.
    
            * WebCore.pbproj/project.pbxproj: Let Electron undo Maciej's evil.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3078 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 09f540c..3ce5c12 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2002-12-16  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+	- fixed 3128766 -- macconnection.com tries to add properties to the navigator DOM object, which fails
+
+        * khtml/ecma/kjs_window.cpp: (Window::get): Set up properties named navigator and clientInformation
+	the first time either is queried. These will hold a persistent shared object rather than making one
+	every time it's asked for.
+
+        * WebCore.pbproj/project.pbxproj: Let Electron undo Maciej's evil.
+
 === WebKit-37u2 ===
 
 2002-12-15  Maciej Stachowiak  <mjs at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 09f540c..3ce5c12 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2002-12-16  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+	- fixed 3128766 -- macconnection.com tries to add properties to the navigator DOM object, which fails
+
+        * khtml/ecma/kjs_window.cpp: (Window::get): Set up properties named navigator and clientInformation
+	the first time either is queried. These will hold a persistent shared object rather than making one
+	every time it's asked for.
+
+        * WebCore.pbproj/project.pbxproj: Let Electron undo Maciej's evil.
+
 === WebKit-37u2 ===
 
 2002-12-15  Maciej Stachowiak  <mjs at apple.com>
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index 4174abb..acbf5d5 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -178,7 +178,6 @@
 </dict>
 </plist>
 ";
-			shouldUseHeadermap = 0;
 		};
 		0867D69DFE84028FC02AAC07 = {
 			buildActionMask = 2147483647;
diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index ceb69f1..71c16cc 100644
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -451,8 +451,13 @@ Value Window::get(ExecState *exec, const Identifier &p) const
     case Name:
       return String(m_part->name());
     case _Navigator:
-    case ClientInformation:
-      return Value(new Navigator(exec, m_part));
+    case ClientInformation: {
+      // Store the navigator in the object so we get the same one each time.
+      Navigator *n = new Navigator(exec, m_part);
+      const_cast<Window *>(this)->putDirect("navigator", n, DontDelete|ReadOnly);
+      const_cast<Window *>(this)->putDirect("clientInformation", n, DontDelete|ReadOnly);
+      return Value(n);
+    }
 #ifdef Q_WS_QWS
     case _Konqueror:
       return Value(new Konqueror(m_part));

-- 
WebKit Debian packaging