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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 62d79089877091c84cd6ad9baf4e0330b4786156
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 30 23:35:36 2003 +0000

    	Fixed: <rdar://problem/3458368>: drawing to the screen while window hidden: http://www.bhphotovideo.com/
    
            Reviewed by john.
    
            * Plugins.subproj/WebBaseNetscapePluginView.m:
            (-[WebBaseNetscapePluginView saveAndSetPortStateForUpdate:]): clip out the plug-in when the window is miniaturized or hidden
            (-[WebBaseNetscapePluginView restartNullEvents]): don't restart null events if the window is miniaturized, this allows restartNullEvents to be called in start and viewDidMoveToWindow without needing to make the check
            (-[WebBaseNetscapePluginView start]): just call restartNullEvents instead of checking if the window is miniaturized
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5331 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 1a818c7..5e818f3 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-10-30  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3458368>: drawing to the screen while window hidden: http://www.bhphotovideo.com/
+
+        Reviewed by john.
+
+        * Plugins.subproj/WebBaseNetscapePluginView.m:
+        (-[WebBaseNetscapePluginView saveAndSetPortStateForUpdate:]): clip out the plug-in when the window is miniaturized or hidden
+        (-[WebBaseNetscapePluginView restartNullEvents]): don't restart null events if the window is miniaturized, this allows restartNullEvents to be called in start and viewDidMoveToWindow without needing to make the check
+        (-[WebBaseNetscapePluginView start]): just call restartNullEvents instead of checking if the window is miniaturized
+
 2003-10-30  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Hyatt
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index 3a026e3..51458cd 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -188,7 +188,8 @@ static OSStatus TSMEventHandler(EventHandlerCallRef inHandlerRef, EventRef inEve
 
     // Clip out the plug-in when it's not really in a window or off screen or has no height or width.
     // The "big negative number" technique is how WebCore expresses off-screen widgets.
-    if (window.width <= 0 || window.height <= 0 || window.x < -100000 || [self window] == nil) {
+    NSWindow *realWindow = [self window];
+    if (window.width <= 0 || window.height <= 0 || window.x < -100000 || realWindow == nil || [realWindow isMiniaturized] || [NSApp isHidden]) {
         // The following code tries to give plug-ins the same size they will eventually have.
         // The specifiedWidth and specifiedHeight variables are used to predict the size that
         // WebCore will eventually resize us to.
@@ -407,9 +408,15 @@ static OSStatus TSMEventHandler(EventHandlerCallRef inHandlerRef, EventRef inEve
 
 - (void)restartNullEvents
 {
+    ASSERT([self window]);
+    
     if (nullEventTimer) {
         [self stopNullEvents];
     }
+    
+    if ([[self window] isMiniaturized]) {
+        return;
+    }
 
     NSTimeInterval interval;
 
@@ -814,9 +821,7 @@ static OSStatus TSMEventHandler(EventHandlerCallRef inHandlerRef, EventRef inEve
         if ([[self window] isKeyWindow]) {
             [self sendActivateEvent:YES];
         }
-        if (![[self window] isMiniaturized]) {
-            [self restartNullEvents];
-        }
+        [self restartNullEvents];
     }
 
     [self resetTrackingRect];

-- 
WebKit Debian packaging