[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 425fb117ba213bb26db4ae8e2cc15e2a44c556bd
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 8 23:34:12 2003 +0000

            Reviewed by Maciej.
    
            - fixed 3368236 -- NSURL exception going back at http://derstandard.at/
    
            * WebView.subproj/WebFramePrivate.m: (-[WebFrame _createItem:]): Put "about:blank" in
            the back/forward item if there is no URL (which happens because there is no data source
            because the frame has never successfully loaded anything). Perhaps we can do better
            some day, but this avoids all the major bad effects in a safe way.
    
            * English.lproj/StringsNotToBeLocalized.txt: Update for recent changes.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4800 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 6282c5d..81b4bd6 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2003-08-08  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+        - fixed 3368236 -- NSURL exception going back at http://derstandard.at/
+
+        * WebView.subproj/WebFramePrivate.m: (-[WebFrame _createItem:]): Put "about:blank" in
+        the back/forward item if there is no URL (which happens because there is no data source
+        because the frame has never successfully loaded anything). Perhaps we can do better
+        some day, but this avoids all the major bad effects in a safe way.
+
+        * English.lproj/StringsNotToBeLocalized.txt: Update for recent changes.
+
 === Safari-92 ===
 
 2003-08-07  Richard Williamson   <rjw at apple.com>
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index e19ea7d..9fbcc1b 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -43,6 +43,12 @@
 "=================\nERROR: "
 "=================\nFATAL ERROR: "
 "=================\nSHOULD NEVER BE REACHED (%s:%d %s)\n=================\n"
+"ATSUCreateStyle failed (%d)"
+"ATSUCreateTextLayoutWithTextPtr failed(%d)"
+"ATSUGetGlyphBounds() failed(%d)"
+"ATSUSetAttributes failed (%d)"
+"ATSUSetLayoutControls failed(%d)"
+"ATSUSetTransientFontMatching failed(%d)"
 "Apple Chancery"
 "AppleFontSmoothing"
 "BP_CreatePluginMIMETypesPreferences"
@@ -78,6 +84,7 @@
 "JoiningOther"
 "JoiningRight"
 "Joy!peff"
+"Library/Icons"
 "Library/Internet Plug-Ins"
 "List count: %d items\n"
 "List total size: %d bytes\n"
@@ -95,9 +102,6 @@
 "NSFileModificationDate"
 "NSFileOwnerAccountName"
 "NSFilePosixPermissions"
-"NSTextView"
-"NSView"
-"NSWindow"
 "POST"
 "Papyrus"
 "Set-Cookie"
@@ -180,9 +184,6 @@
 "WebKitUserStyleSheetLocationPreferenceKey"
 "WebMethodNotYetImplemented"
 "WebModalDialogPretendWindow"
-"WebNSTextView"
-"WebNSView"
-"WebNSWindow"
 "WebPageCacheDataSourceKey"
 "WebPageCacheDocumentViewKey"
 "WebPageCacheEntryDateKey"
@@ -207,6 +208,7 @@
 "WebSiteURLToIconURLKey"
 "WebURLsWithTitlesPboardType"
 "\""
+"\0"
 "\n        "
 "\n    "
 "\n"
@@ -225,6 +227,7 @@
 "_parent"
 "_self"
 "_top"
+"about:"
 "about:blank"
 "application/octet-stream"
 "application/pdf"
@@ -241,10 +244,12 @@
 "com.apple.hiview"
 "displayTitle"
 "en"
+"ftp:"
 "htm"
 "html"
 "http"
 "https"
+"javascript:"
 "lastVisitedDate"
 "localized string not found"
 "nullplugin"
@@ -253,6 +258,7 @@
 "text/calendar"
 "text/directory"
 "text/html"
+"text/plain"
 "text/qif"
 "text/rtf"
 "text/vcard"
@@ -261,6 +267,7 @@
 "text/x-vcard"
 "text/xml"
 "tiff"
+"unexpected result from ATSUGetGlyphBounds():  actualNumBounds(%d) != 1"
 "url_icon"
 "visitCount"
 "x"
@@ -294,3 +301,10 @@ WebView.subproj/WebPreferences.m:"Values"
 WebView.subproj/WebPreferences.m:"latin1"
 WebView.subproj/WebRenderNode.m
 WebView.subproj/WebView.m:"Preferences"
+WebView.subproj/WebViewPrivate.m:"canGoBack"
+WebView.subproj/WebViewPrivate.m:"canGoForward"
+WebView.subproj/WebViewPrivate.m:"estimatedProgress"
+WebView.subproj/WebViewPrivate.m:"isLoading"
+WebView.subproj/WebViewPrivate.m:"mainFrameIcon"
+WebView.subproj/WebViewPrivate.m:"mainFrameTitle"
+WebView.subproj/WebViewPrivate.m:"mainFrameURL"
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 9b7dda3..18c2073 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -283,6 +283,15 @@ NSString *WebCorePageCacheStateKey = @"WebCorePageCacheState";
 
     LOG (History, "creating item for %@", request);
     
+    // Frames that have never successfully loaded any content
+    // may have no URL at all. Currently our history code can't
+    // deal with such things, so we nip that in the bud here.
+    // Later we may want to learn to live with nil for URL.
+    // See bug 3368236 and related bugs for more information.
+    if (URL == nil) {
+        URL = [NSURL URLWithString:@"about:blank"];
+    }
+
     bfItem = [[[WebHistoryItem alloc] initWithURL:URL target:[self name] parent:[[self parentFrame] name] title:[dataSrc pageTitle]] autorelease];
     [dataSrc _addBackForwardItem:bfItem];
     [bfItem setOriginalURLString:[[[dataSrc _originalRequest] URL] absoluteString]];

-- 
WebKit Debian packaging