<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[213529] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/213529">213529</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2017-03-07 11:27:51 -0800 (Tue, 07 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rewrite the DRT Pasteboard implementation to use UTIs and WTF types
https://bugs.webkit.org/show_bug.cgi?id=169289
Reviewed by Tim Horton.
* DumpRenderTree/mac/DumpRenderTreePasteboard.mm:
(-[LocalPasteboard initWithName:]):
(-[LocalPasteboard name]):
(-[LocalPasteboard declareTypes:owner:]):
(isUTI):
(toUTI):
(-[LocalPasteboard addTypes:owner:]):
(-[LocalPasteboard changeCount]):
(-[LocalPasteboard types]):
(-[LocalPasteboard availableTypeFromArray:]):
(-[LocalPasteboard setData:forType:]):
(-[LocalPasteboard dataForType:]):
(-[LocalPasteboard writeObjects:]):
(-[LocalPasteboard dealloc]): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreePasteboardmm">trunk/Tools/DumpRenderTree/mac/DumpRenderTreePasteboard.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (213528 => 213529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-03-07 19:26:21 UTC (rev 213528)
+++ trunk/Tools/ChangeLog 2017-03-07 19:27:51 UTC (rev 213529)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2017-03-07 Anders Carlsson <andersca@apple.com>
+
+ Rewrite the DRT Pasteboard implementation to use UTIs and WTF types
+ https://bugs.webkit.org/show_bug.cgi?id=169289
+
+ Reviewed by Tim Horton.
+
+ * DumpRenderTree/mac/DumpRenderTreePasteboard.mm:
+ (-[LocalPasteboard initWithName:]):
+ (-[LocalPasteboard name]):
+ (-[LocalPasteboard declareTypes:owner:]):
+ (isUTI):
+ (toUTI):
+ (-[LocalPasteboard addTypes:owner:]):
+ (-[LocalPasteboard changeCount]):
+ (-[LocalPasteboard types]):
+ (-[LocalPasteboard availableTypeFromArray:]):
+ (-[LocalPasteboard setData:forType:]):
+ (-[LocalPasteboard dataForType:]):
+ (-[LocalPasteboard writeObjects:]):
+ (-[LocalPasteboard dealloc]): Deleted.
+
</ins><span class="cx"> 2017-03-07 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Add David Jonathan Ross to contributors.json
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreePasteboardmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTreePasteboard.mm (213528 => 213529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTreePasteboard.mm 2017-03-07 19:26:21 UTC (rev 213528)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTreePasteboard.mm 2017-03-07 19:27:51 UTC (rev 213529)
</span><span class="lines">@@ -37,14 +37,16 @@
</span><span class="cx">
</span><span class="cx"> #import <WebKit/WebTypesInternal.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><ins>+#import <wtf/HashMap.h>
+#import <wtf/ListHashSet.h>
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> @interface LocalPasteboard : NSPasteboard {
</span><del>- NSMutableArray *typesArray;
- NSMutableSet *typesSet;
- NSMutableDictionary *dataByType;
- NSInteger changeCount;
- NSString *pasteboardName;
</del><ins>+ RetainPtr<NSString> _pasteboardName;
+ NSInteger _changeCount;
+
+ ListHashSet<RetainPtr<NSString>, WTF::RetainPtrObjectHash<NSString>> _types;
+ HashMap<RetainPtr<NSString>, RetainPtr<NSData>, WTF::RetainPtrObjectHash<NSString>, WTF::RetainPtrObjectHashTraits<NSString>> _data;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> -(id)initWithName:(NSString *)name;
</span><span class="lines">@@ -98,25 +100,15 @@
</span><span class="cx"> self = [super init];
</span><span class="cx"> if (!self)
</span><span class="cx"> return nil;
</span><del>- typesArray = [[NSMutableArray alloc] init];
- typesSet = [[NSMutableSet alloc] init];
- dataByType = [[NSMutableDictionary alloc] init];
- pasteboardName = [name copy];
</del><ins>+
+ _pasteboardName = adoptNS([name copy]);
+
</ins><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)dealloc
-{
- [typesArray release];
- [typesSet release];
- [dataByType release];
- [pasteboardName release];
- [super dealloc];
-}
-
</del><span class="cx"> - (NSString *)name
</span><span class="cx"> {
</span><del>- return pasteboardName;
</del><ins>+ return _pasteboardName.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)releaseGlobally
</span><span class="lines">@@ -125,68 +117,84 @@
</span><span class="cx">
</span><span class="cx"> - (NSInteger)declareTypes:(NSArray *)newTypes owner:(id)newOwner
</span><span class="cx"> {
</span><del>- [typesArray removeAllObjects];
- [typesSet removeAllObjects];
- [dataByType removeAllObjects];
</del><ins>+ _types.clear();
+ _data.clear();
+
</ins><span class="cx"> return [self addTypes:newTypes owner:newOwner];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool isUTI(NSString *type)
+{
+ return UTTypeIsDynamic((__bridge CFStringRef)type) || UTTypeIsDeclared((__bridge CFStringRef)type);
+}
+
+static RetainPtr<NSString> toUTI(NSString *type)
+{
+ if (isUTI(type)) {
+ // This is already an UTI.
+ return adoptNS([type copy]);
+ }
+
+ return adoptNS((__bridge NSString *)UTTypeCreatePreferredIdentifierForTag(kUTTagClassNSPboardType, (__bridge CFStringRef)type, nullptr));
+}
+
</ins><span class="cx"> - (NSInteger)addTypes:(NSArray *)newTypes owner:(id)newOwner
</span><span class="cx"> {
</span><del>- unsigned count = [newTypes count];
- unsigned i;
- for (i = 0; i < count; ++i) {
- NSString *type = [newTypes objectAtIndex:i];
- NSString *setType = [typesSet member:type];
- if (!setType) {
- setType = [type copy];
- [typesArray addObject:setType];
- [typesSet addObject:setType];
- [setType release];
- }
</del><ins>+ for (NSString *type in newTypes) {
+ _types.add(toUTI(type));
+
</ins><span class="cx"> if (newOwner && [newOwner respondsToSelector:@selector(pasteboard:provideDataForType:)])
</span><del>- [newOwner pasteboard:self provideDataForType:setType];
</del><ins>+ [newOwner pasteboard:self provideDataForType:type];
</ins><span class="cx"> }
</span><del>- return ++changeCount;
</del><ins>+
+ return ++_changeCount;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSInteger)changeCount
</span><span class="cx"> {
</span><del>- return changeCount;
</del><ins>+ return _changeCount;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSArray *)types
</span><span class="cx"> {
</span><del>- return typesArray;
</del><ins>+ auto types = adoptNS([[NSMutableArray alloc] init]);
+
+ for (const auto& type : _types) {
+ [types addObject:type.get()];
+
+ // Include the pasteboard type as well.
+ if (auto pasteboardType = adoptNS((__bridge NSString *)UTTypeCopyPreferredTagWithClass((CFStringRef)type.get(), kUTTagClassNSPboardType)))
+ [types addObject:pasteboardType.get()];
+ }
+
+ return types.autorelease();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSString *)availableTypeFromArray:(NSArray *)types
</span><span class="cx"> {
</span><del>- unsigned count = [types count];
- unsigned i;
- for (i = 0; i < count; ++i) {
- NSString *type = [types objectAtIndex:i];
- NSString *setType = [typesSet member:type];
- if (setType)
- return setType;
</del><ins>+ for (NSString *type in types) {
+ if (_types.contains(type))
+ return type;
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)setData:(NSData *)data forType:(NSString *)dataType
</span><span class="cx"> {
</span><del>- if (data == nil)
- data = [NSData data];
- if (![typesSet containsObject:dataType])
</del><ins>+ auto uti = toUTI(dataType);
+
+ if (!_types.contains(uti))
</ins><span class="cx"> return NO;
</span><del>- [dataByType setObject:data forKey:dataType];
- ++changeCount;
</del><ins>+
+ _data.set(WTFMove(uti), data ? data : [NSData data]);
+ ++_changeCount;
</ins><span class="cx"> return YES;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSData *)dataForType:(NSString *)dataType
</span><span class="cx"> {
</span><del>- return [dataByType objectForKey:dataType];
</del><ins>+ return _data.get(toUTI(dataType)).get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)setPropertyList:(id)propertyList forType:(NSString *)dataType
</span><span class="lines">@@ -219,18 +227,13 @@
</span><span class="cx"> {
</span><span class="cx"> for (id <NSPasteboardWriting> object in objects) {
</span><span class="cx"> for (NSString *type in [object writableTypesForPasteboard:self]) {
</span><del>- auto pasteboardType = ^{
- if (UTTypeIsDynamic((__bridge CFStringRef)type))
- return adoptNS((__bridge NSString *)UTTypeCopyPreferredTagWithClass((__bridge CFStringRef)type, kUTTagClassNSPboardType));
</del><ins>+ ASSERT(UTTypeIsDeclared((__bridge CFStringRef)type) || UTTypeIsDynamic((__bridge CFStringRef)type));
</ins><span class="cx">
</span><del>- return retainPtr(type);
- }();
</del><ins>+ [self addTypes:@[ type ] owner:self];
</ins><span class="cx">
</span><del>- [self addTypes:@[ pasteboardType.get() ] owner:self];
-
</del><span class="cx"> id propertyList = [object pasteboardPropertyListForType:type];
</span><span class="cx"> if ([propertyList isKindOfClass:NSData.class])
</span><del>- [self setData:propertyList forType:pasteboardType.get()];
</del><ins>+ [self setData:propertyList forType:type];
</ins><span class="cx"> else
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>