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

Sat Sep 26 06:17:30 UTC 2009

The following commit has been merged in the debian/unstable branch:
commit 63e3077ac82bffcaad60792bac3d9b85d325c439
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jun 7 20:02:03 2002 +0000

    	* kwq/KWQPtrDictImpl.h: Use CoreFoundation.h -- new compiler
    	is picky about the difference between struct and typedef.
    
    	* kwq/KWQValueListImpl.h: Add a friend declaration that we need
    	because the new compiler is more strict.
    
    	- fix 2949882 -- joecartoon.com crashes
    
    	* khtml/ecma/kjs_window.cpp: (Window::get): Turn off some code that
    	doesn't work for us -- similar to code elsewhere in this file that
    	was also turned off.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1295 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index c73487c..c75cf9d 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,17 @@
+2002-06-07  Darin Adler  <darin at apple.com>
+
+	* kwq/KWQPtrDictImpl.h: Use CoreFoundation.h -- new compiler
+	is picky about the difference between struct and typedef.
+
+	* kwq/KWQValueListImpl.h: Add a friend declaration that we need
+	because the new compiler is more strict.
+
+	- fix 2949882 -- joecartoon.com crashes
+
+	* khtml/ecma/kjs_window.cpp: (Window::get): Turn off some code that
+	doesn't work for us -- similar to code elsewhere in this file that
+	was also turned off.
+
 2002-06-07  Chris Blumenberg  <cblu at apple.com>
 
         Made IFWebController a class.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index c73487c..c75cf9d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,17 @@
+2002-06-07  Darin Adler  <darin at apple.com>
+
+	* kwq/KWQPtrDictImpl.h: Use CoreFoundation.h -- new compiler
+	is picky about the difference between struct and typedef.
+
+	* kwq/KWQValueListImpl.h: Add a friend declaration that we need
+	because the new compiler is more strict.
+
+	- fix 2949882 -- joecartoon.com crashes
+
+	* khtml/ecma/kjs_window.cpp: (Window::get): Turn off some code that
+	doesn't work for us -- similar to code elsewhere in this file that
+	was also turned off.
+
 2002-06-07  Chris Blumenberg  <cblu at apple.com>
 
         Made IFWebController a class.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c73487c..c75cf9d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2002-06-07  Darin Adler  <darin at apple.com>
+
+	* kwq/KWQPtrDictImpl.h: Use CoreFoundation.h -- new compiler
+	is picky about the difference between struct and typedef.
+
+	* kwq/KWQValueListImpl.h: Add a friend declaration that we need
+	because the new compiler is more strict.
+
+	- fix 2949882 -- joecartoon.com crashes
+
+	* khtml/ecma/kjs_window.cpp: (Window::get): Turn off some code that
+	doesn't work for us -- similar to code elsewhere in this file that
+	was also turned off.
+
 2002-06-07  Chris Blumenberg  <cblu at apple.com>
 
         Made IFWebController a class.
diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index 39e5084..678b32c 100644
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -378,12 +378,15 @@ Value Window::get(ExecState *exec, const UString &p) const
     case Document:
       if (isSafeScript(exec))
       {
+#ifndef APPLE_CHANGES
+        // FIXME: need to figure out and emulate point of this code.
         if (m_part->document().isNull()) {
           kdDebug(6070) << "Document.write: adding <HTML><BODY> to create document" << endl;
           m_part->begin();
           m_part->write("<HTML><BODY>");
           m_part->end();
         }
+#endif
         Value val = getDOMNode(exec,m_part->document());
         return val;
       }
diff --git a/WebCore/kwq/KWQPtrDictImpl.h b/WebCore/kwq/KWQPtrDictImpl.h
index 57d3131..abe838d 100644
--- a/WebCore/kwq/KWQPtrDictImpl.h
+++ b/WebCore/kwq/KWQPtrDictImpl.h
@@ -30,7 +30,7 @@
 
 #include <stddef.h>
 
-struct CFDictionaryKeyCallBacks;
+#include <CoreFoundation/CoreFoundation.h>
     
 class KWQPtrDictPrivate;
 
diff --git a/WebCore/kwq/KWQValueListImpl.h b/WebCore/kwq/KWQValueListImpl.h
index 2d46144..2d941b8 100644
--- a/WebCore/kwq/KWQValueListImpl.h
+++ b/WebCore/kwq/KWQValueListImpl.h
@@ -108,6 +108,8 @@ private:
     class KWQValueListPrivate;
 
     KWQRefPtr<KWQValueListPrivate> d;
+    
+    friend class KWQValueListNodeImpl;
 };
 
 class KWQValueListNodeImpl

-- 
WebKit Debian packaging

