[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:58:04 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 2f8db7c7298f4a456ab1bd14855266292f0eddc9
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 8 17:57:31 2002 +0000
- fixed crash on boot that Don was seeing
* History.subproj/WebHistoryItem.m:
(-[WebHistoryItem URL]): Make this work when _URLString is nil.
(-[WebHistoryItem initFromDictionaryRepresentation:]): Make this work for nil URL.
- my own private war on the cString method
* Downloads.subproj/WebDownloadHandler.m:
(-[WebDownloadHandler initWithDataSource:]): Use %@ in LOG to avoid cString.
(-[WebDownloadHandler finishedLoading]): Ditto.
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSource _commitIfReady]): Ditto.
* WebView.subproj/WebFramePrivate.m:
(-[WebFrame _timedLayout:]): Ditto.
(-[WebFrame _setState:]): More of the same.
(-[WebFrame _isLoadComplete]): Ditto.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2600 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 7a116cf..acdb46c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,23 @@
+2002-11-08 Darin Adler <darin at apple.com>
+
+ - fixed crash on boot that Don was seeing
+
+ * History.subproj/WebHistoryItem.m:
+ (-[WebHistoryItem URL]): Make this work when _URLString is nil.
+ (-[WebHistoryItem initFromDictionaryRepresentation:]): Make this work for nil URL.
+
+ - my own private war on the cString method
+
+ * Downloads.subproj/WebDownloadHandler.m:
+ (-[WebDownloadHandler initWithDataSource:]): Use %@ in LOG to avoid cString.
+ (-[WebDownloadHandler finishedLoading]): Ditto.
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _commitIfReady]): Ditto.
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _timedLayout:]): Ditto.
+ (-[WebFrame _setState:]): More of the same.
+ (-[WebFrame _isLoadComplete]): Ditto.
+
2002-11-08 Ken Kocienda <kocienda at apple.com>
Fix deployment build breaker: a variable was used only in a
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 7a116cf..acdb46c 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,23 @@
+2002-11-08 Darin Adler <darin at apple.com>
+
+ - fixed crash on boot that Don was seeing
+
+ * History.subproj/WebHistoryItem.m:
+ (-[WebHistoryItem URL]): Make this work when _URLString is nil.
+ (-[WebHistoryItem initFromDictionaryRepresentation:]): Make this work for nil URL.
+
+ - my own private war on the cString method
+
+ * Downloads.subproj/WebDownloadHandler.m:
+ (-[WebDownloadHandler initWithDataSource:]): Use %@ in LOG to avoid cString.
+ (-[WebDownloadHandler finishedLoading]): Ditto.
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _commitIfReady]): Ditto.
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _timedLayout:]): Ditto.
+ (-[WebFrame _setState:]): More of the same.
+ (-[WebFrame _isLoadComplete]): Ditto.
+
2002-11-08 Ken Kocienda <kocienda at apple.com>
Fix deployment build breaker: a variable was used only in a
diff --git a/WebKit/Downloads.subproj/WebDownload.m b/WebKit/Downloads.subproj/WebDownload.m
index fb92a70..61faae1 100644
--- a/WebKit/Downloads.subproj/WebDownload.m
+++ b/WebKit/Downloads.subproj/WebDownload.m
@@ -32,7 +32,7 @@
[WebMacBinaryDecoder class],
nil] retain];
- LOG(Download, "Download started for: %s", [[[[dSource request] URL] absoluteString] cString]);
+ LOG(Download, "Download started for: %@", [[dSource request] URL]);
return self;
}
@@ -340,7 +340,7 @@
[self closeFile];
- LOG(Download, "Download complete. Saved to: %s", [[[dataSource contentPolicy] path] cString]);
+ LOG(Download, "Download complete. Saved to: %@", [[dataSource contentPolicy] path]);
return nil;
}
diff --git a/WebKit/Downloads.subproj/WebDownloadHandler.m b/WebKit/Downloads.subproj/WebDownloadHandler.m
index fb92a70..61faae1 100644
--- a/WebKit/Downloads.subproj/WebDownloadHandler.m
+++ b/WebKit/Downloads.subproj/WebDownloadHandler.m
@@ -32,7 +32,7 @@
[WebMacBinaryDecoder class],
nil] retain];
- LOG(Download, "Download started for: %s", [[[[dSource request] URL] absoluteString] cString]);
+ LOG(Download, "Download started for: %@", [[dSource request] URL]);
return self;
}
@@ -340,7 +340,7 @@
[self closeFile];
- LOG(Download, "Download complete. Saved to: %s", [[[dataSource contentPolicy] path] cString]);
+ LOG(Download, "Download complete. Saved to: %@", [[dataSource contentPolicy] path]);
return nil;
}
diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index 2575af2..26a3463 100644
--- a/WebKit/History.subproj/WebHistoryItem.m
+++ b/WebKit/History.subproj/WebHistoryItem.m
@@ -78,7 +78,7 @@
- (NSURL *)URL
{
- return [NSURL _web_URLWithString:_URLString];
+ return _URLString ? [NSURL _web_URLWithString:_URLString] : nil;
}
- (NSString *)target
@@ -249,10 +249,10 @@
- (id)initFromDictionaryRepresentation:(NSDictionary *)dict
{
- NSString *URL = [dict _web_stringForKey:@""];
+ NSString *URLString = [dict _web_stringForKey:@""];
NSString *title = [dict _web_stringForKey:@"title"];
- [self initWithURL:[NSURL _web_URLWithString:URL] title:title];
+ [self initWithURL:(URLString ? [NSURL _web_URLWithString:URLString] : nil) title:title];
[self setDisplayTitle:[dict _web_stringForKey:@"displayTitle"]];
NSString *date = [dict _web_stringForKey:@"lastVisitedDate"];
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 094f2ee..0713015 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -453,7 +453,7 @@
-(void)_commitIfReady
{
if ([[self contentPolicy] policyAction] == WebContentPolicyShow && _private->gotFirstByte && !_private->committed) {
- LOG(Loading, "committed resource = %s", [[[[self request] URL] absoluteString] cString]);
+ LOG(Loading, "committed resource = %@", [[self request] URL]);
_private->committed = TRUE;
[self _makeRepresentation];
[[self webFrame] _transitionToCommitted];
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index d2f7d9f..166fa15 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -213,7 +213,7 @@ static const char * const stateNames[] = {
- (void)_timedLayout: (id)userInfo
{
- LOG(Timing, "%s: state = %s", [[self name] cString], stateNames[_private->state]);
+ LOG(Timing, "%@: state = %s", [self name], stateNames[_private->state]);
[_private->scheduledLayoutTimer release];
_private->scheduledLayoutTimer = nil;
@@ -222,7 +222,7 @@ static const char * const stateNames[] = {
NSView <WebDocumentView> *documentView = [[self webView] documentView];
if ([self controller])
- LOG(Timing, "%s: performing timed layout, %f seconds since start of document load", [[self name] cString], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
+ LOG(Timing, "%@: performing timed layout, %f seconds since start of document load", [self name], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
[documentView setNeedsLayout: YES];
@@ -250,7 +250,7 @@ static const char * const stateNames[] = {
}
else {
if ([self controller])
- LOG(Timing, "%s: NOT performing timed layout (not needed), %f seconds since start of document load", [[self name] cString], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
+ LOG(Timing, "%@: NOT performing timed layout (not needed), %f seconds since start of document load", [self name], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
}
}
@@ -406,12 +406,12 @@ static const char * const stateNames[] = {
- (void)_setState: (WebFrameState)newState
{
- LOG(Loading, "%s: transition from %s to %s", [[self name] cString], stateNames[_private->state], stateNames[newState]);
+ LOG(Loading, "%@: transition from %s to %s", [self name], stateNames[_private->state], stateNames[newState]);
if ([self controller])
- LOG(Timing, "%s: transition from %s to %s, %f seconds since start of document load", [[self name] cString], stateNames[_private->state], stateNames[newState], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
+ LOG(Timing, "%@: transition from %s to %s, %f seconds since start of document load", [self name], stateNames[_private->state], stateNames[newState], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
if (newState == WebFrameStateComplete && self == [[self controller] mainFrame]){
- LOG(DocumentLoad, "completed %s (%f seconds)", [[[[[self dataSource] request] URL] absoluteString] cString], CFAbsoluteTimeGetCurrent() - [[self dataSource] _loadingStartedTime]);
+ LOG(DocumentLoad, "completed %@ (%f seconds)", [[[self dataSource] request] URL], CFAbsoluteTimeGetCurrent() - [[self dataSource] _loadingStartedTime]);
}
NSDictionary *userInfo = [NSDictionary dictionaryWithObjectsAndKeys:
@@ -449,14 +449,14 @@ static const char * const stateNames[] = {
{
WebDataSource *pd = [self provisionalDataSource];
- LOG(Loading, "%s: checking complete in WebFrameStateProvisional", [[self name] cString]);
+ LOG(Loading, "%@: checking complete in WebFrameStateProvisional", [self name]);
// If we've received any errors we may be stuck in the provisional state and actually
// complete.
if ([pd mainDocumentError]) {
// Check all children first.
- LOG(Loading, "%s: checking complete, current state WebFrameStateProvisional", [[self name] cString]);
+ LOG(Loading, "%@: checking complete, current state WebFrameStateProvisional", [self name]);
if (![pd isLoading]) {
- LOG(Loading, "%s: checking complete in WebFrameStateProvisional, load done", [[self name] cString]);
+ LOG(Loading, "%@: checking complete in WebFrameStateProvisional, load done", [self name]);
[[[self controller] locationChangeDelegate] locationChangeDone: [pd mainDocumentError] forDataSource:pd];
@@ -475,7 +475,7 @@ static const char * const stateNames[] = {
{
WebDataSource *ds = [self dataSource];
- //LOG(Loading, "%s: checking complete, current state WEBFRAMESTATE_COMMITTED", [[self name] cString]);
+ //LOG(Loading, "%@: checking complete, current state WEBFRAMESTATE_COMMITTED", [self name]);
if (![ds isLoading]) {
id thisView = [self webView];
NSView <WebDocumentView> *thisDocumentView = [thisView documentView];
@@ -566,7 +566,7 @@ static const char * const stateNames[] = {
case WebFrameStateComplete:
{
- LOG(Loading, "%s: checking complete, current state WebFrameStateComplete", [[self name] cString]);
+ LOG(Loading, "%@: checking complete, current state WebFrameStateComplete", [self name]);
return;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list