WebCore:
authordarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 11 Sep 2007 17:47:26 +0000 (17:47 +0000)
committerdarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 11 Sep 2007 17:47:26 +0000 (17:47 +0000)
        Rubber-stamped by Dave Harrison.

        - fixed pasteboard types here to match WebKit and use constants instead of
          WebKitSystemInterface

        * platform/mac/PasteboardMac.mm: Use constants for all pasteboard type strings.

        * platform/mac/WebCoreSystemInterface.h: Removed wkCreateURLPasteboardFlavorTypeName
        and wkCreateURLNPasteboardFlavorTypeName.

WebKit:

        Rubber-stamped by Dave Harrison.

        * WebCoreSupport/WebSystemInterface.m: (InitWebCoreSystemInterface):
        Removed wkCreateURLPasteboardFlavorTypeName and wkCreateURLNPasteboardFlavorTypeName.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@25494 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/platform/mac/PasteboardMac.mm
WebCore/platform/mac/WebCoreSystemInterface.h
WebKit/ChangeLog
WebKit/WebCoreSupport/WebSystemInterface.m

index 762aa7717fa80048f71fdb6f35da8d2a7fa7d366..a92734e986daf69d5c1f3ad275968c174f4d32f9 100644 (file)
@@ -1,3 +1,15 @@
+2007-09-11  Darin Adler  <darin@apple.com>
+
+        Rubber-stamped by Dave Harrison.
+
+        - fixed pasteboard types here to match WebKit and use constants instead of
+          WebKitSystemInterface
+
+        * platform/mac/PasteboardMac.mm: Use constants for all pasteboard type strings.
+
+        * platform/mac/WebCoreSystemInterface.h: Removed wkCreateURLPasteboardFlavorTypeName
+        and wkCreateURLNPasteboardFlavorTypeName.
+
 2007-09-11  Sven Herzberg  <sven@imendio.com>
 
         Reviewed by Mark.
index 419b3b5a2fc45a51effb58972e25a9d5d25b52dd..4b022979dc5ae39350dcdce41a166b5c93b31f94 100644 (file)
 
 namespace WebCore {
 
-NSString *WebArchivePboardType;
-NSString *WebSmartPastePboardType;
-NSString *WebURLNamePboardType;
-NSString *WebURLPboardType;
-NSString *WebURLsWithTitlesPboardType;
+// FIXME: It's not great to have these both here and in WebKit.
+NSString *WebArchivePboardType = @"Apple Web Archive pasteboard type";
+NSString *WebSmartPastePboardType = @"NeXT smart paste pasteboard type";
+NSString *WebURLNamePboardType = @"public.url-name";
+NSString *WebURLPboardType = @"public.url";
+NSString *WebURLsWithTitlesPboardType = @"WebURLsWithTitlesPboardType";
 
 #ifndef BUILDING_ON_TIGER
 static NSArray* selectionPasteboardTypes(bool canSmartCopyOrDelete, bool selectionContainsAttachments)
@@ -109,11 +110,6 @@ Pasteboard* Pasteboard::generalPasteboard()
 Pasteboard::Pasteboard(NSPasteboard* pboard)
     : m_pasteboard(pboard)
 {
-    WebArchivePboardType          = @"Apple Web Archive pasteboard type";
-    WebSmartPastePboardType       = @"NeXT smart paste pasteboard type";
-    WebURLNamePboardType          = wkCreateURLNPasteboardFlavorTypeName();
-    WebURLPboardType              = wkCreateURLPasteboardFlavorTypeName();
-    WebURLsWithTitlesPboardType   = @"WebURLsWithTitlesPboardType";
 }
 
 void Pasteboard::clear()
index 53dc52df1bdf76518b15952ab67e59c882f73e89..6165a7e79fbd46ee413977ef1d3abee18fa1ffc5 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Apple Computer, Inc. All rights reserved.
+ * Copyright 2006, 2007 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -82,8 +82,6 @@ extern CFReadStreamRef (*wkCreateCustomCFReadStream)(void *(*formCreate)(CFReadS
     void *context);
 extern OSStatus (*wkConvertCharToGlyphs)(void* styleGroup, const UniChar*, unsigned numCharacters, void* glyphs);
 extern id (*wkCreateNSURLConnectionDelegateProxy)(void);
-extern NSString* (*wkCreateURLPasteboardFlavorTypeName)(void);
-extern NSString* (*wkCreateURLNPasteboardFlavorTypeName)(void);
 extern void (*wkDrawBezeledTextFieldCell)(NSRect, BOOL enabled);
 extern void (*wkDrawTextFieldCellFocusRing)(NSTextFieldCell*, NSRect);
 extern void (*wkDrawBezeledTextArea)(NSRect, BOOL enabled);
index ce3085a1a780dcb7927c530f57fe6c2eb9c553cf..40e73ceec4590a5ec604269fc334f8791ddb605f 100644 (file)
@@ -1,3 +1,10 @@
+2007-09-11  Darin Adler  <darin@apple.com>
+
+        Rubber-stamped by Dave Harrison.
+
+        * WebCoreSupport/WebSystemInterface.m: (InitWebCoreSystemInterface):
+        Removed wkCreateURLPasteboardFlavorTypeName and wkCreateURLNPasteboardFlavorTypeName.
+
 2007-09-11  Darin Adler  <darin@apple.com>
 
         Reviewed by Mark Rowe.
index 34890a8c5df275f79a2149a590245ba652757e5b..43e8822c29306c2dc40a7b8df24a41aba149d768 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Apple Computer, Inc. All rights reserved.
+ * Copyright 2006, 2007 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -44,8 +44,6 @@ void InitWebCoreSystemInterface(void)
     INIT(ConvertCharToGlyphs);
     INIT(CreateCustomCFReadStream);
     INIT(CreateNSURLConnectionDelegateProxy);
-    INIT(CreateURLNPasteboardFlavorTypeName);
-    INIT(CreateURLPasteboardFlavorTypeName);
     INIT(DrawBezeledTextArea);
     INIT(DrawBezeledTextFieldCell);
     INIT(DrawFocusRing);