[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 80589b3d5267c546b944e2fee39f8cec3ac3e042
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 9 05:22:05 2002 +0000

    	- fixed 3069764 -- REGRESSION: Plug-ins sometimes don't respond to
    	update events, causes disappearing
    
            * Plugins.subproj/WebBaseNetscapePluginView.m:
            (-[WebBaseNetscapePluginView drawRect:]): Set the visible region of the port to the
    	port bounds to work around the fact that NSWindow tries to help us by doing a
    	BeginUpdate call. This ensures we can draw where we think we are dirty, not just
    	where Carbon thinks we are dirty.
    
            * Plugins.subproj/WebNetscapePluginDocumentView.m: Tweak includes.
            * Plugins.subproj/WebNetscapePluginEmbeddedView.m: Tweak includes.
            * WebCoreSupport.subproj/WebBridge.m:
            (-[WebBridge openNewWindowWithURL:referrer:frameName:]): Tweak.
    
            * English.lproj/StringsNotToBeLocalized.txt: Update for recent changes.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2288 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 6556325..6c1ffb3 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,21 @@
+2002-10-09  Darin Adler  <darin at apple.com>
+
+	- fixed 3069764 -- REGRESSION: Plug-ins sometimes don't respond to
+	update events, causes disappearing
+
+        * Plugins.subproj/WebBaseNetscapePluginView.m:
+        (-[WebBaseNetscapePluginView drawRect:]): Set the visible region of the port to the
+	port bounds to work around the fact that NSWindow tries to help us by doing a
+	BeginUpdate call. This ensures we can draw where we think we are dirty, not just
+	where Carbon thinks we are dirty.
+
+        * Plugins.subproj/WebNetscapePluginDocumentView.m: Tweak includes.
+        * Plugins.subproj/WebNetscapePluginEmbeddedView.m: Tweak includes.
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge openNewWindowWithURL:referrer:frameName:]): Tweak.
+
+        * English.lproj/StringsNotToBeLocalized.txt: Update for recent changes.
+
 2002-10-08  Darin Adler  <darin at apple.com>
 
 	Make WebFrame do the entire frame hierarchy, instead of having the
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 6556325..6c1ffb3 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,21 @@
+2002-10-09  Darin Adler  <darin at apple.com>
+
+	- fixed 3069764 -- REGRESSION: Plug-ins sometimes don't respond to
+	update events, causes disappearing
+
+        * Plugins.subproj/WebBaseNetscapePluginView.m:
+        (-[WebBaseNetscapePluginView drawRect:]): Set the visible region of the port to the
+	port bounds to work around the fact that NSWindow tries to help us by doing a
+	BeginUpdate call. This ensures we can draw where we think we are dirty, not just
+	where Carbon thinks we are dirty.
+
+        * Plugins.subproj/WebNetscapePluginDocumentView.m: Tweak includes.
+        * Plugins.subproj/WebNetscapePluginEmbeddedView.m: Tweak includes.
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge openNewWindowWithURL:referrer:frameName:]): Tweak.
+
+        * English.lproj/StringsNotToBeLocalized.txt: Update for recent changes.
+
 2002-10-08  Darin Adler  <darin at apple.com>
 
 	Make WebFrame do the entire frame hierarchy, instead of having the
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index 50c8a89..e46fe78 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -24,6 +24,7 @@
 "BufferTextDrawing"
 "Courier"
 "DOCBASE"
+"GET"
 "Helvetica"
 "IE"
 "Joy!peff"
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index 7ddde90..d256fc4 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -6,6 +6,7 @@
 #define USE_CARBON 1
 
 #import <WebKit/WebBaseNetscapePluginView.h>
+
 #import <WebKit/WebController.h>
 #import <WebKit/WebControllerPrivate.h>
 #import <WebKit/WebDataSource.h>
@@ -21,13 +22,14 @@
 #import <WebKit/WebView.h>
 #import <WebKit/WebWindowOperationsDelegate.h>
 
-//#import <WebFoundation/WebAssertions.h>
-#import <WebFoundation/WebFoundation.h>
+#import <WebFoundation/WebAssertions.h>
+#import <WebFoundation/WebHTTPResourceRequest.h>
 #import <WebFoundation/WebNSStringExtras.h>
 #import <WebFoundation/WebNSURLExtras.h>
 
 #import <AppKit/NSEvent_Private.h>
 #import <AppKit/NSWindow_Private.h>
