[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:19:14 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit e9234a6b06e0f03b9cbd2a761a35381d100cd748
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Jun 15 02:28:00 2002 +0000
i Removed redundant private _isDocumentHTML method.
* WebView.subproj/IFMainURLHandleClient.mm:
(-[IFMainURLHandleClient IFURLHandle:didRedirectToURL:]):
* WebView.subproj/IFWebDataSourcePrivate.h:
* WebView.subproj/IFWebDataSourcePrivate.mm:
(-[IFWebDataSource _stopLoading]):
(-[IFWebDataSource _addError:forResource:]):
* WebView.subproj/IFWebFramePrivate.mm:
(-[IFWebFrame _isLoadComplete]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1366 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 2090620..c3002c7 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,18 @@
2002-06-14 Richard Williamson <rjw at apple.com>
+ Removed redundant private _isDocumentHTML method.
+
+ * WebView.subproj/IFMainURLHandleClient.mm:
+ (-[IFMainURLHandleClient IFURLHandle:didRedirectToURL:]):
+ * WebView.subproj/IFWebDataSourcePrivate.h:
+ * WebView.subproj/IFWebDataSourcePrivate.mm:
+ (-[IFWebDataSource _stopLoading]):
+ (-[IFWebDataSource _addError:forResource:]):
+ * WebView.subproj/IFWebFramePrivate.mm:
+ (-[IFWebFrame _isLoadComplete]):
+
+2002-06-14 Richard Williamson <rjw at apple.com>
+
Added handlers to IFWebController. Should eventually be possible to use
IFWebController w/o subclassing.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 2090620..c3002c7 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,18 @@
2002-06-14 Richard Williamson <rjw at apple.com>
+ Removed redundant private _isDocumentHTML method.
+
+ * WebView.subproj/IFMainURLHandleClient.mm:
+ (-[IFMainURLHandleClient IFURLHandle:didRedirectToURL:]):
+ * WebView.subproj/IFWebDataSourcePrivate.h:
+ * WebView.subproj/IFWebDataSourcePrivate.mm:
+ (-[IFWebDataSource _stopLoading]):
+ (-[IFWebDataSource _addError:forResource:]):
+ * WebView.subproj/IFWebFramePrivate.mm:
+ (-[IFWebFrame _isLoadComplete]):
+
+2002-06-14 Richard Williamson <rjw at apple.com>
+
Added handlers to IFWebController. Should eventually be possible to use
IFWebController w/o subclassing.
diff --git a/WebKit/WebView.subproj/IFMainURLHandleClient.mm b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
index 7f74fdb..131ce77 100644
--- a/WebKit/WebView.subproj/IFMainURLHandleClient.mm
+++ b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
@@ -232,7 +232,7 @@
url = newURL;
[[dataSource controller] _didStartLoading:url];
- if([dataSource _isDocumentHTML])
+ if([dataSource isDocumentHTML])
[(IFHTMLRepresentation *)[dataSource representation] part]->impl->setBaseURL([[url absoluteString] cString]);
[dataSource _setFinalURL:url];
diff --git a/WebKit/WebView.subproj/IFWebDataSourcePrivate.h b/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
index 9ea4478..ef948ef 100644
--- a/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
@@ -77,7 +77,6 @@
- (void)_setController: (IFWebController *)controller;
- (void)_setParent: (IFWebDataSource *)p;
- (void)_startLoading: (BOOL)forceRefresh;
-- (BOOL)_isDocumentHTML;
- (void)_stopLoading;
- (BOOL)_isStopping;
- (void)_recursiveStopLoading;
diff --git a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
index ce04f16..84e740e 100644
--- a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
@@ -211,7 +211,7 @@ static NSMutableDictionary *_repTypes=nil;
[[_private->urlHandles objectAtIndex: i] cancelLoadInBackground];
}
- if ([self _isDocumentHTML])
+ if ([self isDocumentHTML])
[(IFHTMLRepresentation *)[self representation] part]->closeURL();
}
@@ -360,12 +360,6 @@ static NSMutableDictionary *_repTypes=nil;
}
-- (BOOL)_isDocumentHTML
-{
- return [[self representation] isKindOfClass: [IFHTMLRepresentation class]];
-}
-
-
+ (NSMutableDictionary *)_repTypes
{
if(!_repTypes){
diff --git a/WebKit/WebView.subproj/IFWebFramePrivate.mm b/WebKit/WebView.subproj/IFWebFramePrivate.mm
index ffe867f..8700027 100644
--- a/WebKit/WebView.subproj/IFWebFramePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebFramePrivate.mm
@@ -348,7 +348,7 @@ static const char * const stateNames[6] = {
[self _setState: IFWEBFRAMESTATE_COMPLETE];
- if([ds _isDocumentHTML])
+ if([ds isDocumentHTML])
[(IFHTMLRepresentation *)[ds representation] part]->end();
// We have to layout the main document as
@@ -366,7 +366,7 @@ static const char * const stateNames[6] = {
[[thisView documentView] layout];
// Jump to anchor point, if necessary.
- if ([ds _isDocumentHTML])
+ if ([ds isDocumentHTML])
[(IFHTMLRepresentation *)[ds representation] part]->impl->gotoBaseAnchor();
// FIXME: We have to draw the whole document hierarchy. We should be
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index 9ea4478..ef948ef 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -77,7 +77,6 @@
- (void)_setController: (IFWebController *)controller;
- (void)_setParent: (IFWebDataSource *)p;
- (void)_startLoading: (BOOL)forceRefresh;
-- (BOOL)_isDocumentHTML;
- (void)_stopLoading;
- (BOOL)_isStopping;
- (void)_recursiveStopLoading;
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index ce04f16..84e740e 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -211,7 +211,7 @@ static NSMutableDictionary *_repTypes=nil;
[[_private->urlHandles objectAtIndex: i] cancelLoadInBackground];
}
- if ([self _isDocumentHTML])
+ if ([self isDocumentHTML])
[(IFHTMLRepresentation *)[self representation] part]->closeURL();
}
@@ -360,12 +360,6 @@ static NSMutableDictionary *_repTypes=nil;
}
-- (BOOL)_isDocumentHTML
-{
- return [[self representation] isKindOfClass: [IFHTMLRepresentation class]];
-}
-
-
+ (NSMutableDictionary *)_repTypes
{
if(!_repTypes){
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index ffe867f..8700027 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -348,7 +348,7 @@ static const char * const stateNames[6] = {
[self _setState: IFWEBFRAMESTATE_COMPLETE];
- if([ds _isDocumentHTML])
+ if([ds isDocumentHTML])
[(IFHTMLRepresentation *)[ds representation] part]->end();
// We have to layout the main document as
@@ -366,7 +366,7 @@ static const char * const stateNames[6] = {
[[thisView documentView] layout];
// Jump to anchor point, if necessary.
- if ([ds _isDocumentHTML])
+ if ([ds isDocumentHTML])
[(IFHTMLRepresentation *)[ds representation] part]->impl->gotoBaseAnchor();
// FIXME: We have to draw the whole document hierarchy. We should be
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 7f74fdb..131ce77 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -232,7 +232,7 @@
url = newURL;
[[dataSource controller] _didStartLoading:url];
- if([dataSource _isDocumentHTML])
+ if([dataSource isDocumentHTML])
[(IFHTMLRepresentation *)[dataSource representation] part]->impl->setBaseURL([[url absoluteString] cString]);
[dataSource _setFinalURL:url];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 7f74fdb..131ce77 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -232,7 +232,7 @@
url = newURL;
[[dataSource controller] _didStartLoading:url];
- if([dataSource _isDocumentHTML])
+ if([dataSource isDocumentHTML])
[(IFHTMLRepresentation *)[dataSource representation] part]->impl->setBaseURL([[url absoluteString] cString]);
[dataSource _setFinalURL:url];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list