[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:39:12 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 47e3ec5a03dcd70464c967e0187e89119f9b6cab
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Sep 14 00:53:12 2002 +0000
WebFoundation:
WebFoundation changes for:
- fixed 3032238 - Eliminate "Ask each time" choice for cookies
I also unwound some now-needless async code paths.
* CacheLoader.subproj/WebCFNetworkHTTPProtocolHandler.h:
* CacheLoader.subproj/WebCFNetworkHTTPProtocolHandler.m:
(-[WebCFNetworkHTTPProtocolHandler endLoadInBackground]):
(-[WebCFNetworkHTTPProtocolHandler handleReadStreamEvent:event:]):
(-[WebCFNetworkHTTPProtocolHandler setResponseHeadersUsingHTTPResponse:andCall:context:]):
(-[WebCFNetworkHTTPProtocolHandler performStreamRead:]):
* CookieManager.subproj/IFCookieAcceptHandlerC.h: Removed.
* CookieManager.subproj/IFCookieAcceptHandlerC.m: Removed.
* CookieManager.subproj/IFCookieAcceptRequestC.h: Removed.
* CookieManager.subproj/IFCookieAcceptRequestC.m: Removed.
* CookieManager.subproj/IFCookieManagerC.h:
* CookieManager.subproj/IFCookieManagerC.m:
(IFCookieManagerSetCookiesFromResponseHeaders):
* CookieManager.subproj/WebCookieAcceptHandler.h: Removed.
* CookieManager.subproj/WebCookieAcceptHandlerDispatcher.h: Removed.
* CookieManager.subproj/WebCookieAcceptHandlerDispatcher.m: Removed.
* CookieManager.subproj/WebCookieAcceptRequest.h: Removed.
* CookieManager.subproj/WebCookieAcceptRequest.m: Removed.
* CookieManager.subproj/WebCookieAcceptRequestPrivate.h: Removed.
* CookieManager.subproj/WebCookieConstants.h:
* CookieManager.subproj/WebCookieManager.h:
* CookieManager.subproj/WebCookieManager.m:
(-[WebCookieManagerPrivate init]):
(-[WebCookieManagerPrivate dealloc]):
(-[WebCookieManager _readAcceptCookiesPreference]):
(-[WebCookieManager _setCookies:forURL:]):
(-[WebCookieManager setCookie:]):
(-[WebCookieManager setCookiesFromResponseHeaders:forURL:]):
* Misc.subproj/WebFoundation.h:
* WebFoundation.exp:
* WebFoundation.pbproj/project.pbxproj:
WebKit:
WebKit changes for:
- fixed 3032238 - Eliminate "Ask each time" choice for cookies
* Panels.subproj/WebStandardPanels.h:
* Panels.subproj/WebStandardPanels.m:
(-[WebStandardPanels useStandardAuthenticationPanel]):
* WebCoreSupport.subproj/WebCookieAdapter.m:
(-[WebCookieAdapter cookiesEnabled]):
* WebKit.pbproj/project.pbxproj:
WebBrowser:
WebBrowser changes for:
- fixed 3032238 - Eliminate "Ask each time" choice for cookies
* AppController.m:
(-[AppController awakeFromNib]):
* Preferences.subproj/English.lproj/SecurityPreferences.nib:
* Preferences.subproj/SecurityPreferences.h:
* Preferences.subproj/SecurityPreferences.m:
(-[SecurityPreferences takeCookiePolicyFrom:]):
(-[SecurityPreferences updateCookiesViews]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2066 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c0c26b3..48ae297 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2002-09-13 Maciej Stachowiak <mjs at apple.com>
+
+ WebKit changes for:
+
+ - fixed 3032238 - Eliminate "Ask each time" choice for cookies
+
+ * Panels.subproj/WebStandardPanels.h:
+ * Panels.subproj/WebStandardPanels.m:
+ (-[WebStandardPanels useStandardAuthenticationPanel]):
+ * WebCoreSupport.subproj/WebCookieAdapter.m:
+ (-[WebCookieAdapter cookiesEnabled]):
+ * WebKit.pbproj/project.pbxproj:
+
2002-09-13 Darin Adler <darin at apple.com>
Added assertions, and dealt with some breakage I created while
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index c0c26b3..48ae297 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-09-13 Maciej Stachowiak <mjs at apple.com>
+
+ WebKit changes for:
+
+ - fixed 3032238 - Eliminate "Ask each time" choice for cookies
+
+ * Panels.subproj/WebStandardPanels.h:
+ * Panels.subproj/WebStandardPanels.m:
+ (-[WebStandardPanels useStandardAuthenticationPanel]):
+ * WebCoreSupport.subproj/WebCookieAdapter.m:
+ (-[WebCookieAdapter cookiesEnabled]):
+ * WebKit.pbproj/project.pbxproj:
+
2002-09-13 Darin Adler <darin at apple.com>
Added assertions, and dealt with some breakage I created while
diff --git a/WebKit/Panels.subproj/WebStandardPanels.h b/WebKit/Panels.subproj/WebStandardPanels.h
index b9fe603..fa0a19a 100644
--- a/WebKit/Panels.subproj/WebStandardPanels.h
+++ b/WebKit/Panels.subproj/WebStandardPanels.h
@@ -18,8 +18,6 @@
-(void)setUseStandardAuthenticationPanel:(BOOL)use;
-(BOOL)useStandardAuthenticationPanel;
--(void)setUseStandardCookieAcceptPanel:(BOOL)use;
--(BOOL)useStandardCookieAcceptPanel;
-(void)didStartLoadingURL:(NSURL *)URL inWindow:(NSWindow *)window;
-(void)didStopLoadingURL:(NSURL *)URL inWindow:(NSWindow *)window;
diff --git a/WebKit/Panels.subproj/WebStandardPanels.m b/WebKit/Panels.subproj/WebStandardPanels.m
index d65b9fc..c3e641f 100644
--- a/WebKit/Panels.subproj/WebStandardPanels.m
+++ b/WebKit/Panels.subproj/WebStandardPanels.m
@@ -7,11 +7,9 @@
#import <WebKit/WebStandardPanels.h>
#import <WebKit/WebStandardPanelsPrivate.h>
#import <WebKit/WebPanelAuthenticationHandler.h>
-#import <WebKit/WebPanelCookieAcceptHandler.h>
#import <WebKit/WebFrame.h>
#import <WebKit/WebView.h>
#import <WebFoundation/WebAuthenticationManager.h>
-#import <WebFoundation/WebCookieManager.h>
#import <Carbon/Carbon.h>
@@ -19,7 +17,6 @@
{
@public
WebPanelAuthenticationHandler *panelAuthenticationHandler;
- WebPanelCookieAcceptHandler *panelCookieAcceptHandler;
NSMutableDictionary *URLContainers;
}
@end
@@ -104,27 +101,6 @@ static void initSharedStandardPanels(void)
return _privatePanels->panelAuthenticationHandler != nil;
}
--(void)setUseStandardCookieAcceptPanel:(BOOL)use
-{
- if (use) {
- if (![self useStandardCookieAcceptPanel]) {
- _privatePanels->panelCookieAcceptHandler = [[WebPanelCookieAcceptHandler alloc] init];
- [[WebCookieManager sharedCookieManager] addAcceptHandler:_privatePanels->panelCookieAcceptHandler];
- }
- } else {
- if ([self useStandardCookieAcceptPanel]) {
- [[WebCookieManager sharedCookieManager] removeAcceptHandler:_privatePanels->panelCookieAcceptHandler];
- [_privatePanels->panelCookieAcceptHandler release];
- _privatePanels->panelCookieAcceptHandler = nil;
- }
- }
-}
-
--(BOOL)useStandardCookieAcceptPanel
-{
- return _privatePanels->panelCookieAcceptHandler != nil;
-}
-
-(void)didStartLoadingURL:(NSURL *)URL inWindow:(NSWindow *)window
{
NSCountedSet *set = [_privatePanels->URLContainers objectForKey:URL];
diff --git a/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m b/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
index 2fcc82a..a8ac1d3 100644
--- a/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
+++ b/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
@@ -28,8 +28,6 @@
if ([acceptCookiesPref isEqualTo:WebAcceptCookiesPreferenceNever]) {
result = NO;
- } else if ([acceptCookiesPref isEqualTo:WebAcceptCookiesPreferenceAsk]) {
- result = YES;
} else if ([acceptCookiesPref isEqualTo:WebAcceptCookiesPreferenceAlways]) {
result = YES;
} else {
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index d14bd78..06cd0fa 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -258,7 +258,6 @@
F5488CF602CB04EE01FF6274,
F5927D4B02D253C401CA2DBB,
F5927D4F02D26C5E01CA2DBB,
- F508472402DED36E01257167,
F53444D002E87CBA018635CA,
F53444D302E87D4B018635CA,
F5934C8A02E894F50197FBCF,
@@ -347,7 +346,6 @@
F5E0A77102B8FEE401C1A525,
F5E0E10B02BC45F8018635CA,
F5488CF702CB04EE01FF6274,
- F508472502DED36E01257167,
F53444D102E87CBA018635CA,
F5934C8B02E894F50197FBCF,
F649E40702EE0D1901CA2ACD,
@@ -1505,30 +1503,6 @@
settings = {
};
};
- F508472202DED36E01257167 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- path = WebPanelCookieAcceptHandler.h;
- refType = 4;
- };
- F508472302DED36E01257167 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- path = WebPanelCookieAcceptHandler.m;
- refType = 4;
- };
- F508472402DED36E01257167 = {
- fileRef = F508472202DED36E01257167;
- isa = PBXBuildFile;
- settings = {
- };
- };
- F508472502DED36E01257167 = {
- fileRef = F508472302DED36E01257167;
- isa = PBXBuildFile;
- settings = {
- };
- };
F508946902B71D59018A9CD4 = {
fileEncoding = 30;
isa = PBXFileReference;
@@ -2742,8 +2716,6 @@
F8CA15B6029A39D901000122,
F83DCC71029D09F301000131,
F83DCC72029D09F301000131,
- F508472202DED36E01257167,
- F508472302DED36E01257167,
F8CA15B7029A39D901000122,
F8CA15C1029A3E0D01000122,
F8CA15B8029A39D901000122,
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list