[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:54:45 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 696d3e32aeb054950d91bce661f7e839f15bb031
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jan 30 01:07:10 2002 +0000
Added setMainView: for John.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@564 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 403a9b6..ff7ca29 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,17 @@
2002-01-29 Richard Williamson <rjw at apple.com>
+ * ChangeLog:
+ * WebView.subproj/WKDefaultWebController.h:
+ * WebView.subproj/WKDefaultWebController.mm: (-[WKDefaultWebController
+ setView:andDataSource:]), (-[WKDefaultWebController dataSourceForView:]):
+
+2002-01-29 Richard Williamson <rjw at apple.com>
+
+ * WebView.subproj/WKDefaultWebController.mm: (-[WKDefaultWebController
+ setView:andDataSource:]):
+
+2002-01-29 Richard Williamson <rjw at apple.com>
+
First pass at frame code. Still needs lots of cleanup.
* WebKit.pbproj/project.pbxproj:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 403a9b6..ff7ca29 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,17 @@
2002-01-29 Richard Williamson <rjw at apple.com>
+ * ChangeLog:
+ * WebView.subproj/WKDefaultWebController.h:
+ * WebView.subproj/WKDefaultWebController.mm: (-[WKDefaultWebController
+ setView:andDataSource:]), (-[WKDefaultWebController dataSourceForView:]):
+
+2002-01-29 Richard Williamson <rjw at apple.com>
+
+ * WebView.subproj/WKDefaultWebController.mm: (-[WKDefaultWebController
+ setView:andDataSource:]):
+
+2002-01-29 Richard Williamson <rjw at apple.com>
+
First pass at frame code. Still needs lots of cleanup.
* WebKit.pbproj/project.pbxproj:
diff --git a/WebKit/WebView.subproj/IFBaseWebController.h b/WebKit/WebView.subproj/IFBaseWebController.h
index 6177fe0..0f016fa 100644
--- a/WebKit/WebView.subproj/IFBaseWebController.h
+++ b/WebKit/WebView.subproj/IFBaseWebController.h
@@ -31,6 +31,7 @@
// Find the data source for the specified view.
- (WKWebDataSource *)dataSourceForView: (WKWebView *)view;
+- (void)setMainView: (WKWebView *)view;
- (WKWebView *)mainView;
- (void)setMainDataSource: (WKWebDataSource *)dataSource;
diff --git a/WebKit/WebView.subproj/IFBaseWebController.mm b/WebKit/WebView.subproj/IFBaseWebController.mm
index 1df43e6..7a426c1 100644
--- a/WebKit/WebView.subproj/IFBaseWebController.mm
+++ b/WebKit/WebView.subproj/IFBaseWebController.mm
@@ -106,22 +106,25 @@
{
WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
- [data->viewMap release];
+ [data->viewMap autorelease];
data->viewMap = [[NSMutableDictionary alloc] init];
- [data->dataSourceMap release];
+ [data->dataSourceMap autorelease];
data->dataSourceMap = [[NSMutableDictionary alloc] init];
- [data->mainView release];
+ [data->mainView autorelease];
data->mainView = [view retain];
[view _setController: self];
- [data->mainDataSource release];
+ [data->mainDataSource autorelease];
data->mainDataSource = [dataSource retain];
[dataSource _setController: self];
- [data->viewMap setObject: view forKey: [WKObjectHolder holderWithObject:dataSource]];
- [data->dataSourceMap setObject: dataSource forKey: [WKObjectHolder holderWithObject:view]];
+ if (dataSource != nil && view != nil){
+ [data->viewMap setObject: view forKey: [WKObjectHolder holderWithObject:dataSource]];
+
+ [data->dataSourceMap setObject: dataSource forKey: [WKObjectHolder holderWithObject:view]];
+ }
[view dataSourceChanged];
}
@@ -157,6 +160,12 @@
return [data->dataSourceMap objectForKey: [WKObjectHolder holderWithObject:view]];
}
+- (void)setMainView: (WKWebView *)m;
+{
+ WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
+ [self setView: m andDataSource: data->mainDataSource];
+}
+
- (WKWebView *)mainView
{
diff --git a/WebKit/WebView.subproj/IFDefaultWebController.h b/WebKit/WebView.subproj/IFDefaultWebController.h
index 6177fe0..0f016fa 100644
--- a/WebKit/WebView.subproj/IFDefaultWebController.h
+++ b/WebKit/WebView.subproj/IFDefaultWebController.h
@@ -31,6 +31,7 @@
// Find the data source for the specified view.
- (WKWebDataSource *)dataSourceForView: (WKWebView *)view;
+- (void)setMainView: (WKWebView *)view;
- (WKWebView *)mainView;
- (void)setMainDataSource: (WKWebDataSource *)dataSource;
diff --git a/WebKit/WebView.subproj/IFDefaultWebController.mm b/WebKit/WebView.subproj/IFDefaultWebController.mm
index 1df43e6..7a426c1 100644
--- a/WebKit/WebView.subproj/IFDefaultWebController.mm
+++ b/WebKit/WebView.subproj/IFDefaultWebController.mm
@@ -106,22 +106,25 @@
{
WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
- [data->viewMap release];
+ [data->viewMap autorelease];
data->viewMap = [[NSMutableDictionary alloc] init];
- [data->dataSourceMap release];
+ [data->dataSourceMap autorelease];
data->dataSourceMap = [[NSMutableDictionary alloc] init];
- [data->mainView release];
+ [data->mainView autorelease];
data->mainView = [view retain];
[view _setController: self];
- [data->mainDataSource release];
+ [data->mainDataSource autorelease];
data->mainDataSource = [dataSource retain];
[dataSource _setController: self];
- [data->viewMap setObject: view forKey: [WKObjectHolder holderWithObject:dataSource]];
- [data->dataSourceMap setObject: dataSource forKey: [WKObjectHolder holderWithObject:view]];
+ if (dataSource != nil && view != nil){
+ [data->viewMap setObject: view forKey: [WKObjectHolder holderWithObject:dataSource]];
+
+ [data->dataSourceMap setObject: dataSource forKey: [WKObjectHolder holderWithObject:view]];
+ }
[view dataSourceChanged];
}
@@ -157,6 +160,12 @@
return [data->dataSourceMap objectForKey: [WKObjectHolder holderWithObject:view]];
}
+- (void)setMainView: (WKWebView *)m;
+{
+ WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
+ [self setView: m andDataSource: data->mainDataSource];
+}
+
- (WKWebView *)mainView
{
diff --git a/WebKit/WebView.subproj/WKDefaultWebController.h b/WebKit/WebView.subproj/WKDefaultWebController.h
index 6177fe0..0f016fa 100644
--- a/WebKit/WebView.subproj/WKDefaultWebController.h
+++ b/WebKit/WebView.subproj/WKDefaultWebController.h
@@ -31,6 +31,7 @@
// Find the data source for the specified view.
- (WKWebDataSource *)dataSourceForView: (WKWebView *)view;
+- (void)setMainView: (WKWebView *)view;
- (WKWebView *)mainView;
- (void)setMainDataSource: (WKWebDataSource *)dataSource;
diff --git a/WebKit/WebView.subproj/WKDefaultWebController.mm b/WebKit/WebView.subproj/WKDefaultWebController.mm
index 1df43e6..7a426c1 100644
--- a/WebKit/WebView.subproj/WKDefaultWebController.mm
+++ b/WebKit/WebView.subproj/WKDefaultWebController.mm
@@ -106,22 +106,25 @@
{
WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
- [data->viewMap release];
+ [data->viewMap autorelease];
data->viewMap = [[NSMutableDictionary alloc] init];
- [data->dataSourceMap release];
+ [data->dataSourceMap autorelease];
data->dataSourceMap = [[NSMutableDictionary alloc] init];
- [data->mainView release];
+ [data->mainView autorelease];
data->mainView = [view retain];
[view _setController: self];
- [data->mainDataSource release];
+ [data->mainDataSource autorelease];
data->mainDataSource = [dataSource retain];
[dataSource _setController: self];
- [data->viewMap setObject: view forKey: [WKObjectHolder holderWithObject:dataSource]];
- [data->dataSourceMap setObject: dataSource forKey: [WKObjectHolder holderWithObject:view]];
+ if (dataSource != nil && view != nil){
+ [data->viewMap setObject: view forKey: [WKObjectHolder holderWithObject:dataSource]];
+
+ [data->dataSourceMap setObject: dataSource forKey: [WKObjectHolder holderWithObject:view]];
+ }
[view dataSourceChanged];
}
@@ -157,6 +160,12 @@
return [data->dataSourceMap objectForKey: [WKObjectHolder holderWithObject:view]];
}
+- (void)setMainView: (WKWebView *)m;
+{
+ WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
+ [self setView: m andDataSource: data->mainDataSource];
+}
+
- (WKWebView *)mainView
{
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list