[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:49 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 0cfd38a9869ff6660c4df2b7173746cc1b2677f0
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jan 30 23:38:10 2002 +0000
Cleaned up frame code. Fixed duplicate content problem.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@568 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 68edfbc..e1d17f6 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2002-01-30 Richard Williamson <rjw at apple.com>
+
+ Cleaned up API w/ respect to frames.
+
+ * WebView.subproj/WKDefaultWebController.h:
+ * WebView.subproj/WKDefaultWebController.mm: (-[WKDefaultWebController
+ setView:andDataSource:]), (-[WKDefaultWebController
+ createFrameNamed:for:inParent:]):
+ * WebView.subproj/WKWebController.h:
+ * WebView.subproj/WKWebDataSource.h:
+
2002-01-30 Kenneth Kocienda <kocienda at apple.com>
Added *.lo, *.la, Icon, and .libs to .cvsignore files
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 68edfbc..e1d17f6 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-01-30 Richard Williamson <rjw at apple.com>
+
+ Cleaned up API w/ respect to frames.
+
+ * WebView.subproj/WKDefaultWebController.h:
+ * WebView.subproj/WKDefaultWebController.mm: (-[WKDefaultWebController
+ setView:andDataSource:]), (-[WKDefaultWebController
+ createFrameNamed:for:inParent:]):
+ * WebView.subproj/WKWebController.h:
+ * WebView.subproj/WKWebDataSource.h:
+
2002-01-30 Kenneth Kocienda <kocienda at apple.com>
Added *.lo, *.la, Icon, and .libs to .cvsignore files
diff --git a/WebKit/WebView.subproj/IFBaseWebController.h b/WebKit/WebView.subproj/IFBaseWebController.h
index 0f016fa..ea8d2a6 100644
--- a/WebKit/WebView.subproj/IFBaseWebController.h
+++ b/WebKit/WebView.subproj/IFBaseWebController.h
@@ -37,6 +37,4 @@
- (void)setMainDataSource: (WKWebDataSource *)dataSource;
- (WKWebDataSource *)mainDataSource;
-- (void)addFrame: (WKWebFrame *)childFrame toParent: (WKWebDataSource *)parent;
-
@end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/IFBaseWebController.mm b/WebKit/WebView.subproj/IFBaseWebController.mm
index 7e31178..f04b6e8 100644
--- a/WebKit/WebView.subproj/IFBaseWebController.mm
+++ b/WebKit/WebView.subproj/IFBaseWebController.mm
@@ -6,6 +6,7 @@
#import <WebKit/WKDefaultWebControllerPrivate.h>
#import <WebKit/WKWebViewPrivate.h>
#import <WebKit/WKWebDataSourcePrivate.h>
+#import <WebKit/WKWebFrame.h>
#import <WebKit/WKException.h>
@@ -104,6 +105,7 @@
- (void)setView: (WKWebView *)view andDataSource: (WKWebDataSource *)dataSource
{
+ // FIXME: this needs to be implemented in terms of WKWebFrame.
WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
[data->viewMap autorelease];
@@ -130,21 +132,28 @@
[view dataSourceChanged];
}
-
-- (void)addFrame: (WKWebFrame *)childFrame toParent: (WKWebDataSource *)parent;
+- (WKWebFrame *)createFrameNamed: (NSString *)fname for: (WKWebDataSource *)childDataSource inParent: (WKWebDataSource *)parentDataSource
{
WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
- id view = [childFrame view];
- WKWebDataSource *child = [childFrame dataSource];
+ WKWebView *childView;
+ WKWebFrame *newFrame;
- [data->viewMap setObject: view forKey: [WKObjectHolder holderWithObject:child]];
- [view _setController: self];
- [data->dataSourceMap setObject: child forKey: [WKObjectHolder holderWithObject:view]];
- [child _setController: self];
+ childView = [[WKWebView alloc] initWithFrame: NSMakeRect (0,0,0,0)];
+
+ newFrame = [[[WKWebFrame alloc] initWithName: fname view: childView dataSource: childDataSource] autorelease];
- [view dataSourceChanged];
+ [parentDataSource addFrame: newFrame];
+
+ [data->viewMap setObject: childView forKey: [WKObjectHolder holderWithObject:childDataSource]];
+ [childView _setController: self];
+ [data->dataSourceMap setObject: childDataSource forKey: [WKObjectHolder holderWithObject:childView]];
+ [childDataSource _setController: self];
+
+ [childView dataSourceChanged];
+
+ //[child startLoading: YES];
- [child startLoading: YES];
+ return newFrame;
}
diff --git a/WebKit/WebView.subproj/IFDefaultWebController.h b/WebKit/WebView.subproj/IFDefaultWebController.h
index 0f016fa..ea8d2a6 100644
--- a/WebKit/WebView.subproj/IFDefaultWebController.h
+++ b/WebKit/WebView.subproj/IFDefaultWebController.h
@@ -37,6 +37,4 @@
- (void)setMainDataSource: (WKWebDataSource *)dataSource;
- (WKWebDataSource *)mainDataSource;
-- (void)addFrame: (WKWebFrame *)childFrame toParent: (WKWebDataSource *)parent;
-
@end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/IFDefaultWebController.mm b/WebKit/WebView.subproj/IFDefaultWebController.mm
index 7e31178..f04b6e8 100644
--- a/WebKit/WebView.subproj/IFDefaultWebController.mm
+++ b/WebKit/WebView.subproj/IFDefaultWebController.mm
@@ -6,6 +6,7 @@
#import <WebKit/WKDefaultWebControllerPrivate.h>
#import <WebKit/WKWebViewPrivate.h>
#import <WebKit/WKWebDataSourcePrivate.h>
+#import <WebKit/WKWebFrame.h>
#import <WebKit/WKException.h>
@@ -104,6 +105,7 @@
- (void)setView: (WKWebView *)view andDataSource: (WKWebDataSource *)dataSource
{
+ // FIXME: this needs to be implemented in terms of WKWebFrame.
WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
[data->viewMap autorelease];
@@ -130,21 +132,28 @@
[view dataSourceChanged];
}
-
-- (void)addFrame: (WKWebFrame *)childFrame toParent: (WKWebDataSource *)parent;
+- (WKWebFrame *)createFrameNamed: (NSString *)fname for: (WKWebDataSource *)childDataSource inParent: (WKWebDataSource *)parentDataSource
{
WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
- id view = [childFrame view];
- WKWebDataSource *child = [childFrame dataSource];
+ WKWebView *childView;
+ WKWebFrame *newFrame;
- [data->viewMap setObject: view forKey: [WKObjectHolder holderWithObject:child]];
- [view _setController: self];
- [data->dataSourceMap setObject: child forKey: [WKObjectHolder holderWithObject:view]];
- [child _setController: self];
+ childView = [[WKWebView alloc] initWithFrame: NSMakeRect (0,0,0,0)];
+
+ newFrame = [[[WKWebFrame alloc] initWithName: fname view: childView dataSource: childDataSource] autorelease];
- [view dataSourceChanged];
+ [parentDataSource addFrame: newFrame];
+
+ [data->viewMap setObject: childView forKey: [WKObjectHolder holderWithObject:childDataSource]];
+ [childView _setController: self];
+ [data->dataSourceMap setObject: childDataSource forKey: [WKObjectHolder holderWithObject:childView]];
+ [childDataSource _setController: self];
+
+ [childView dataSourceChanged];
+
+ //[child startLoading: YES];
- [child startLoading: YES];
+ return newFrame;
}
diff --git a/WebKit/WebView.subproj/IFWebController.h b/WebKit/WebView.subproj/IFWebController.h
index ef4430e..e3ec214 100644
--- a/WebKit/WebView.subproj/IFWebController.h
+++ b/WebKit/WebView.subproj/IFWebController.h
@@ -103,6 +103,7 @@
@class WKWebDataSource;
@class WKError;
@class WKWebView;
+ at class WKWebFrame;
#ifdef TENTATIVE_API
/*
@@ -301,6 +302,12 @@
or do we just use the umbrella protocol?]
*/
@protocol WKWebController <WKLoadHandler, WKScriptContextHandler, WKAuthenticationHandler, WKLocationChangeHandler>
+
+
+// Called when a data source needs to create a frame. This method encapsulates the
+// specifics of creating and initializaing a view of the appropriate class.
+- (WKWebFrame *)createFrameNamed: (NSString *)fname for: (WKWebDataSource *)child inParent: (WKWebDataSource *)parent;
+
@end
diff --git a/WebKit/WebView.subproj/IFWebDataSource.h b/WebKit/WebView.subproj/IFWebDataSource.h
index 959a467..f0e3f8d 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.h
+++ b/WebKit/WebView.subproj/IFWebDataSource.h
@@ -99,8 +99,9 @@
- (WKWebDataSource *)parent;
-// Add a child frame. [Should this be private? Only called when a
-// data source is created automatically in a frame set.
+// Add a child frame. This should only be called by the data source's controller
+// as a result of a createFrame:inParent:.
+// [Should this be private?]
- (void)addFrame: (WKWebFrame *)frame;
diff --git a/WebKit/WebView.subproj/WKDefaultWebController.h b/WebKit/WebView.subproj/WKDefaultWebController.h
index 0f016fa..ea8d2a6 100644
--- a/WebKit/WebView.subproj/WKDefaultWebController.h
+++ b/WebKit/WebView.subproj/WKDefaultWebController.h
@@ -37,6 +37,4 @@
- (void)setMainDataSource: (WKWebDataSource *)dataSource;
- (WKWebDataSource *)mainDataSource;
-- (void)addFrame: (WKWebFrame *)childFrame toParent: (WKWebDataSource *)parent;
-
@end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/WKDefaultWebController.mm b/WebKit/WebView.subproj/WKDefaultWebController.mm
index 7e31178..f04b6e8 100644
--- a/WebKit/WebView.subproj/WKDefaultWebController.mm
+++ b/WebKit/WebView.subproj/WKDefaultWebController.mm
@@ -6,6 +6,7 @@
#import <WebKit/WKDefaultWebControllerPrivate.h>
#import <WebKit/WKWebViewPrivate.h>
#import <WebKit/WKWebDataSourcePrivate.h>
+#import <WebKit/WKWebFrame.h>
#import <WebKit/WKException.h>
@@ -104,6 +105,7 @@
- (void)setView: (WKWebView *)view andDataSource: (WKWebDataSource *)dataSource
{
+ // FIXME: this needs to be implemented in terms of WKWebFrame.
WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
[data->viewMap autorelease];
@@ -130,21 +132,28 @@
[view dataSourceChanged];
}
-
-- (void)addFrame: (WKWebFrame *)childFrame toParent: (WKWebDataSource *)parent;
+- (WKWebFrame *)createFrameNamed: (NSString *)fname for: (WKWebDataSource *)childDataSource inParent: (WKWebDataSource *)parentDataSource
{
WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
- id view = [childFrame view];
- WKWebDataSource *child = [childFrame dataSource];
+ WKWebView *childView;
+ WKWebFrame *newFrame;
- [data->viewMap setObject: view forKey: [WKObjectHolder holderWithObject:child]];
- [view _setController: self];
- [data->dataSourceMap setObject: child forKey: [WKObjectHolder holderWithObject:view]];
- [child _setController: self];
+ childView = [[WKWebView alloc] initWithFrame: NSMakeRect (0,0,0,0)];
+
+ newFrame = [[[WKWebFrame alloc] initWithName: fname view: childView dataSource: childDataSource] autorelease];
- [view dataSourceChanged];
+ [parentDataSource addFrame: newFrame];
+
+ [data->viewMap setObject: childView forKey: [WKObjectHolder holderWithObject:childDataSource]];
+ [childView _setController: self];
+ [data->dataSourceMap setObject: childDataSource forKey: [WKObjectHolder holderWithObject:childView]];
+ [childDataSource _setController: self];
+
+ [childView dataSourceChanged];
+
+ //[child startLoading: YES];
- [child startLoading: YES];
+ return newFrame;
}
diff --git a/WebKit/WebView.subproj/WKWebController.h b/WebKit/WebView.subproj/WKWebController.h
index ef4430e..e3ec214 100644
--- a/WebKit/WebView.subproj/WKWebController.h
+++ b/WebKit/WebView.subproj/WKWebController.h
@@ -103,6 +103,7 @@
@class WKWebDataSource;
@class WKError;
@class WKWebView;
+ at class WKWebFrame;
#ifdef TENTATIVE_API
/*
@@ -301,6 +302,12 @@
or do we just use the umbrella protocol?]
*/
@protocol WKWebController <WKLoadHandler, WKScriptContextHandler, WKAuthenticationHandler, WKLocationChangeHandler>
+
+
+// Called when a data source needs to create a frame. This method encapsulates the
+// specifics of creating and initializaing a view of the appropriate class.
+- (WKWebFrame *)createFrameNamed: (NSString *)fname for: (WKWebDataSource *)child inParent: (WKWebDataSource *)parent;
+
@end
diff --git a/WebKit/WebView.subproj/WKWebDataSource.h b/WebKit/WebView.subproj/WKWebDataSource.h
index 959a467..f0e3f8d 100644
--- a/WebKit/WebView.subproj/WKWebDataSource.h
+++ b/WebKit/WebView.subproj/WKWebDataSource.h
@@ -99,8 +99,9 @@
- (WKWebDataSource *)parent;
-// Add a child frame. [Should this be private? Only called when a
-// data source is created automatically in a frame set.
+// Add a child frame. This should only be called by the data source's controller
+// as a result of a createFrame:inParent:.
+// [Should this be private?]
- (void)addFrame: (WKWebFrame *)frame;
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index ef4430e..e3ec214 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -103,6 +103,7 @@
@class WKWebDataSource;
@class WKError;
@class WKWebView;
+ at class WKWebFrame;
#ifdef TENTATIVE_API
/*
@@ -301,6 +302,12 @@
or do we just use the umbrella protocol?]
*/
@protocol WKWebController <WKLoadHandler, WKScriptContextHandler, WKAuthenticationHandler, WKLocationChangeHandler>
+
+
+// Called when a data source needs to create a frame. This method encapsulates the
+// specifics of creating and initializaing a view of the appropriate class.
+- (WKWebFrame *)createFrameNamed: (NSString *)fname for: (WKWebDataSource *)child inParent: (WKWebDataSource *)parent;
+
@end
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index 959a467..f0e3f8d 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -99,8 +99,9 @@
- (WKWebDataSource *)parent;
-// Add a child frame. [Should this be private? Only called when a
-// data source is created automatically in a frame set.
+// Add a child frame. This should only be called by the data source's controller
+// as a result of a createFrame:inParent:.
+// [Should this be private?]
- (void)addFrame: (WKWebFrame *)frame;
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index ef4430e..e3ec214 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -103,6 +103,7 @@
@class WKWebDataSource;
@class WKError;
@class WKWebView;
+ at class WKWebFrame;
#ifdef TENTATIVE_API
/*
@@ -301,6 +302,12 @@
or do we just use the umbrella protocol?]
*/
@protocol WKWebController <WKLoadHandler, WKScriptContextHandler, WKAuthenticationHandler, WKLocationChangeHandler>
+
+
+// Called when a data source needs to create a frame. This method encapsulates the
+// specifics of creating and initializaing a view of the appropriate class.
+- (WKWebFrame *)createFrameNamed: (NSString *)fname for: (WKWebDataSource *)child inParent: (WKWebDataSource *)parent;
+
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list