Changeset 25312 in webkit

Timestamp:

Aug 29, 2007 5:45:52 PM (17 years ago)

Author:

darin

Message:

Reviewed by Tim Hatcher.

• fix <rdar://problem/4582212> WebKit inappropriately adds +initialize to NSPasteboard via a category, prevents AppKit initialize ​http://bugs.webkit.org/show_bug.cgi?id=9417

• Misc/WebNSPasteboardExtras.h: Got rid of the global data objects and replaced them with global functions.

• Misc/WebNSPasteboardExtras.mm: (initializePasteboardTypes): Changed the initialize method to be this function. (WebURLPasteboardType): Added, calls the initialize function and then returns the value of the global. (WebURLNamePasteboardType): Ditto. (+[NSPasteboard _web_writableTypesForURL]): Changed to call the new function instead of getting at the global directly. (+[NSPasteboard _web_dragTypesForURL]): Ditto. (-[NSPasteboard _web_writeURL:andTitle:types:]): Ditto.
• WebCoreSupport/WebPasteboardHelper.mm: (WebPasteboardHelper::urlFromPasteboard): Ditto.
• WebView/WebHTMLView.mm: (-[WebHTMLView _documentFragmentFromPasteboard:forType:inContext:subresources:]): Ditto.

• WebView/WebView.mm: (+[WebView initialize]): Added a call to one of the functions to take advantage of the side effect that initializes the globals; this is to help out old versions of Safari. (+[WebView URLTitleFromPasteboard:]): Changed to call the new function instead of getting at the global directly.

• WebKit.exp: Add exports of the new functions.

Location:

trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Misc/WebNSPasteboardExtras.h (modified) (3 diffs)
• Misc/WebNSPasteboardExtras.mm (modified) (6 diffs)
• WebCoreSupport/WebPasteboardHelper.mm (modified) (2 diffs)
• WebKit.exp (modified) (1 diff)
• WebView/WebHTMLView.mm (modified) (1 diff)
• WebView/WebView.mm (modified) (2 diffs)

trunk/WebKit/ChangeLog

@@ +1 @@
+2007-08-29  Darin Adler  <darin@apple.com>
+
+        Reviewed by Tim Hatcher.
+
+        - fix <rdar://problem/4582212> WebKit inappropriately adds +initialize to
+          NSPasteboard via a category, prevents AppKit initialize
+          http://bugs.webkit.org/show_bug.cgi?id=9417
+
+        * Misc/WebNSPasteboardExtras.h: Got rid of the global data objects and replaced
+        them with global functions.
+
+        * Misc/WebNSPasteboardExtras.mm:
+        (initializePasteboardTypes): Changed the initialize method to be this function.
+        (WebURLPasteboardType): Added, calls the initialize function and then returns
+        the value of the global.
+        (WebURLNamePasteboardType): Ditto.
+        (+[NSPasteboard _web_writableTypesForURL]): Changed to call the new function instead
+        of getting at the global directly.
+        (+[NSPasteboard _web_dragTypesForURL]): Ditto.
+        (-[NSPasteboard _web_writeURL:andTitle:types:]): Ditto.
+        * WebCoreSupport/WebPasteboardHelper.mm:
+        (WebPasteboardHelper::urlFromPasteboard): Ditto.
+        * WebView/WebHTMLView.mm:
+        (-[WebHTMLView _documentFragmentFromPasteboard:forType:inContext:subresources:]): Ditto.
+
+        * WebView/WebView.mm:
+        (+[WebView initialize]): Added a call to one of the functions to take advantage
+        of the side effect that initializes the globals; this is to help out old versions
+        of Safari.
+        (+[WebView URLTitleFromPasteboard:]): Changed to call the new function instead
+        of getting at the global directly.
+
+        * WebKit.exp: Add exports of the new functions.
+
 2007-08-29  Adele Peterson  <adele@apple.com>
 

trunk/WebKit/Misc/WebNSPasteboardExtras.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2005, 2006 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2005, 2006, 2007 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33 +33 @@
 @class WebHTMLView;
 
-extern NSString *WebURLPboardType;
-extern NSString *WebURLNamePboardType;
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+NSString *WebURLPasteboardType(void);
+NSString *WebURLNamePasteboardType(void);
 
 @interface NSPasteboard (WebExtras)
@@ -80 +84 @@
 
 @end
+
+#ifdef __cplusplus
+}
+#endif

trunk/WebKit/Misc/WebNSPasteboardExtras.mm

@@ -46 +46 @@
 #import <WebKitSystemInterface.h>
 
