[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 06:39:55 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 0af78c5aa06cf926ec0ac616343495c12ef7dea2
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 18 22:06:18 2002 +0000
Added documentation keywords to headers.
Made reset a private method.
* WebKit.pbproj/project.pbxproj:
* WebView.subproj/WebFrame.h:
* WebView.subproj/WebFrame.m:
* WebView.subproj/WebFramePrivate.h:
* WebView.subproj/WebFramePrivate.m:
(-[WebFrame reset]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2088 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index fe6a808..121ea7f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,4 +1,16 @@
2002-09-18 Richard Williamson <rjw at apple.com>
+
+ Added documentation keywords to headers.
+ Made reset a private method.
+
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebFrame.h:
+ * WebView.subproj/WebFrame.m:
+ * WebView.subproj/WebFramePrivate.h:
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame reset]):
+
+2002-09-18 Richard Williamson <rjw at apple.com>
Added documentation keywords to headers.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index fe6a808..121ea7f 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,4 +1,16 @@
2002-09-18 Richard Williamson <rjw at apple.com>
+
+ Added documentation keywords to headers.
+ Made reset a private method.
+
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebFrame.h:
+ * WebView.subproj/WebFrame.m:
+ * WebView.subproj/WebFramePrivate.h:
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame reset]):
+
+2002-09-18 Richard Williamson <rjw at apple.com>
Added documentation keywords to headers.
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index f916ac7..3654be2 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -72,7 +72,6 @@
F58C8A07025BD3BC018635CA,
F531DDFF02F0C36F018635CA,
);
- hasScannedForEncodings = 1;
isa = PBXProject;
knownRegions = (
English,
diff --git a/WebKit/WebView.subproj/WebFrame.h b/WebKit/WebView.subproj/WebFrame.h
index d9c51c3..03d348f 100644
--- a/WebKit/WebView.subproj/WebFrame.h
+++ b/WebKit/WebView.subproj/WebFrame.h
@@ -8,54 +8,87 @@
#import <Foundation/Foundation.h>
- at class WebError;
@class WebController;
@class WebDataSource;
- at class WebView;
-
+ at class WebError;
@class WebFramePrivate;
+ at class WebView;
+/*!
+ @class WebFrame
+*/
@interface WebFrame : NSObject
{
@private
WebFramePrivate *_private;
}
+/*!
+ @method initWithName:webView:provisionalDataSource:controller:
+ @param name
+ @param view
+ @param dataSource
+ @param controller
+*/
- initWithName: (NSString *)name webView: (WebView *)view provisionalDataSource: (WebDataSource *)dataSource controller: (WebController *)controller;
+
+/*!
+ @method name
+*/
- (NSString *)name;
+/*!
+ @method setController:
+ @param controller
+*/
- (void)setController: (WebController *)controller;
+
+/*!
+ @method controller
+*/
- (WebController *)controller;
+/*!
+ @method setWebView:
+ @param view
+*/
- (void)setWebView: (WebView *)view;
+
+/*!
+ @method webView
+*/
- (WebView *)webView;
-/*
- Sets the frame's data source. Note that the data source will be
+/*!
+ @method setProvisionalDataSource:
+ @discussion Sets the frame's data source. Note that the data source will be
considered 'provisional' until it has been loaded, and at least
~some~ data has been received.
Will return NO and not set the provisional data source if the controller
disallows by returning a WebURLPolicyIgnore.
+ @param dataSource
*/
-- (BOOL)setProvisionalDataSource: (WebDataSource *)ds;
+- (BOOL)setProvisionalDataSource: (WebDataSource *)dataSource;
-/*
- Returns the committed data source. Will return nil if the
+/*!
+ @method dataSource
+ @discussion Returns the committed data source. Will return nil if the
provisional data source hasn't yet been loaded.
*/
- (WebDataSource *)dataSource;
-/*
- Will return the provisional data source. The provisional data source will
+/*!
+ @method provisionalDataSource
+ @discussion Will return the provisional data source. The provisional data source will
return nil if no data source has been set on the frame, or the data source
has successfully transitioned to the committed data source.
*/
- (WebDataSource *)provisionalDataSource;
-
-/*
- If a frame has a provisional data source this method will begin
+/*!
+ @method startLoading
+ @discussion If a frame has a provisional data source this method will begin
loading data for that provisional data source. If the frame
has no provisional data source this method will do nothing.
@@ -63,30 +96,26 @@
*/
- (void)startLoading;
-
-/*
- Stop any pending loads on the frame's data source,
+/*!
+ @method stopLoading
+ @discussion Stop any pending loads on the frame's data source,
and it's children.
*/
- (void)stopLoading;
-/*
+/*!
+ @method reload
*/
- (void)reload;
-
-/*
- This method removes references the underlying resources.
- FIXME: I think this should be private.
-*/
-- (void)reset;
-
-/*
- This method returns a frame with the given name. frameNamed returns self
+/*!
+ @method frameNamed:
+ @discussion This method returns a frame with the given name. frameNamed returns self
for _self and _current, the parent frame for _parent and the main frame for _top.
frameNamed returns self for _parent and _top if the receiver it is the mainFrame.
nil is returned if a frame with the given name is not found.
+ @param name
*/
- (WebFrame *)frameNamed:(NSString *)name;
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 9fff225..d2d853e 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -213,16 +213,6 @@
}
-- (void)reset
-{
- [_private setDataSource:nil];
- [_private setWebView:nil];
-
- [_private->scheduledLayoutTimer invalidate];
- [_private->scheduledLayoutTimer release];
- _private->scheduledLayoutTimer = nil;
-}
-
+ _frameNamed:(NSString *)name fromFrame: (WebFrame *)aFrame
{
int i, count;
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index ff860a1..53301f5 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -74,6 +74,14 @@ typedef enum {
@interface WebFrame (WebPrivate)
+/*!
+ @method reset
+ @discussioin This method removes references the underlying resources.
+ FIXME: I think this should be private.
+*/
+- (void)reset;
+
+
- (void)_parentDataSourceWillBeDeallocated;
- (void)_setController: (WebController *)controller;
- (void)_setDataSource: (WebDataSource *)d;
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 53dc757..e465680 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -114,6 +114,17 @@ static const char * const stateNames[] = {
@implementation WebFrame (WebPrivate)
+- (void)reset
+{
+ [_private setDataSource:nil];
+ [_private setWebView:nil];
+
+ [_private->scheduledLayoutTimer invalidate];
+ [_private->scheduledLayoutTimer release];
+ _private->scheduledLayoutTimer = nil;
+}
+
+
- (void)_parentDataSourceWillBeDeallocated
{
[_private setController:nil];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list