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

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:06:20 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit bd134a702dfd6809fad88293378a66d29fc0d419
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Apr 16 23:46:18 2002 +0000

    	* WebView.subproj/IFWebFrame.h:
    	* WebView.subproj/IFWebFrame.mm:
    	* WebView.subproj/IFWebFramePrivate.h:
    	Change view/setView back to be id, rather than IFWebView.
    	In the future, the view may be some other kind of object.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1034 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 37f7cfb..5737b9d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+in 2002-04-16  Darin Adler  <darin at apple.com>
+
+	* WebView.subproj/IFWebFrame.h:
+	* WebView.subproj/IFWebFrame.mm:
+	* WebView.subproj/IFWebFramePrivate.h:
+	Change view/setView back to be id, rather than IFWebView.
+	In the future, the view may be some other kind of object.
+
 2002-04-16  John Sullivan  <sullivan at apple.com>
 
 	Fixed bug Chris noticed where Alexander wasn't putting up
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 37f7cfb..5737b9d 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+in 2002-04-16  Darin Adler  <darin at apple.com>
+
+	* WebView.subproj/IFWebFrame.h:
+	* WebView.subproj/IFWebFrame.mm:
+	* WebView.subproj/IFWebFramePrivate.h:
+	Change view/setView back to be id, rather than IFWebView.
+	In the future, the view may be some other kind of object.
+
 2002-04-16  John Sullivan  <sullivan at apple.com>
 
 	Fixed bug Chris noticed where Alexander wasn't putting up
diff --git a/WebKit/WebView.subproj/IFWebFrame.h b/WebKit/WebView.subproj/IFWebFrame.h
index 0fc6b42..5548a99 100644
--- a/WebKit/WebView.subproj/IFWebFrame.h
+++ b/WebKit/WebView.subproj/IFWebFrame.h
@@ -10,7 +10,6 @@
 
 @class IFError;
 @class IFWebDataSource;
- at class IFWebView;
 @protocol IFWebController;
 
 @class IFWebFramePrivate;
@@ -27,8 +26,8 @@
 - (void)setController: (id <IFWebController>)controller;
 - (id <IFWebController>)controller;
 
-- (void)setView: (IFWebView *)view;
-- (IFWebView *)view;
+- (void)setView: (id)view;
+- (id)view;
 
 /*
     Sets the frame's data source.  Note that the data source will be
diff --git a/WebKit/WebView.subproj/IFWebFrame.mm b/WebKit/WebView.subproj/IFWebFrame.mm
index ede9e1f..23b993e 100644
--- a/WebKit/WebView.subproj/IFWebFrame.mm
+++ b/WebKit/WebView.subproj/IFWebFrame.mm
@@ -61,13 +61,13 @@
 }
 
 
-- (void)setView: (IFWebView *)v
+- (void)setView: v
 {
     [_private setView: v];
     [v _setController: [self controller]];
 }
 
-- (IFWebView *)view
+- view
 {
     return [_private view];
 }
diff --git a/WebKit/WebView.subproj/IFWebFramePrivate.h b/WebKit/WebView.subproj/IFWebFramePrivate.h
index 671bae7..a7c507e 100644
--- a/WebKit/WebView.subproj/IFWebFramePrivate.h
+++ b/WebKit/WebView.subproj/IFWebFramePrivate.h
@@ -48,8 +48,8 @@ typedef enum {
 - (NSString *)name;
 - (void)setController: (id <IFWebController>)c;
 - (id <IFWebController>)controller;
-- (void)setView: (IFWebView *)v;
-- (IFWebView *)view;
+- (void)setView: v;
+- view;
 - (void)setDataSource: (IFWebDataSource *)d;
 - (IFWebDataSource *)dataSource;
 - (void)setProvisionalDataSource: (IFWebDataSource *)d;
diff --git a/WebKit/WebView.subproj/WebFrame.h b/WebKit/WebView.subproj/WebFrame.h
index 0fc6b42..5548a99 100644
--- a/WebKit/WebView.subproj/WebFrame.h
+++ b/WebKit/WebView.subproj/WebFrame.h
@@ -10,7 +10,6 @@
 
 @class IFError;
 @class IFWebDataSource;
- at class IFWebView;
 @protocol IFWebController;
 
 @class IFWebFramePrivate;
@@ -27,8 +26,8 @@
 - (void)setController: (id <IFWebController>)controller;
 - (id <IFWebController>)controller;
 
-- (void)setView: (IFWebView *)view;
-- (IFWebView *)view;
+- (void)setView: (id)view;
+- (id)view;
 
 /*
     Sets the frame's data source.  Note that the data source will be
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index ede9e1f..23b993e 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -61,13 +61,13 @@
 }
 
 
-- (void)setView: (IFWebView *)v
+- (void)setView: v
 {
     [_private setView: v];
     [v _setController: [self controller]];
 }
 
-- (IFWebView *)view
+- view
 {
     return [_private view];
 }
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index 671bae7..a7c507e 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -48,8 +48,8 @@ typedef enum {
 - (NSString *)name;
 - (void)setController: (id <IFWebController>)c;
 - (id <IFWebController>)controller;
-- (void)setView: (IFWebView *)v;
-- (IFWebView *)view;
+- (void)setView: v;
+- view;
 - (void)setDataSource: (IFWebDataSource *)d;
 - (IFWebDataSource *)dataSource;
 - (void)setProvisionalDataSource: (IFWebDataSource *)d;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list