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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit af1332a394ee9d71de70e720b6d416e946050f51
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 23 06:25:31 2002 +0000

    	Forgot to check this in earlier:
    
    	- fixed 3077084 - debugging output when suppressing or allowing
    	pop-ups
    
            * khtml/ecma/kjs_window.cpp:
            (WindowFunc::tryCall):
            * kwq/KWQLogging.h:
            * kwq/KWQLogging.m:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2430 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index d0e0941..9634250 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-10-22  Maciej Stachowiak  <mjs at apple.com>
+
+	Forgot to check this in earlier:
+
+	- fixed 3077084 - debugging output when suppressing or allowing
+	pop-ups
+	
+        * khtml/ecma/kjs_window.cpp:
+        (WindowFunc::tryCall):
+        * kwq/KWQLogging.h:
+        * kwq/KWQLogging.m:
+
 2002-10-22  David Hyatt  <hyatt at apple.com>
 
 	Get XML files closer.  An XML doc is at least made.  No
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d0e0941..9634250 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2002-10-22  Maciej Stachowiak  <mjs at apple.com>
+
+	Forgot to check this in earlier:
+
+	- fixed 3077084 - debugging output when suppressing or allowing
+	pop-ups
+	
+        * khtml/ecma/kjs_window.cpp:
+        (WindowFunc::tryCall):
+        * kwq/KWQLogging.h:
+        * kwq/KWQLogging.m:
+
 2002-10-22  David Hyatt  <hyatt at apple.com>
 
 	Get XML files closer.  An XML doc is at least made.  No
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d0e0941..9634250 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2002-10-22  Maciej Stachowiak  <mjs at apple.com>
+
+	Forgot to check this in earlier:
+
+	- fixed 3077084 - debugging output when suppressing or allowing
+	pop-ups
+	
+        * khtml/ecma/kjs_window.cpp:
+        (WindowFunc::tryCall):
+        * kwq/KWQLogging.h:
+        * kwq/KWQLogging.m:
+
 2002-10-22  David Hyatt  <hyatt at apple.com>
 
 	Get XML files closer.  An XML doc is at least made.  No
diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index 774f278..8aedf3c 100644
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -34,6 +34,7 @@
 #include <qstyle.h>
 
 #if APPLE_CHANGES
+#include <KWQLogging.h>
 #define _COLLECTOR
 #endif
 #include <kjs/collector.h>
@@ -1025,7 +1026,16 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
     {
       // window.open disabled unless from a key/mouse event
       if (static_cast<ScriptInterpreter *>(exec->interpreter())->isWindowOpenAllowed())
+#ifndef APPLE_CHANGES
+        policy = 0;
+#else
+      {
         policy = 0;
+	LOG(PopupBlocking, "Allowed JavaScript window open of %s", args[0].toString(exec).qstring().ascii());
+      } else {
+	LOG(PopupBlocking, "Blocked JavaScript window open of %s", args[0].toString(exec).qstring().ascii());
+      }
+#endif
     }
     if ( policy != 0 ) {
       return Undefined();
diff --git a/WebCore/kwq/KWQLogging.h b/WebCore/kwq/KWQLogging.h
index 7faad80..5993f05 100644
--- a/WebCore/kwq/KWQLogging.h
+++ b/WebCore/kwq/KWQLogging.h
@@ -16,3 +16,4 @@ extern KWQLogChannel KWQLogNotYetImplemented;
 
 extern KWQLogChannel KWQLogFrames;
 extern KWQLogChannel KWQLogLoading;
+extern KWQLogChannel KWQLogPopupBlocking;
diff --git a/WebCore/kwq/KWQLogging.m b/WebCore/kwq/KWQLogging.m
index 6ab2398..7c24de6 100644
--- a/WebCore/kwq/KWQLogging.m
+++ b/WebCore/kwq/KWQLogging.m
@@ -12,3 +12,5 @@ KWQLogChannel KWQLogNotYetImplemented = { 0x00000001, "WebCoreLogLevel", KWQLogC
 
 KWQLogChannel KWQLogFrames =            { 0x00000010, "WebCoreLogLevel", KWQLogChannelUninitialized };
 KWQLogChannel KWQLogLoading =           { 0x00000020, "WebCoreLogLevel", KWQLogChannelUninitialized };
+
+KWQLogChannel KWQLogPopupBlocking =     { 0x00000040, "WebCoreLogLevel", KWQLogChannelUninitialized };

-- 
WebKit Debian packaging