[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:14:27 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit bf035194204a14f04da3003cb743bfe4f149c535
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed May 22 20:31:44 2002 +0000
Fixed crasher caused by not retaining.
Fixed targeting bug.
* Plugins.subproj/IFPluginView.mm:
(-[IFPluginView initWithFrame:plugin:url:mime:arguments:mode:]):
(-[IFPluginView getURLNotify:target:notifyData:]):
(-[IFPluginView getURL:target:]):
(-[IFPluginView postURLNotify:target:len:buf:file:notifyData:]):
(-[IFPluginView postURL:target:len:buf:file:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1195 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 86bedf1..5ef339d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2002-05-22 Chris Blumenberg <cblu at apple.com>
+
+ Fixed crasher caused by not retaining.
+ Fixed targeting bug.
+
+ * Plugins.subproj/IFPluginView.mm:
+ (-[IFPluginView initWithFrame:plugin:url:mime:arguments:mode:]):
+ (-[IFPluginView getURLNotify:target:notifyData:]):
+ (-[IFPluginView getURL:target:]):
+ (-[IFPluginView postURLNotify:target:len:buf:file:notifyData:]):
+ (-[IFPluginView postURL:target:len:buf:file:]):
+
2002-05-22 Richard J. Williamson <rjw at apple.com>
Changed semantics of isLoading to only return YES if
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 86bedf1..5ef339d 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-05-22 Chris Blumenberg <cblu at apple.com>
+
+ Fixed crasher caused by not retaining.
+ Fixed targeting bug.
+
+ * Plugins.subproj/IFPluginView.mm:
+ (-[IFPluginView initWithFrame:plugin:url:mime:arguments:mode:]):
+ (-[IFPluginView getURLNotify:target:notifyData:]):
+ (-[IFPluginView getURL:target:]):
+ (-[IFPluginView postURLNotify:target:len:buf:file:notifyData:]):
+ (-[IFPluginView postURL:target:len:buf:file:]):
+
2002-05-22 Richard J. Williamson <rjw at apple.com>
Changed semantics of isLoading to only return YES if
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index a01ddd9..195addf 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -321,7 +321,7 @@ static char *newCString(NSString *string)
}
streams = [[NSMutableArray alloc] init];
- notificationData = [NSMutableDictionary dictionaryWithCapacity:1];
+ notificationData = [[NSMutableDictionary dictionaryWithCapacity:1] retain];
// Initialize globals
canRestart = YES;
@@ -630,7 +630,7 @@ static char *newCString(NSString *string)
return NPERR_INVALID_URL;
if(target)
- theTarget = [NSString stringWithCString:url];
+ theTarget = [NSString stringWithCString:target];
return [self loadURL:[NSString stringWithCString:url] inTarget:theTarget withNotifyData:notifyData andHandleAttributes:nil];
}
@@ -645,9 +645,9 @@ static char *newCString(NSString *string)
return NPERR_INVALID_URL;
if(target)
- theTarget = [NSString stringWithCString:url];
+ theTarget = [NSString stringWithCString:target];
- return [self loadURL:[NSString stringWithCString:url] inTarget:theTarget withNotifyData:nil andHandleAttributes:nil];
+ return [self loadURL:[NSString stringWithCString:url] inTarget:theTarget withNotifyData:NULL andHandleAttributes:nil];
}
-(NPError)postURLNotify:(const char *)url target:(const char *)target len:(UInt32)len buf:(const char *)buf file:(NPBool)file notifyData:(void *)notifyData
@@ -663,7 +663,7 @@ static char *newCString(NSString *string)
return NPERR_INVALID_URL;
if(target)
- theTarget = [NSString stringWithCString:url];
+ theTarget = [NSString stringWithCString:target];
if(file){
if([[NSString stringWithCString:buf] _IF_looksLikeAbsoluteURL]){
@@ -695,7 +695,7 @@ static char *newCString(NSString *string)
return NPERR_INVALID_URL;
if(target)
- theTarget = [NSString stringWithCString:url];
+ theTarget = [NSString stringWithCString:target];
return [self postURLNotify:url target:target len:len buf:buf file:file notifyData:NULL];
}
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index a01ddd9..195addf 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -321,7 +321,7 @@ static char *newCString(NSString *string)
}
streams = [[NSMutableArray alloc] init];
- notificationData = [NSMutableDictionary dictionaryWithCapacity:1];
+ notificationData = [[NSMutableDictionary dictionaryWithCapacity:1] retain];
// Initialize globals
canRestart = YES;
@@ -630,7 +630,7 @@ static char *newCString(NSString *string)
return NPERR_INVALID_URL;
if(target)
- theTarget = [NSString stringWithCString:url];
+ theTarget = [NSString stringWithCString:target];
return [self loadURL:[NSString stringWithCString:url] inTarget:theTarget withNotifyData:notifyData andHandleAttributes:nil];
}
@@ -645,9 +645,9 @@ static char *newCString(NSString *string)
return NPERR_INVALID_URL;
if(target)
- theTarget = [NSString stringWithCString:url];
+ theTarget = [NSString stringWithCString:target];
- return [self loadURL:[NSString stringWithCString:url] inTarget:theTarget withNotifyData:nil andHandleAttributes:nil];
+ return [self loadURL:[NSString stringWithCString:url] inTarget:theTarget withNotifyData:NULL andHandleAttributes:nil];
}
-(NPError)postURLNotify:(const char *)url target:(const char *)target len:(UInt32)len buf:(const char *)buf file:(NPBool)file notifyData:(void *)notifyData
@@ -663,7 +663,7 @@ static char *newCString(NSString *string)
return NPERR_INVALID_URL;
if(target)
- theTarget = [NSString stringWithCString:url];
+ theTarget = [NSString stringWithCString:target];
if(file){
if([[NSString stringWithCString:buf] _IF_looksLikeAbsoluteURL]){
@@ -695,7 +695,7 @@ static char *newCString(NSString *string)
return NPERR_INVALID_URL;
if(target)
- theTarget = [NSString stringWithCString:url];
+ theTarget = [NSString stringWithCString:target];
return [self postURLNotify:url target:target len:len buf:buf file:file notifyData:NULL];
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list