[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 07:21:27 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 10d1d41d740528d5f81330360bbc2a41cb25bcbe
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 23 20:03:55 2003 +0000
WebFoundation:
Reviewed by John.
* Misc.subproj/WebNSFileManagerExtras.h: Change the too broad "FinderInfo"
to the accurate "FinderFlags". The property does not contain all the FinderInfo,
rather just the flags.
* Misc.subproj/WebNSFileManagerExtras.m:
(-[NSFileManager _web_createFileAtPath:contents:attributes:]): Update for the
FinderFlags name change.
(-[NSFileManager _web_carbonPathForPath:]): Use fileSystemRepresentation instead
of fileSystemRepresentationWithPath: because it's simpler and there's no good reason
to use the other one.
* English.lproj/StringsNotToBeLocalized.txt: Update for recent changes.
WebKit:
Reviewed by John.
* Downloads.subproj/WebBinHexDecoder.m: (-[WebBinHexDecoder fileAttributes]):
* Downloads.subproj/WebMacBinaryDecoder.m: (-[WebMacBinaryDecoder fileAttributes]):
Use "FinderFlags" instead of "FinderInfo" as appropriate, since these are
just the Finder flags, not all the Finder info.
* Downloads.subproj/WebDownloadHandler.m: (-[WebDownloadHandler createFileIfNecessary]):
* Misc.subproj/WebNSWorkspaceExtras.m: (-[NSWorkspace _web_noteFileChangedAtPath:]):
* Plugins.subproj/WebNetscapePluginPackage.m:
(-[WebNetscapePluginPackage openResourceFile]):
(-[WebNetscapePluginPackage pathByResolvingSymlinksAndAliasesInPath:]):
(-[WebNetscapePluginPackage load]):
Use fileSystemRepresentation instead of fileSystemRepresentationWithPath:
because it's simpler and there's no good reason to use the other one.
* WebView.subproj/WebUserAgentSpoofTable.gperf: Improved one of the motivating comments.
* English.lproj/StringsNotToBeLocalized.txt: Update for recent changes.
WebBrowser:
Reviewed by John.
* BrowserNSWorkspaceExtras.m:
(-[NSWorkspace launchApplicationAtPath:processSerialNumber:makeFrontmost:event:]):
Use fileSystemRepresentation instead of fileSystemRepresentationWithPath:
because it's simpler and there's no good reason to use the other one.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3423 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 1888feb..96af622 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,25 @@
+2003-01-23 Darin Adler <darin at apple.com>
+
+ Reviewed by John.
+
+ * Downloads.subproj/WebBinHexDecoder.m: (-[WebBinHexDecoder fileAttributes]):
+ * Downloads.subproj/WebMacBinaryDecoder.m: (-[WebMacBinaryDecoder fileAttributes]):
+ Use "FinderFlags" instead of "FinderInfo" as appropriate, since these are
+ just the Finder flags, not all the Finder info.
+
+ * Downloads.subproj/WebDownloadHandler.m: (-[WebDownloadHandler createFileIfNecessary]):
+ * Misc.subproj/WebNSWorkspaceExtras.m: (-[NSWorkspace _web_noteFileChangedAtPath:]):
+ * Plugins.subproj/WebNetscapePluginPackage.m:
+ (-[WebNetscapePluginPackage openResourceFile]):
+ (-[WebNetscapePluginPackage pathByResolvingSymlinksAndAliasesInPath:]):
+ (-[WebNetscapePluginPackage load]):
+ Use fileSystemRepresentation instead of fileSystemRepresentationWithPath:
+ because it's simpler and there's no good reason to use the other one.
+
+ * WebView.subproj/WebUserAgentSpoofTable.gperf: Improved one of the motivating comments.
+
+ * English.lproj/StringsNotToBeLocalized.txt: Update for recent changes.
+
=== Safari-54 ===
2003-01-22 Chris Blumenberg <cblu at apple.com>
diff --git a/WebKit/Downloads.subproj/WebBinHexDecoder.m b/WebKit/Downloads.subproj/WebBinHexDecoder.m
index 88ad7dc..410eeba 100644
--- a/WebKit/Downloads.subproj/WebBinHexDecoder.m
+++ b/WebKit/Downloads.subproj/WebBinHexDecoder.m
@@ -362,7 +362,7 @@ done:
return [NSDictionary dictionaryWithObjectsAndKeys:
[NSNumber numberWithUnsignedLong:_fileType], NSFileHFSTypeCode,
[NSNumber numberWithUnsignedLong:_fileCreator], NSFileHFSCreatorCode,
- [NSNumber numberWithUnsignedShort:_finderFlags], WebFinderInfo,
+ [NSNumber numberWithUnsignedShort:_finderFlags], WebFinderFlags,
nil];
}
diff --git a/WebKit/Downloads.subproj/WebDownload.m b/WebKit/Downloads.subproj/WebDownload.m
index 6124369..bd8a47c 100644
--- a/WebKit/Downloads.subproj/WebDownload.m
+++ b/WebKit/Downloads.subproj/WebDownload.m
@@ -211,7 +211,7 @@
[[NSWorkspace sharedWorkspace] _web_noteFileChangedAtPath:path];
- OSErr result = FSPathMakeRef((const UInt8 *)[fileManager fileSystemRepresentationWithPath:path], &fileRef, NULL);
+ OSErr result = FSPathMakeRef((const UInt8 *)[path fileSystemRepresentation], &fileRef, NULL);
if (result == noErr) {
fileRefPtr = &fileRef;
} else {
diff --git a/WebKit/Downloads.subproj/WebDownloadHandler.m b/WebKit/Downloads.subproj/WebDownloadHandler.m
index 6124369..bd8a47c 100644
--- a/WebKit/Downloads.subproj/WebDownloadHandler.m
+++ b/WebKit/Downloads.subproj/WebDownloadHandler.m
@@ -211,7 +211,7 @@
[[NSWorkspace sharedWorkspace] _web_noteFileChangedAtPath:path];
- OSErr result = FSPathMakeRef((const UInt8 *)[fileManager fileSystemRepresentationWithPath:path], &fileRef, NULL);
+ OSErr result = FSPathMakeRef((const UInt8 *)[path fileSystemRepresentation], &fileRef, NULL);
if (result == noErr) {
fileRefPtr = &fileRef;
} else {
diff --git a/WebKit/Downloads.subproj/WebMacBinaryDecoder.m b/WebKit/Downloads.subproj/WebMacBinaryDecoder.m
index 06f8f88..b8c1a00 100644
--- a/WebKit/Downloads.subproj/WebMacBinaryDecoder.m
+++ b/WebKit/Downloads.subproj/WebMacBinaryDecoder.m
@@ -159,8 +159,8 @@
[NSDate dateWithTimeIntervalSinceReferenceDate:kCFAbsoluteTimeIntervalSince1904 + _modificationDate], NSFileModificationDate,
[NSNumber numberWithUnsignedLong:_fileType], NSFileHFSTypeCode,
[NSNumber numberWithUnsignedLong:_fileCreator], NSFileHFSCreatorCode,
- [NSNumber numberWithUnsignedShort:_finderFlags], WebFinderInfo,
- [NSNumber numberWithUnsignedShort:_extendedFinderFlags], WebExtendedFinderInfo,
+ [NSNumber numberWithUnsignedShort:_finderFlags], WebFinderFlags,
+ [NSNumber numberWithUnsignedShort:_extendedFinderFlags], WebExtendedFinderFlags,
nil];
}
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index 030be7e..4ff3fb2 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -107,6 +107,7 @@
"WebBookmarkTypeLeaf"
"WebBookmarkTypeList"
"WebBookmarkTypeProxy"
+"WebBookmarkUUID"
"WebBookmarkWillChangeNotification"
"WebBookmarksWereAddedNotification"
"WebBookmarksWereRemovedNotification"
diff --git a/WebKit/Misc.subproj/WebNSWorkspaceExtras.m b/WebKit/Misc.subproj/WebNSWorkspaceExtras.m
index 6c8f57f..67d1677 100644
--- a/WebKit/Misc.subproj/WebNSWorkspaceExtras.m
+++ b/WebKit/Misc.subproj/WebNSWorkspaceExtras.m
@@ -16,10 +16,8 @@
{
ASSERT(path);
- NSFileManager *fileManager = [NSFileManager defaultManager];
-
NSString *directoryPath = [path stringByDeletingLastPathComponent];
- const char *dirRep = [fileManager fileSystemRepresentationWithPath:directoryPath];
+ const char *dirRep = [directoryPath fileSystemRepresentation];
// Send the notificaition that directory contents have changed.
FNNotifyByPath(dirRep, kFNDirectoryModifiedMessage, kNilOptions);
@@ -41,7 +39,7 @@
returnID:0
transactionID:0];
- const char *fileRep = [[NSFileManager defaultManager] fileSystemRepresentationWithPath:path];
+ const char *fileRep = [path fileSystemRepresentation];
FSRef fref;
OSStatus error = FSPathMakeRef(fileRep, &fref, NULL);
if(error){
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginPackage.m b/WebKit/Plugins.subproj/WebNetscapePluginPackage.m
index cf72e7d..fefebef 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginPackage.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginPackage.m
@@ -38,7 +38,7 @@ static TransitionVector tVectorForFunctionPointer(FunctionPointer);
if(isBundle){
return CFBundleOpenBundleResourceMap(bundle);
}else{
- err = FSPathMakeRef((const UInt8 *)[[NSFileManager defaultManager] fileSystemRepresentationWithPath:path], &fref, NULL);
+ err = FSPathMakeRef((const UInt8 *)[path fileSystemRepresentation], &fref, NULL);
if(err != noErr){
return -1;
}
@@ -164,7 +164,7 @@ static TransitionVector tVectorForFunctionPointer(FunctionPointer);
FSRef fref;
OSErr err;
- err = FSPathMakeRef((const UInt8 *)[[NSFileManager defaultManager] fileSystemRepresentationWithPath:thePath], &fref, NULL);
+ err = FSPathMakeRef((const UInt8 *)[thePath fileSystemRepresentation], &fref, NULL);
if(err != noErr){
return newPath;
}
@@ -295,7 +295,7 @@ static TransitionVector tVectorForFunctionPointer(FunctionPointer);
FSSpec spec;
FSRef fref;
- err = FSPathMakeRef((UInt8 *)[[NSFileManager defaultManager] fileSystemRepresentationWithPath:path], &fref, NULL);
+ err = FSPathMakeRef((UInt8 *)[path fileSystemRepresentation], &fref, NULL);
if(err != noErr){
ERROR("FSPathMakeRef failed. Error=%d", err);
return NO;
diff --git a/WebKit/WebView.subproj/WebUserAgentSpoofTable.gperf b/WebKit/WebView.subproj/WebUserAgentSpoofTable.gperf
index 36f362b..f17adc5 100644
--- a/WebKit/WebView.subproj/WebUserAgentSpoofTable.gperf
+++ b/WebKit/WebView.subproj/WebUserAgentSpoofTable.gperf
@@ -17,7 +17,7 @@ nj.com, MacIE
oregonlive.com, MacIE
watch.com, MacIE
#
-# pretend to be Mac IE to make the return key work to log in
+# pretend to be Mac IE because the site has JavaScript that works only for "Netscape" or "Microsoft"
firstusa.com, MacIE
#
# pretend to be Mac IE to avoid bad-quality CSS the site gives us otherwise
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list