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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 1398ccad3c891b4984d5f1ed2a3b3e2e8e41daaa
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 8 18:51:40 2002 +0000

    WebFoundation:
    
            * Misc.subproj/WebNSFileManagerExtras.h:
            * Misc.subproj/WebNSFileManagerExtras.m:
            (-[NSFileManager _web_carbonPathForPath:]): added
            (-[NSFileManager _web_startupVolumeName]): added
            * WebFoundation.pbproj/project.pbxproj: made WebNSFileManagerExtras.h a private header
    
    WebKit:
    
            * Plugins.subproj/WebPluginStream.m:
            (-[WebPluginStream finishedLoadingWithData:]): call [NSFileManager _web_carbonPathForPath:]
    
    WebBrowser:
    
    	Fixed:
    
    	3015546 - title bar button should be draggable
    	3015545 - title bar button should have command-click pop-up menu
    
            * BrowserNSViewExtras.h:
            * BrowserNSViewExtras.m:
            (-[NSView draggingImage]): added, not used yet
            (-[NSView startDragFromEvent:withPasteBoard:andImage:]): dragOffset correction
            * BrowserWindow.h:
            * BrowserWindowController.m:
            (-[BrowserWindowController windowURL]): added, called by TitleBarButton
            (-[BrowserWindowController windowShouldGoToURL:]): added, called by TitleBarButton
            * ListView.h:
            * ListView.m:
            * TitleBarButton.m:
            (-[TitleBarButton initWithFrame:]): add observers
            (-[TitleBarButton dealloc]): remove observers
            (-[TitleBarButton drawRect:]): coord fix
            (-[TitleBarButton userChoseMenuItem:]): added
            (-[TitleBarButton _drawPathRepresentingPopUpMenuForEvent:andURL:]): added
            (-[TitleBarButton _startDragIfNecessaryForEvent:andURL:]): added
            (-[TitleBarButton mouseDown:]): call new methods above
            (-[TitleBarButton _resetWindowButtons:]): added
            (-[TitleBarButton resetFrame]): calls _resetWindowButtons
            (-[TitleBarButton windowDidEndSheet:]): added
            (-[TitleBarButton windowDidDeminiaturize:]): added
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1777 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a40f20f..b1f62bf 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-08  Chris Blumenberg  <cblu at apple.com>
+
+        * Plugins.subproj/WebPluginStream.m:
+        (-[WebPluginStream finishedLoadingWithData:]): call [NSFileManager _web_carbonPathForPath:]
+
 2002-08-08  Maciej Stachowiak  <mjs at apple.com>
 
 	- fixed 2957197 - Need API for getting/setting default text encoding
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index a40f20f..b1f62bf 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,8 @@
+2002-08-08  Chris Blumenberg  <cblu at apple.com>
+
+        * Plugins.subproj/WebPluginStream.m:
+        (-[WebPluginStream finishedLoadingWithData:]): call [NSFileManager _web_carbonPathForPath:]
+
 2002-08-08  Maciej Stachowiak  <mjs at apple.com>
 
 	- fixed 2957197 - Need API for getting/setting default text encoding
diff --git a/WebKit/Plugins.subproj/WebPluginStream.m b/WebKit/Plugins.subproj/WebPluginStream.m
index 7c6656f..92f1a2a 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.m
+++ b/WebKit/Plugins.subproj/WebPluginStream.m
@@ -12,12 +12,11 @@
 #import <WebKitDebug.h>
 
 #import <WebFoundation/WebFoundation.h>
+#import <WebFoundation/WebNSFileManagerExtras.h>
 
 @interface WebPluginStream (WebResourceClient) <WebResourceClient>
 @end
 
-static NSString *getCarbonPath(NSString *posixPath);
-
 @implementation WebPluginStream
 
 - (void) getFunctionPointersFromPluginView:(WebPluginView *)pluginView
@@ -185,7 +184,7 @@ static NSString *getCarbonPath(NSString *posixPath);
 {
     NPError npErr;
     NSFileManager *fileManager;
-    NSString *filename;
+    NSString *filename, *carbonPath;
     
     filename = [[URL path] lastPathComponent];
     if(transferMode == NP_ASFILE || transferMode == NP_ASFILEONLY) {
@@ -196,8 +195,9 @@ static NSString *getCarbonPath(NSString *posixPath);
         [fileManager createFileAtPath:path contents:data attributes:nil];
         
         // FIXME: Will cString use the correct character set?
-        NPP_StreamAsFile(instance, &npStream, [getCarbonPath(path) cString]);
-        WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_StreamAsFile: %s\n", [getCarbonPath(path) cString]);
+        carbonPath = [[NSFileManager defaultManager] _web_carbonPathForPath:path];
+        NPP_StreamAsFile(instance, &npStream, [carbonPath cString]);
+        WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_StreamAsFile: %s\n", [carbonPath cString]);
     }
     npErr = NPP_DestroyStream(instance, &npStream, NPRES_DONE);
     WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_DestroyStream: %d\n", npErr);
@@ -314,51 +314,3 @@ static NSString *getCarbonPath(NSString *posixPath);
 }
 
 @end
-
-static NSString *getCarbonPath(NSString *posixPath)
-{
-    OSStatus error;
-    FSRef ref, rootRef, parentRef;
-    FSCatalogInfo info;
-    NSMutableArray *carbonPathPieces;
-    HFSUniStr255 nameString;
-    
-    // Make an FSRef.
-    error = FSPathMakeRef((const UInt8 *)[[NSFileManager defaultManager] fileSystemRepresentationWithPath:posixPath], &ref, NULL);
-    if (error != noErr) {
-        return nil;
-    }
-    
-    // Get volume refNum.
-    error = FSGetCatalogInfo(&ref, kFSCatInfoVolume, &info, NULL, NULL, NULL);
-    if (error != noErr) {
-        return nil;
-    }
-    
-    // Get root directory FSRef.
-    error = FSGetVolumeInfo(info.volume, 0, NULL, kFSVolInfoNone, NULL, NULL, &rootRef);
-    if (error != noErr) {
-        return nil;
-    }
-    
-    // Get the pieces of the path.
-    carbonPathPieces = [NSMutableArray array];
-    for (;;) {
-        error = FSGetCatalogInfo(&ref, kFSCatInfoNone, NULL, &nameString, NULL, &parentRef);
-        if (error != noErr) {
-            return nil;
-        }
-        [carbonPathPieces insertObject:[NSString stringWithCharacters:nameString.unicode length:nameString.length] atIndex:0];
-        if (FSCompareFSRefs(&ref, &rootRef) == noErr) {
-            break;
-        }
-        ref = parentRef;
-    }
-    
-    // Volume names need trailing : character.
-    if ([carbonPathPieces count] == 1) {
-        [carbonPathPieces addObject:@""];
-    }
-    
-    return [carbonPathPieces componentsJoinedByString:@":"];
-}

-- 
WebKit Debian packaging