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

cblu cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:22:24 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 94405f8c554030563f3bb0d9cc6b51593965fccd
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 1 18:15:40 2002 +0000

    WebKit:
    
    	Minor cleanup
    
            * Plugins.subproj/IFNullPluginView.mm:
            (-[IFNullPluginView initWithFrame:mimeType:arguments:]):
            (-[IFNullPluginView dealloc]):
    
    WebBrowser:
    
    	Add support for delete, clear and stop menu items and keyboard shortcuts
    	in Downloads.
    
            * DownloadMonitor.m:
            (-[DownloadMonitor validateUserInterfaceItem:]):
            (-[DownloadMonitor stopLoading:]): added
            (-[DownloadMonitor clear:]): added
            (-[DownloadMonitor didDoubleClick]):
            (-[DownloadMonitor didHitDeleteKey]): added
            * ListView.m:
            (-[ListView keyDown:]): look for delete key
            (-[ListView validateUserInterfaceItem:]):
            * WebBrowser.pbproj/project.pbxproj:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1483 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9525e5d..d89aaef 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2002-07-01  Chris Blumenberg  <cblu at apple.com>
+
+	Minor cleanup
+	
+        * Plugins.subproj/IFNullPluginView.mm:
+        (-[IFNullPluginView initWithFrame:mimeType:arguments:]):
+        (-[IFNullPluginView dealloc]):
+
 2002-07-01  Darin Adler  <darin at apple.com>
 
         * Plugins.subproj/IFPlugin.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 9525e5d..d89aaef 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-07-01  Chris Blumenberg  <cblu at apple.com>
+
+	Minor cleanup
+	
+        * Plugins.subproj/IFNullPluginView.mm:
+        (-[IFNullPluginView initWithFrame:mimeType:arguments:]):
+        (-[IFNullPluginView dealloc]):
+
 2002-07-01  Darin Adler  <darin at apple.com>
 
         * Plugins.subproj/IFPlugin.m:
diff --git a/WebKit/Plugins.subproj/IFNullPluginView.mm b/WebKit/Plugins.subproj/IFNullPluginView.mm
index 86c63de..4d4890a 100644
--- a/WebKit/Plugins.subproj/IFNullPluginView.mm
+++ b/WebKit/Plugins.subproj/IFNullPluginView.mm
@@ -30,29 +30,20 @@ static NSImage *image = nil;
         }
         [self setImage:image];
         
+        mimeType = [mime retain];
         pluginPageString = [arguments objectForKey:@"pluginspage"];
         if(pluginPageString)
             pluginPage = [[NSURL _IF_URLWithString:pluginPageString] retain];
-        if(mime)
-            mimeType = [mime retain];
         
         errorSent = NO;
     }
     return self;
 }
 
-- (NSView *) findSuperview:(NSString *) viewName
+- (void)dealloc
 {
-    NSView *view;
-    
-    view = self;
-    while(view){
-        view = [view superview];
-        if([[view className] isEqualToString:viewName]){
-            return view;
-        }
-    }
-    return nil;
+    [pluginPage release];
+    [mimeType release];
 }
 
 - (void)drawRect:(NSRect)rect {
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.m b/WebKit/Plugins.subproj/WebNullPluginView.m
index 86c63de..4d4890a 100644
--- a/WebKit/Plugins.subproj/WebNullPluginView.m
+++ b/WebKit/Plugins.subproj/WebNullPluginView.m
@@ -30,29 +30,20 @@ static NSImage *image = nil;
         }
         [self setImage:image];
         
+        mimeType = [mime retain];
         pluginPageString = [arguments objectForKey:@"pluginspage"];
         if(pluginPageString)
             pluginPage = [[NSURL _IF_URLWithString:pluginPageString] retain];
-        if(mime)
-            mimeType = [mime retain];
         
         errorSent = NO;
     }
     return self;
 }
 
-- (NSView *) findSuperview:(NSString *) viewName
+- (void)dealloc
 {
-    NSView *view;
-    
-    view = self;
-    while(view){
-        view = [view superview];
-        if([[view className] isEqualToString:viewName]){
-            return view;
-        }
-    }
-    return nil;
+    [pluginPage release];
+    [mimeType release];
 }
 
 - (void)drawRect:(NSRect)rect {

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list