+
 #import <Carbon/Carbon.h>
 
 @implementation WebBaseNetscapePluginView
@@ -155,10 +157,10 @@
     WindowRef windowRef = [[self window] _windowRef];
     event.message = (UInt32)windowRef;
 
-    BOOL acceptedEvent = [self sendEvent:&event]; 
+    BOOL acceptedEvent = [self sendEvent:&event];
 
     LOG(Plugins, "NPP_HandleEvent(updateEvt): %d", acceptedEvent);
-    
+
     return acceptedEvent;
 }
 
@@ -370,8 +372,8 @@
     nPort.port = port;
     
     // FIXME: Are these values correct? Without them, Flash freaks.
-    nPort.portx = -(int32)boundsInWindow.origin.x;
-    nPort.porty = -(int32)boundsInWindow.origin.y;
+    nPort.portx = (int32)-boundsInWindow.origin.x;
+    nPort.porty = (int32)-boundsInWindow.origin.y;
     
     window.window = &nPort;
     
@@ -626,12 +628,23 @@
 
 - (void)drawRect:(NSRect)rect
 {
-#if 0
-    [[NSColor redColor] set];
-    NSRectFill([self bounds]);
-#endif
-    if(isStarted){
+    if (isStarted) {
+        // AppKit tried to help us by doing a BeginUpdate.
+        // But the invalid region at that level didn't include AppKit's notion of what was not valid.
+        // We reset the port's visible region to counteract what BeginUpdate did.
+        RgnHandle savedVisibleRegion = NewRgn();
+        GetPortVisibleRegion(nPort.port, savedVisibleRegion);
+        Rect portBounds;
+        GetPortBounds(nPort.port, &portBounds);
+        RgnHandle portBoundsAsRegion = NewRgn();
+        RectRgn(portBoundsAsRegion, &portBounds);
+        SetPortVisibleRegion(nPort.port, portBoundsAsRegion);
+        DisposeRgn(portBoundsAsRegion);
+        
         [self sendUpdateEvent];
+
+        SetPortVisibleRegion(nPort.port, savedVisibleRegion);
+        DisposeRgn(savedVisibleRegion);
     }
 }
 
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m b/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
index da4eed0..f1c55a9 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
@@ -3,11 +3,12 @@
 	Copyright 2002, Apple, Inc. All rights reserved.
 */
 
+#import <WebKit/WebNetscapePluginDocumentView.h>
+
 #import <WebKit/WebController.h>
 #import <WebKit/WebDataSource.h>
 #import <WebKit/WebDocument.h>
 #import <WebKit/WebFrame.h>
-#import <WebKit/WebNetscapePluginDocumentView.h>
 #import <WebKit/WebNSViewExtras.h>
 #import <WebKit/WebPlugin.h>
 #import <WebKit/WebPluginDatabase.h>
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m b/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m
index ed170bc..4832eef 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m
@@ -3,15 +3,16 @@
 	Copyright 2002, Apple, Inc. All rights reserved.
 */
 
+#import <WebKit/WebNetscapePluginEmbeddedView.h>
+
 #import <WebKit/WebBaseNetscapePluginViewPrivate.h>
 #import <WebKit/WebController.h>
 #import <WebKit/WebFrame.h>
-#import <WebKit/WebNetscapePluginEmbeddedView.h>
 #import <WebKit/WebNSViewExtras.h>
 #import <WebKit/WebPlugin.h>
 #import <WebKit/WebView.h>
 
-#import <WebFoundation/WebFoundation.h>
+#import <WebFoundation/WebResourceRequest.h>
 
 @implementation WebNetscapePluginEmbeddedView
 
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index d40c98d..ab85582 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -73,8 +73,7 @@
 
     WebController *newController = [[[frame controller] windowOperationsDelegate] openNewWindowWithURL:URL referrer:referrer behind:NO];
     [newController _setTopLevelFrameName:name];
-    WebFrame *newFrame = [newController mainFrame];
-    return [newFrame _bridge];
+    return [[newController mainFrame] _bridge];
 }
 
 - (BOOL)areToolbarsVisible

-- 
WebKit Debian packaging