-using namespace WebCore;
-
-NSString *WebURLPboardType = nil;
-NSString *WebURLNamePboardType = nil;
+// These are needed for compatibility with old versions of Safari. Once we don't need
+// to support Safari 2 or the first Safari 3 public beta, we can remove them.
+extern "C" NSString *WebURLPboardType;
+extern "C" NSString *WebURLNamePboardType;
 
 @interface NSFilePromiseDragSource : NSObject
@@ -56 +56 @@
 @end
 
-@implementation NSPasteboard (WebExtras)
-
-+ (void)initialize
-{
-    // FIXME  The code below addresses 3446192.  It was awaiting a fix for 3446669. Now that bug has been fixed,
-    // but this code still does not work; UTTypeCopyPreferredTagWithClass returns nil, which caused 4145214. Some
-    // day we'll need to investigate why this code is still not working.
+using namespace WebCore;
+
+NSString *WebURLPboardType = nil;
+NSString *WebURLNamePboardType = nil;
+
+static void initializePasteboardTypes()
+{
+    if (WebURLPboardType)
+        return;
+
+    // FIXME: We'd like to use UTI_PB_API code, but we can't yet. The reasons are in Radar bug 3446192.
 #ifdef UTI_PB_API
     CFStringRef osTypeString = UTCreateStringForOSType('url ');
-    CFStringRef utiTypeString = UTTypeCreatePreferredIdentifierForTag( kUTTagClassOSType, osTypeString, NULL );
-    WebURLPboardType = (NSString *)UTTypeCopyPreferredTagWithClass( kUTTagClassNSPboardType, utiTypeString );
-    if (osTypeString != NULL) {
+    CFStringRef utiTypeString = UTTypeCreatePreferredIdentifierForTag(kUTTagClassOSType, osTypeString, NULL);
+    WebURLPboardType = (NSString *)UTTypeCopyPreferredTagWithClass(kUTTagClassNSPboardType, utiTypeString);
+    if (osTypeString != NULL)
         CFRelease(osTypeString);
-    }
-    if (utiTypeString != NULL) {
+    if (utiTypeString != NULL)
         CFRelease(utiTypeString);
-    }
     
     osTypeString = UTCreateStringForOSType('urln');
-    utiTypeString = UTTypeCreatePreferredIdentifierForTag( kUTTagClassOSType, osTypeString, NULL );
-    WebURLNamePboardType = (NSString *)UTTypeCopyPreferredTagWithClass( kUTTagClassNSPboardType, utiTypeString );
-    if (osTypeString != NULL) {
+    utiTypeString = UTTypeCreatePreferredIdentifierForTag(kUTTagClassOSType, osTypeString, NULL);
+    WebURLNamePboardType = (NSString *)UTTypeCopyPreferredTagWithClass(kUTTagClassNSPboardType, utiTypeString);
+    if (osTypeString != NULL)
         CFRelease(osTypeString);
-    }
-    if (utiTypeString != NULL) {
+    if (utiTypeString != NULL)
         CFRelease(utiTypeString);
-    }
 #else
     WebURLPboardType = WKCreateURLPasteboardFlavorTypeName();
@@ -88 +88 @@
 #endif
 }
+
+NSString *WebURLPasteboardType()
+{
+    initializePasteboardTypes();
+    return WebURLPboardType;
+}
+
+NSString *WebURLNamePasteboardType()
+{
+    initializePasteboardTypes();
+    return WebURLNamePboardType;
+}
+
+#define WebURLPboardType DO_NOT_USE_WebURLPboardType_IN_THIS_FILE
+#define WebURLNamePboardType DO_NOT_USE_WebURLNamePboardType_IN_THIS_FILE
+
+@implementation NSPasteboard (WebExtras)
 
 + (NSArray *)_web_writableTypesForURL
@@ -96 +113 @@
             WebURLsWithTitlesPboardType,
             NSURLPboardType,
-            WebURLPboardType,
-            WebURLNamePboardType,
+            WebURLPasteboardType(),
+            WebURLNamePasteboardType(),
             NSStringPboardType,
             nil];
@@ -137 +154 @@
         WebURLsWithTitlesPboardType,
         NSURLPboardType,
-        WebURLPboardType,
-        WebURLNamePboardType,
+        WebURLPasteboardType(),
+        WebURLNamePasteboardType(),
         NSStringPboardType,
         NSFilenamesPboardType,
