[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:51:04 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 81ee3597fb49904d782e73c0c4132ba8a200458f
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 18 17:13:32 2002 +0000
WebFoundation:
WebError cleanup. Change domains to be strings, remove unused codes.
* AuthenticationManager.subproj/WebAuthenticationManagerPrivate.h:
* AuthenticationManager.subproj/WebAuthenticationManager.m:
(-[WebAuthenticationManager _checkForAuthenticationFailureInHTTPResponse:withURL:]):
Don't return an error code. The error code was always vague, and never looked at by our
one client or exposed outside WebFoundation. If we later want to report a precise error,
we can easily re-add it.
* CacheLoader.subproj/WebResourceLoad.h: Change domain parameter to an NSString *.
* CacheLoader.subproj/WebResourceLoad.m:
(-[WebResourceLoad failedWithResultCode:inDomain:failingURL:]): Ditto.
* Misc.subproj/WebError.h: Moved WebErrorDomainWebKit to WebKit. Removed WebErrorDomainFTP.
Removed WebErrorCodeNoError, WebErrorCodeHTTPUnknownAuthenticationSchemeError, and
WebErrorCodeHTTPBadAuthenticationHeaderError, which were never used. Changed methods to
take NSString * for the error domain. Added errorIsInDomain method.
* Misc.subproj/WebError.m:
(-[WebErrorPrivate dealloc]): Release the error domain string.
(classInitialize): Remove descriptions for now-unused error codes.
(-[WebError initWithErrorCode:inDomain:failingURL:]): Take a domain string.
(-[WebError errorDomain]): Return the domain string.
(-[WebError errorIsInDomain:]): Added.
(-[WebError errorDescription]): Update to look up by string.
(+[WebError addErrorsWithCodesAndDescriptions:inDomain:]): Use domain string as key.
* ProtocolHandlers.subproj/WebCFNetworkHTTPProtocolHandler.m:
(-[WebCFNetworkHTTPProtocolHandler performHTTPHeaderRead:andCall:]): Get rid of the
code that stored the authenticationFailureResult, which was never passed to the user.
* ProtocolHandlers.subproj/WebHTTPProtocolHandler.h: Remove authenticationFailureResult.
* ProtocolHandlers.subproj/WebHTTPProtocolHandler.m:
(-[WebHTTPProtocolHandler determineErrorAndFail]): Rearrange the code so we don't use
WebErrorCodeNoError. Also change the domain so that we don't report the
WebErrorCodeCannotConnectToHostError error in the SSL domain any more.
* WebFoundation.exp: Export the new domain string globals.
WebKit:
Update for WebFoundation error domain changes.
* Misc.subproj/WebKitErrors.h: Put WebErrorDomainWebKit in here.
Also remove WebErrorNoError and the WebErrorCode name for the enum.
* WebKit.exp: Export the WebErrorDomainWebKit constant.
* WebView.subproj/WebView.m: Define the WebErrorDomainWebKit.
* WebKit.pbproj/project.pbxproj: Always use WebKit.exp.
* Makefile.am: Don't generate WebKit-combined.exp any more.
* WebKit-tests.exp: Removed.
WebBrowser:
Update for WebFoundation error domain changes.
* LocationChangeError.m:
(-[LocationChangeHandler specializedTitleForError:]): Use the new errorIsInDomain method
instead of doing a switch statement, since that works with NSString.
(-[LocationChangeHandler specializedMessageForError:]): Ditto.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2366 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a66512d..90a6ad9 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2002-10-18 Darin Adler <darin at apple.com>
+
+ Update for WebFoundation error domain changes.
+
+ * Misc.subproj/WebKitErrors.h: Put WebErrorDomainWebKit in here.
+ Also remove WebErrorNoError and the WebErrorCode name for the enum.
+ * WebKit.exp: Export the WebErrorDomainWebKit constant.
+ * WebView.subproj/WebView.m: Define the WebErrorDomainWebKit.
+
+ * WebKit.pbproj/project.pbxproj: Always use WebKit.exp.
+ * Makefile.am: Don't generate WebKit-combined.exp any more.
+ * WebKit-tests.exp: Removed.
+
2002-10-17 Darin Adler <darin at apple.com>
- fixed 3078644 -- Odd clipping in frame
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index a66512d..90a6ad9 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-10-18 Darin Adler <darin at apple.com>
+
+ Update for WebFoundation error domain changes.
+
+ * Misc.subproj/WebKitErrors.h: Put WebErrorDomainWebKit in here.
+ Also remove WebErrorNoError and the WebErrorCode name for the enum.
+ * WebKit.exp: Export the WebErrorDomainWebKit constant.
+ * WebView.subproj/WebView.m: Define the WebErrorDomainWebKit.
+
+ * WebKit.pbproj/project.pbxproj: Always use WebKit.exp.
+ * Makefile.am: Don't generate WebKit-combined.exp any more.
+ * WebKit-tests.exp: Removed.
+
2002-10-17 Darin Adler <darin at apple.com>
- fixed 3078644 -- Odd clipping in frame
diff --git a/WebKit/Makefile.am b/WebKit/Makefile.am
index a3c8a95..c4e8e97 100644
--- a/WebKit/Makefile.am
+++ b/WebKit/Makefile.am
@@ -6,13 +6,6 @@ clean-am:
rm -rf $(SYMROOTS)/WebKit.framework
rm -rf $(SYMROOTS)/Alexander.app/Frameworks/WebKit.framework
-WebKit-combined.exp: WebKit.exp WebKit-tests.exp
- cat $^ > $@
-
-noinst_DATA = WebKit-combined.exp
-BUILT_SOURCES = $(noinst_DATA)
-CLEANFILES = $(BUILT_SOURCES)
-
all: previous-clean-timestamp
previous-clean-timestamp: force-clean-timestamp
make clean && touch $@
diff --git a/WebKit/Misc.subproj/WebKitErrors.h b/WebKit/Misc.subproj/WebKitErrors.h
index 9920505..d668c45 100644
--- a/WebKit/Misc.subproj/WebKitErrors.h
+++ b/WebKit/Misc.subproj/WebKitErrors.h
@@ -8,9 +8,10 @@
// WebFoundation error codes < 10000
// WebKit error codes >= 10000
+extern NSString *WebErrorDomainWebKit;
+
/*!
- @enum WebErrorCode
- @constant WebErrorNoError
+ @enum
@constant WebErrorCannotFindFile
@constant WebErrorCannotCreateFile
@constant WebErrorCannotOpenFile
@@ -24,8 +25,7 @@
@constant WebErrorCannotShowURL
@constant WebErrorCannotNotFindApplicationForURL
*/
-typedef enum {
- WebErrorNoError = 0,
+enum {
WebErrorCannotFindFile = 10000,
WebErrorCannotCreateFile = 10001,
WebErrorCannotOpenFile = 10002,
@@ -38,8 +38,4 @@ typedef enum {
WebErrorCannotShowMIMEType = 10009,
WebErrorCannotShowURL = 10010,
WebErrorCannotNotFindApplicationForURL = 10011
-} WebErrorCode;
-
-
-
-
+};
diff --git a/WebKit/WebKit-tests.exp b/WebKit/WebKit-tests.exp
deleted file mode 100644
index e69de29..0000000
diff --git a/WebKit/WebKit.exp b/WebKit/WebKit.exp
index 20737e7..8fe9c18 100644
--- a/WebKit/WebKit.exp
+++ b/WebKit/WebKit.exp
@@ -4,8 +4,8 @@
.objc_class_name_WebContentPolicy
.objc_class_name_WebController
.objc_class_name_WebCoreStatistics
-.objc_class_name_WebDebugDOMNode
.objc_class_name_WebDataSource
+.objc_class_name_WebDebugDOMNode
.objc_class_name_WebDefaultContextMenuDelegate
.objc_class_name_WebDefaultPolicyDelegate
.objc_class_name_WebFileURLPolicy
@@ -34,6 +34,7 @@ _WebElementLinkLabelKey
_WebElementLinkTargetFrameKey
_WebElementLinkURLKey
_WebElementStringKey
+_WebErrorDomainWebKit
_WebHistoryEntriesChangedNotification
_WebIconDidChangeNotification
_WebIconLargeSize
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 02d8c2f..51b65a5 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -12,7 +12,6 @@
COPY_PHASE_STRIP = NO;
DEBUGGING_SYMBOLS = YES;
DEBUG_CFLAGS = "";
- EXPORTED_SYMBOLS_FILE = "WebKit-combined.exp";
FRAMEWORK_SEARCH_PATHS = "\U0001 at executable_path/../Frameworks";
INSTALL_PATH = "@executable_path/../Frameworks";
OPTIMIZATION_CFLAGS = "-O0";
@@ -2377,7 +2376,6 @@
COPY_PHASE_STRIP = NO;
DEBUGGING_SYMBOLS = YES;
DEBUG_CFLAGS = "";
- EXPORTED_SYMBOLS_FILE = "WebKit-combined.exp";
FRAMEWORK_SEARCH_PATHS = "\U0001 at executable_path/../Frameworks";
INSTALL_PATH = "@executable_path/../Frameworks";
OPTIMIZATION_CFLAGS = "-O";
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index c1c8add..d67ce66 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -34,6 +34,8 @@ enum {
SpaceKey = 0x0020
};
+NSString *WebErrorDomainWebKit = @"WebErrorDomainWebKit";
+
@implementation WebView
#define WebErrorDescriptionCannotFindFile UI_STRING("Cannot find file", "WebErrorCannotFindFile description")
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list