[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:42:44 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 34a651467362064b0e35750c34ee95fe0cfb40fe
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Sep 23 17:25:17 2002 +0000
Fixes for some build problems I missed earlier due to the fact that PB can't handle header dependencies,
and I did not do a clean build of WebKit.
* Plugins.subproj/WebPluginStream.m:
(-[WebNetscapePluginStream receivedError:withDataSource:]): WebFoundation error constant name change.
(-[WebNetscapePluginStream cancel]): Ditto.
* WebCoreSupport.subproj/WebCookieAdapter.m:
(-[WebCookieAdapter cookiesEnabled]): Modified to use [[WebCookieManager sharedCookieManager] acceptPolicy]
rather than reaching down into CFPreferences directly.
* WebCoreSupport.subproj/WebSubresourceClient.m:
(+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:]): WebFoundation error constant name change.
(-[WebSubresourceClient cancel]): Ditto.
* WebView.subproj/WebMainResourceClient.m:
(-[WebMainResourceClient didCancelWithHandle:]): Ditto.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2123 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 0184c8f..9053291 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,20 @@
+2002-09-23 Ken Kocienda <kocienda at apple.com>
+
+ Fixes for some build problems I missed earlier due to the fact that PB can't handle header dependencies,
+ and I did not do a clean build of WebKit.
+
+ * Plugins.subproj/WebPluginStream.m:
+ (-[WebNetscapePluginStream receivedError:withDataSource:]): WebFoundation error constant name change.
+ (-[WebNetscapePluginStream cancel]): Ditto.
+ * WebCoreSupport.subproj/WebCookieAdapter.m:
+ (-[WebCookieAdapter cookiesEnabled]): Modified to use [[WebCookieManager sharedCookieManager] acceptPolicy]
+ rather than reaching down into CFPreferences directly.
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:]): WebFoundation error constant name change.
+ (-[WebSubresourceClient cancel]): Ditto.
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient didCancelWithHandle:]): Ditto.
+
2002-09-23 Darin Adler <darin at apple.com>
* WebView.subproj/WebHTMLViewPrivate.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 0184c8f..9053291 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,20 @@
+2002-09-23 Ken Kocienda <kocienda at apple.com>
+
+ Fixes for some build problems I missed earlier due to the fact that PB can't handle header dependencies,
+ and I did not do a clean build of WebKit.
+
+ * Plugins.subproj/WebPluginStream.m:
+ (-[WebNetscapePluginStream receivedError:withDataSource:]): WebFoundation error constant name change.
+ (-[WebNetscapePluginStream cancel]): Ditto.
+ * WebCoreSupport.subproj/WebCookieAdapter.m:
+ (-[WebCookieAdapter cookiesEnabled]): Modified to use [[WebCookieManager sharedCookieManager] acceptPolicy]
+ rather than reaching down into CFPreferences directly.
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:]): WebFoundation error constant name change.
+ (-[WebSubresourceClient cancel]): Ditto.
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient didCancelWithHandle:]): Ditto.
+
2002-09-23 Darin Adler <darin at apple.com>
* WebView.subproj/WebHTMLViewPrivate.m:
diff --git a/WebKit/Plugins.subproj/WebPluginStream.m b/WebKit/Plugins.subproj/WebPluginStream.m
index 61bbddc..1afcbf7 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.m
+++ b/WebKit/Plugins.subproj/WebPluginStream.m
@@ -257,7 +257,7 @@
- (void)receivedError:(WebError *)error withDataSource:(WebDataSource *)dataSource
{
- if([error errorCode] == WebResultCancelled){
+ if([error errorCode] == WebErrorCodeCancelled){
[self receivedError:NPRES_USER_BREAK];
} else {
[self receivedError:NPRES_NETWORK_ERR];
@@ -319,7 +319,7 @@
WebController *webController = [view webController];
- WebError *cancelError = [[WebError alloc] initWithErrorCode:WebResultCancelled
+ WebError *cancelError = [[WebError alloc] initWithErrorCode:WebErrorCodeCancelled
inDomain:WebErrorDomainWebFoundation
failingURL:nil];
WebLoadProgress *loadProgress = [[WebLoadProgress alloc] initWithResourceHandle:resource];
diff --git a/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m b/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
index a8ac1d3..1cc474a 100644
--- a/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
+++ b/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
@@ -9,6 +9,7 @@
#import "WebCookieAdapter.h"
#import <WebFoundation/WebCookieManager.h>
#import <WebFoundation/WebAssertions.h>
+#import <WebFoundation/WebCookieConstants.h>
@implementation WebCookieAdapter
@@ -24,17 +25,8 @@
- (BOOL)cookiesEnabled
{
BOOL result;
- id acceptCookiesPref = (id)CFPreferencesCopyAppValue((CFStringRef)WebAcceptCookiesPreference, (CFStringRef)WebFoundationPreferenceDomain);
-
- if ([acceptCookiesPref isEqualTo:WebAcceptCookiesPreferenceNever]) {
- result = NO;
- } else if ([acceptCookiesPref isEqualTo:WebAcceptCookiesPreferenceAlways]) {
- result = YES;
- } else {
- // Treat missing or bad value as always accept
- result = YES;
- }
- [acceptCookiesPref release];
+
+ result = ([[WebCookieManager sharedCookieManager] acceptPolicy] == WebCookieAcceptPolicyAlways);
return result;
}
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index 197a8c9..1afa011 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -79,7 +79,7 @@
if (h == nil) {
[rLoader cancel];
- WebError *badURLError = [[WebError alloc] initWithErrorCode:WebResultBadURLError
+ WebError *badURLError = [[WebError alloc] initWithErrorCode:WebErrorCodeBadURLError
inDomain:WebErrorDomainWebFoundation
failingURL:[URL absoluteString]];
[[source controller] _receivedError:badURLError forResourceHandle:nil
@@ -195,7 +195,7 @@
[dataSource _removeSubresourceClient:self];
- WebError *error = [[WebError alloc] initWithErrorCode:WebResultCancelled
+ WebError *error = [[WebError alloc] initWithErrorCode:WebErrorCodeCancelled
inDomain:WebErrorDomainWebFoundation failingURL:[[dataSource originalURL] absoluteString]];
[self receivedError:error];
[error release];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index 197a8c9..1afa011 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -79,7 +79,7 @@
if (h == nil) {
[rLoader cancel];
- WebError *badURLError = [[WebError alloc] initWithErrorCode:WebResultBadURLError
+ WebError *badURLError = [[WebError alloc] initWithErrorCode:WebErrorCodeBadURLError
inDomain:WebErrorDomainWebFoundation
failingURL:[URL absoluteString]];
[[source controller] _receivedError:badURLError forResourceHandle:nil
@@ -195,7 +195,7 @@
[dataSource _removeSubresourceClient:self];
- WebError *error = [[WebError alloc] initWithErrorCode:WebResultCancelled
+ WebError *error = [[WebError alloc] initWithErrorCode:WebErrorCodeCancelled
inDomain:WebErrorDomainWebFoundation failingURL:[[dataSource originalURL] absoluteString]];
[self receivedError:error];
[error release];
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 1bf5e6c..5f25149 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -23,6 +23,7 @@
#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/WebResourceHandle.h>
#import <WebFoundation/WebResourceResponse.h>
+#import <WebFoundation/WebCookieConstants.h>
// FIXME: This is quite similar to WebSubresourceClient; they should share code.
@@ -131,7 +132,7 @@
[self retain];
// FIXME: Maybe we should be passing the URL from the handle here, not from the dataSource.
- WebError *error = [[WebError alloc] initWithErrorCode:WebResultCancelled
+ WebError *error = [[WebError alloc] initWithErrorCode:WebErrorCodeCancelled
inDomain:WebErrorDomainWebFoundation
failingURL:[[dataSource originalURL] absoluteString]];
[self receivedError:error forHandle:handle];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 1bf5e6c..5f25149 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -23,6 +23,7 @@
#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/WebResourceHandle.h>
#import <WebFoundation/WebResourceResponse.h>
+#import <WebFoundation/WebCookieConstants.h>
// FIXME: This is quite similar to WebSubresourceClient; they should share code.
@@ -131,7 +132,7 @@
[self retain];
// FIXME: Maybe we should be passing the URL from the handle here, not from the dataSource.
- WebError *error = [[WebError alloc] initWithErrorCode:WebResultCancelled
+ WebError *error = [[WebError alloc] initWithErrorCode:WebErrorCodeCancelled
inDomain:WebErrorDomainWebFoundation
failingURL:[[dataSource originalURL] absoluteString]];
[self receivedError:error forHandle:handle];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list