@@ -183 +200 @@
 {
     ASSERT(URL);
-    
+
     if ([title length] == 0) {
         title = [[URL path] lastPathComponent];
-        if ([title length] == 0) {
+        if ([title length] == 0)
             title = [URL _web_userVisibleString];
-        }
-    }
-    
-    if ([types containsObject:NSURLPboardType]) {
+    }
+    
+    if ([types containsObject:NSURLPboardType])
         [URL writeToPasteboard:self];
-    }
-    if ([types containsObject:WebURLPboardType]) {
-        [self setString:[URL _web_originalDataAsString] forType:WebURLPboardType];
-    }
-    if ([types containsObject:WebURLNamePboardType]) {
-        [self setString:title forType:WebURLNamePboardType];
-    }
-    if ([types containsObject:NSStringPboardType]) {
+    if ([types containsObject:WebURLPasteboardType()])
+        [self setString:[URL _web_originalDataAsString] forType:WebURLPasteboardType()];
+    if ([types containsObject:WebURLNamePasteboardType()])
+        [self setString:title forType:WebURLNamePasteboardType()];
+    if ([types containsObject:NSStringPboardType])
         [self setString:[URL _web_userVisibleString] forType:NSStringPboardType];
-    }
-    if ([types containsObject:WebURLsWithTitlesPboardType]) {
+    if ([types containsObject:WebURLsWithTitlesPboardType])
         [WebURLsWithTitles writeURLs:[NSArray arrayWithObject:URL] andTitles:[NSArray arrayWithObject:title] toPasteboard:self];
-    }
 }
 

trunk/WebKit/WebCoreSupport/WebPasteboardHelper.mm

@@ -1 +1 @@
 /*
- * Copyright (C) 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2007 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -40 +40 @@
 {
     NSURL *URL = [pasteboard _web_bestURL];
-    if (title)
-        if (NSString *URLTitleString = [pasteboard stringForType:WebURLNamePboardType])
+    if (title) {
+        if (NSString *URLTitleString = [pasteboard stringForType:WebURLNamePasteboardType()])
             *title = URLTitleString;
+    }
 
     return [URL _web_originalDataAsString];

trunk/WebKit/WebKit.exp

@@ -94 +94 @@
 _WebScriptErrorDomain
 _WebScriptErrorLineNumberKey
+_WebURLNamePasteboardType
 _WebURLNamePboardType
+_WebURLPasteboardType
 _WebURLPboardType
 _WebViewDidBeginEditingNotification

trunk/WebKit/WebView/WebHTMLView.mm

@@ -1926 +1926 @@
         if ([URLString length] == 0)
             return nil;
-        NSString *URLTitleString = [pasteboard stringForType:WebURLNamePboardType];
+        NSString *URLTitleString = [pasteboard stringForType:WebURLNamePasteboardType()];
         DOMText *text = [document createTextNode:URLTitleString];
         [anchor setHref:URLString];

trunk/WebKit/WebView/WebView.mm

@@ -1651 +1651 @@
 + (void)initialize
 {
-    static BOOL tooLate = NO;
-    if (!tooLate) {
+    static BOOL initialized = NO;
+    if (initialized)
+        return;
+    initialized = YES;
+
 #ifdef REMOVE_SAFARI_DOM_TREE_DEBUG_ITEM
-        // this prevents open source users from crashing when using the Show DOM Tree menu item in Safari 2
-        // FIXME: remove this when we no longer need to support Safari 2
-        if ([[[NSBundle mainBundle] bundleIdentifier] isEqualToString:@"com.apple.Safari"] && [[NSUserDefaults standardUserDefaults] boolForKey:@"IncludeDebugMenu"])
-            [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_finishedLaunching) name:NSApplicationDidFinishLaunchingNotification object:NSApp];
+    // This prevents open source users from crashing when using the Show DOM Tree menu item in Safari 2.
+    // FIXME: remove this when we no longer need to support Safari 2.
+    if ([[[NSBundle mainBundle] bundleIdentifier] isEqualToString:@"com.apple.Safari"] && [[NSUserDefaults standardUserDefaults] boolForKey:@"IncludeDebugMenu"])
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_finishedLaunching) name:NSApplicationDidFinishLaunchingNotification object:NSApp];
 #endif
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_applicationWillTerminate) name:NSApplicationWillTerminateNotification object:NSApp];
-        tooLate = YES;
-    }
+
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_applicationWillTerminate) name:NSApplicationWillTerminateNotification object:NSApp];
+
+    // Older versions of Safari use the pasteboard types without initializing them.
+    // But they create a WebView beforehand, so if we initialize here that should be fine.
+    WebURLPasteboardType();
 }
 
@@ -1775 +1781 @@
 + (NSString *)URLTitleFromPasteboard:(NSPasteboard *)pasteboard
 {
-    return [pasteboard stringForType:WebURLNamePboardType];
+    return [pasteboard stringForType:WebURLNamePasteboardType()];
 }