<!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>[173092] trunk/Source/WebKit2</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/173092">173092</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-08-28 16:58:20 -0700 (Thu, 28 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Occasional thread-safety-related crashes on the ServicesController queue
https://bugs.webkit.org/show_bug.cgi?id=136356
<rdar://problem/18045685>
Reviewed by Dan Bernstein.
* UIProcess/mac/ServicesController.mm:
(WebKit::hasCompatibleServicesForItems):
Added. Check directly with NSSharingService if we have any services for the given items.
We should eventually check Viewer and Editor services separately so the Web process can
be smarter about when it shows the overlay, but for now this maintains the existing behavior.
(WebKit::ServicesController::refreshExistingServices):
Make use of hasCompatibleServicesForItems instead of having NSSharingServicePicker construct NSMenus.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacServicesControllermm">trunk/Source/WebKit2/UIProcess/mac/ServicesController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (173091 => 173092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-08-28 22:20:22 UTC (rev 173091)
+++ trunk/Source/WebKit2/ChangeLog 2014-08-28 23:58:20 UTC (rev 173092)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2014-08-28 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ Occasional thread-safety-related crashes on the ServicesController queue
+ https://bugs.webkit.org/show_bug.cgi?id=136356
+ <rdar://problem/18045685>
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/mac/ServicesController.mm:
+ (WebKit::hasCompatibleServicesForItems):
+ Added. Check directly with NSSharingService if we have any services for the given items.
+ We should eventually check Viewer and Editor services separately so the Web process can
+ be smarter about when it shows the overlay, but for now this maintains the existing behavior.
+
+ (WebKit::ServicesController::refreshExistingServices):
+ Make use of hasCompatibleServicesForItems instead of having NSSharingServicePicker construct NSMenus.
+
+2014-08-28 Tim Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> WebKit2 doesn't support viewer services that accept image attachments
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=136349
</span><span class="cx"> <rdar://problem/18164606>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacServicesControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ServicesController.mm (173091 => 173092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ServicesController.mm 2014-08-28 22:20:22 UTC (rev 173091)
+++ trunk/Source/WebKit2/UIProcess/mac/ServicesController.mm 2014-08-28 23:58:20 UTC (rev 173092)
</span><span class="lines">@@ -36,19 +36,37 @@
</span><span class="cx"> #if __has_include(<AppKit/NSSharingService_Private.h>)
</span><span class="cx"> #import <AppKit/NSSharingService_Private.h>
</span><span class="cx"> #else
</span><del>-typedef enum {
</del><ins>+typedef NS_ENUM(NSInteger, NSSharingServicePickerStyle) {
</ins><span class="cx"> NSSharingServicePickerStyleMenu = 0,
</span><span class="cx"> NSSharingServicePickerStyleRollover = 1,
</span><span class="cx"> NSSharingServicePickerStyleTextSelection = 2,
</span><span class="cx"> NSSharingServicePickerStyleDataDetector = 3
</span><del>-} NSSharingServicePickerStyle;
</del><ins>+} NS_ENUM_AVAILABLE_MAC(10_10);
+
+typedef NS_ENUM(NSInteger, NSSharingServiceType) {
+ NSSharingServiceTypeShare = 0,
+ NSSharingServiceTypeViewer = 1,
+ NSSharingServiceTypeEditor = 2
+} NS_ENUM_AVAILABLE_MAC(10_10);
+
+typedef NS_OPTIONS(NSUInteger, NSSharingServiceMask) {
+ NSSharingServiceMaskShare = (1 << NSSharingServiceTypeShare),
+ NSSharingServiceMaskViewer = (1 << NSSharingServiceTypeViewer),
+ NSSharingServiceMaskEditor = (1 << NSSharingServiceTypeEditor),
+
+ NSSharingServiceMaskAllTypes = 0xFFFF
+} NS_ENUM_AVAILABLE_MAC(10_10);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>-@interface NSSharingServicePicker (Details)
</del><ins>+@interface NSSharingServicePicker (WKDetails)
</ins><span class="cx"> @property NSSharingServicePickerStyle style;
</span><span class="cx"> - (NSMenu *)menu;
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@interface NSSharingService (WKDetails)
++ (NSArray *)sharingServicesForItems:(NSArray *)items mask:(NSSharingServiceMask)maskForFiltering;
+@end
+
</ins><span class="cx"> #ifdef __LP64__
</span><span class="cx"> #if __has_include(<Foundation/NSExtension.h>)
</span><span class="cx"> #import <Foundation/NSExtension.h>
</span><span class="lines">@@ -57,7 +75,7 @@
</span><span class="cx"> @end
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-@interface NSExtension (Details)
</del><ins>+@interface NSExtension (WKDetails)
</ins><span class="cx"> + (id)beginMatchingExtensionsWithAttributes:(NSDictionary *)attributes completion:(void (^)(NSArray *matchingExtensions, NSError *error))handler;
</span><span class="cx"> @end
</span><span class="cx"> #endif // __LP64__
</span><span class="lines">@@ -92,6 +110,11 @@
</span><span class="cx"> #endif // __LP64__
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool hasCompatibleServicesForItems(NSArray *items)
+{
+ return [NSSharingService sharingServicesForItems:items mask:NSSharingServiceMaskViewer | NSSharingServiceMaskEditor].count;
+}
+
</ins><span class="cx"> void ServicesController::refreshExistingServices(bool refreshImmediately)
</span><span class="cx"> {
</span><span class="cx"> if (m_hasPendingRefresh)
</span><span class="lines">@@ -102,17 +125,11 @@
</span><span class="cx"> auto refreshTime = dispatch_time(DISPATCH_TIME_NOW, refreshImmediately ? 0 : (int64_t)(1 * NSEC_PER_SEC));
</span><span class="cx"> dispatch_after(refreshTime, m_refreshQueue, ^{
</span><span class="cx"> static NeverDestroyed<NSImage *> image([[NSImage alloc] init]);
</span><del>- RetainPtr<NSSharingServicePicker> picker = adoptNS([[NSSharingServicePicker alloc] initWithItems:@[ image ]]);
- [picker setStyle:NSSharingServicePickerStyleRollover];
</del><ins>+ bool hasImageServices = hasCompatibleServicesForItems(@[ image ]);
</ins><span class="cx">
</span><del>- bool hasImageServices = picker.get().menu;
-
</del><span class="cx"> static NeverDestroyed<NSAttributedString *> attributedString([[NSAttributedString alloc] initWithString:@"a"]);
</span><del>- picker = adoptNS([[NSSharingServicePicker alloc] initWithItems:@[ attributedString ]]);
- [picker setStyle:NSSharingServicePickerStyleTextSelection];
</del><ins>+ bool hasSelectionServices = hasCompatibleServicesForItems(@[ attributedString ]);
</ins><span class="cx">
</span><del>- bool hasSelectionServices = picker.get().menu;
-
</del><span class="cx"> static NSAttributedString *attributedStringWithRichContent;
</span><span class="cx"> if (!attributedStringWithRichContent) {
</span><span class="cx"> NSTextAttachment *attachment = [[NSTextAttachment alloc] init];
</span><span class="lines">@@ -123,10 +140,7 @@
</span><span class="cx"> attributedStringWithRichContent = [richString retain];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- picker = adoptNS([[NSSharingServicePicker alloc] initWithItems:@[ attributedStringWithRichContent ]]);
- [picker setStyle:NSSharingServicePickerStyleTextSelection];
-
- bool hasRichContentServices = picker.get().menu;
</del><ins>+ bool hasRichContentServices = hasCompatibleServicesForItems(@[ attributedStringWithRichContent ]);
</ins><span class="cx">
</span><span class="cx"> dispatch_async(dispatch_get_main_queue(), ^{
</span><span class="cx"> bool availableServicesChanged = (hasImageServices != m_hasImageServices) || (hasSelectionServices != m_hasSelectionServices) || (hasRichContentServices != m_hasRichContentServices);
</span></span></pre>
</div>
</div>
</body>
</html>