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

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit f9108c437a44d9b967b28fb4a9aa832af22c8862
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Apr 15 20:34:32 2002 +0000

    	* Plugins.subproj/IFNullPluginView.mm: (-[IFNullPluginView drawRect:]):
    	Moved a line of code to prevent pluginNotFound message from being
    	sent twice.
    
    Fixed 2896326 -- Alexander should show an error when pluginNotFoundForMIMEType: pluginPageURL: is called
    
    Also made the minimum change required to use Alexander without running into
    assertions, until the locationChangeHandler changes are finished.
    
    	* BrowserDocument.m:
    	(-[BrowserDocument _saveScrollPosition]),
    	(-[BrowserDocument _restoreScrollPosition]):
    	Commented out guts of these methods, which were triggering an assertion.
    	(The assertion is being triggered by the in-flux state of the
    	locationChangeHandler stuff.)
    
    	(-[BrowserDocument locationChangeStartedForFrame:]),
    	(-[BrowserDocument locationChangeCommittedForFrame:]),
    	(-[BrowserDocument locationChangeDone:forFrame:]):
    	Changed wording of WEBKITDEBUG messages.
    
    	(-[BrowserDocument pluginNotFoundSheetEnded:returnCode:contextInfo:]),
    	(-[BrowserDocument pluginNotFoundForMIMEType:pluginPageURL:]):
    	Implementation for sheet that appears if plugin isn't found.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1017 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index bf8c868..d468969 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-15  John Sullivan  <sullivan at apple.com>
+
+	* Plugins.subproj/IFNullPluginView.mm: (-[IFNullPluginView drawRect:]):
+	Moved a line of code to prevent pluginNotFound message from being
+	sent twice.
+
 2002-04-15  Richard Williamson  <rjw at apple.com>
 
         Changes to IFLocationChangeHandler.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index bf8c868..d468969 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-04-15  John Sullivan  <sullivan at apple.com>
+
+	* Plugins.subproj/IFNullPluginView.mm: (-[IFNullPluginView drawRect:]):
+	Moved a line of code to prevent pluginNotFound message from being
+	sent twice.
+
 2002-04-15  Richard Williamson  <rjw at apple.com>
 
         Changes to IFLocationChangeHandler.
diff --git a/WebKit/Plugins.subproj/IFNullPluginView.mm b/WebKit/Plugins.subproj/IFNullPluginView.mm
index a8f9206..d5f6d58 100644
--- a/WebKit/Plugins.subproj/IFNullPluginView.mm
+++ b/WebKit/Plugins.subproj/IFNullPluginView.mm
@@ -71,10 +71,10 @@ static id IFNullPluginMake(NSRect rect, NSString *mimeType, NSDictionary *argume
     
     [super drawRect:rect];
     if(!errorSent){
+        errorSent = YES;
         webView = [self findSuperview:@"IFWebView"];
         webController = [webView controller];
         [webController pluginNotFoundForMIMEType:mimeType pluginPageURL:pluginPage];
-        errorSent = YES;
     }
 }
 
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.m b/WebKit/Plugins.subproj/WebNullPluginView.m
index a8f9206..d5f6d58 100644
--- a/WebKit/Plugins.subproj/WebNullPluginView.m
+++ b/WebKit/Plugins.subproj/WebNullPluginView.m
@@ -71,10 +71,10 @@ static id IFNullPluginMake(NSRect rect, NSString *mimeType, NSDictionary *argume
     
     [super drawRect:rect];
     if(!errorSent){
+        errorSent = YES;
         webView = [self findSuperview:@"IFWebView"];
         webController = [webView controller];
         [webController pluginNotFoundForMIMEType:mimeType pluginPageURL:pluginPage];
-        errorSent = YES;
     }
 }
 

-- 
WebKit Debian packaging