<!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>[199630] 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/199630">199630</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2016-04-16 17:10:45 -0700 (Sat, 16 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support for NSSharingService to MiniBrowser, for no great reasons
https://bugs.webkit.org/show_bug.cgi?id=156658
Reviewed by Darin Adler.
* MiniBrowser/mac/BrowserWindow.xib:
* MiniBrowser/mac/BrowserWindowController.h:
Add the share button.
* MiniBrowser/mac/BrowserWindowController.m:
(-[BrowserWindowController windowDidLoad]):
Set the share button to fire it's actions on mouse down, as it is supposed to act like a menu.
(-[BrowserWindowController share:]):
Show the picker when the button is pressed.
(-[BrowserWindowController mainContentView]):
Add a new override to get the main content view of derived classes (either a WKWebView or the WebView).
(-[BrowserWindowController sharingServicePicker:sharingServicesForItems:proposedSharingServices:]):
(-[BrowserWindowController sharingServicePicker:delegateForSharingService:]):
(-[BrowserWindowController sharingServicePicker:didChooseSharingService:]):
(-[BrowserWindowController sharingService:sourceFrameOnScreenForShareItem:]):
(-[BrowserWindowController sharingService:transitionImageForShareItem:contentRect:]):
(-[BrowserWindowController sharingService:sourceWindowForShareItems:sharingContentScope:]):
Add delegate methods.
* MiniBrowser/mac/WK1BrowserWindowController.m:
(-[WK1BrowserWindowController mainContentView]):
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController mainContentView]):
Implement to return the web view.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsermacBrowserWindowxib">trunk/Tools/MiniBrowser/mac/BrowserWindow.xib</a></li>
<li><a href="#trunkToolsMiniBrowsermacBrowserWindowControllerh">trunk/Tools/MiniBrowser/mac/BrowserWindowController.h</a></li>
<li><a href="#trunkToolsMiniBrowsermacBrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/BrowserWindowController.m</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK1BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK2BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (199629 => 199630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-04-16 22:52:48 UTC (rev 199629)
+++ trunk/Tools/ChangeLog 2016-04-17 00:10:45 UTC (rev 199630)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2016-04-15 Sam Weinig <sam@webkit.org>
+
+ Add support for NSSharingService to MiniBrowser, for no great reasons
+ https://bugs.webkit.org/show_bug.cgi?id=156658
+
+ Reviewed by Darin Adler.
+
+ * MiniBrowser/mac/BrowserWindow.xib:
+ * MiniBrowser/mac/BrowserWindowController.h:
+ Add the share button.
+
+ * MiniBrowser/mac/BrowserWindowController.m:
+ (-[BrowserWindowController windowDidLoad]):
+ Set the share button to fire it's actions on mouse down, as it is supposed to act like a menu.
+
+ (-[BrowserWindowController share:]):
+ Show the picker when the button is pressed.
+ (-[BrowserWindowController mainContentView]):
+ Add a new override to get the main content view of derived classes (either a WKWebView or the WebView).
+
+ (-[BrowserWindowController sharingServicePicker:sharingServicesForItems:proposedSharingServices:]):
+ (-[BrowserWindowController sharingServicePicker:delegateForSharingService:]):
+ (-[BrowserWindowController sharingServicePicker:didChooseSharingService:]):
+ (-[BrowserWindowController sharingService:sourceFrameOnScreenForShareItem:]):
+ (-[BrowserWindowController sharingService:transitionImageForShareItem:contentRect:]):
+ (-[BrowserWindowController sharingService:sourceWindowForShareItems:sharingContentScope:]):
+ Add delegate methods.
+
+ * MiniBrowser/mac/WK1BrowserWindowController.m:
+ (-[WK1BrowserWindowController mainContentView]):
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController mainContentView]):
+ Implement to return the web view.
+
</ins><span class="cx"> 2016-04-16 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Build fix.
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacBrowserWindowxib"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/BrowserWindow.xib (199629 => 199630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/BrowserWindow.xib 2016-04-16 22:52:48 UTC (rev 199629)
+++ trunk/Tools/MiniBrowser/mac/BrowserWindow.xib 2016-04-17 00:10:45 UTC (rev 199630)
</span><span class="lines">@@ -1,17 +1,21 @@
</span><del>-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="8068.4" systemVersion="14D136" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
</del><ins>+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11085" systemVersion="16A167" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
</ins><span class="cx"> <dependencies>
</span><del>- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="8068.4"/>
</del><ins>+ <deployment identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11085"/>
</ins><span class="cx"> </dependencies>
</span><span class="cx"> <objects>
</span><span class="cx"> <customObject id="-2" userLabel="File's Owner" customClass="BrowserWindowController">
</span><span class="cx"> <connections>
</span><ins>+ <outlet property="Share" destination="dJx-dw-gcC" id="j0J-ps-exa"/>
</ins><span class="cx"> <outlet property="backButton" destination="40" id="46"/>
</span><span class="cx"> <outlet property="containerView" destination="9" id="37"/>
</span><span class="cx"> <outlet property="findPanelWindow" destination="70" id="77"/>
</span><span class="cx"> <outlet property="forwardButton" destination="42" id="47"/>
</span><span class="cx"> <outlet property="progressIndicator" destination="21" id="33"/>
</span><span class="cx"> <outlet property="reloadButton" destination="23" id="34"/>
</span><ins>+ <outlet property="share" destination="1hB-AH-eUl" id="si4-8e-DsM"/>
+ <outlet property="shareButton" destination="S1v-UD-QhI" id="t4L-Uq-paq"/>
</ins><span class="cx"> <outlet property="toggleUseShrinkToFitButton" destination="82" id="9w7-AB-Ye3"/>
</span><span class="cx"> <outlet property="toolbar" destination="48" id="67"/>
</span><span class="cx"> <outlet property="urlText" destination="10" id="32"/>
</span><span class="lines">@@ -39,10 +43,10 @@
</span><span class="cx"> <allowedToolbarItems>
</span><span class="cx"> <toolbarItem implicitItemIdentifier="73DE9F4B-73E2-4036-A134-2D9E029DA980" label="Go Back" paletteLabel="Go Back" image="NSGoLeftTemplate" id="56" customClass="MBToolbarItem">
</span><span class="cx"> <nil key="toolTip"/>
</span><del>- <size key="minSize" width="32" height="25"/>
</del><ins>+ <size key="minSize" width="32" height="27"/>
</ins><span class="cx"> <size key="maxSize" width="32" height="25"/>
</span><span class="cx"> <button key="view" verticalHuggingPriority="750" id="40">
</span><del>- <rect key="frame" x="11" y="14" width="32" height="25"/>
</del><ins>+ <rect key="frame" x="10" y="14" width="32" height="25"/>
</ins><span class="cx"> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
</span><span class="cx"> <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="NSGoLeftTemplate" imagePosition="overlaps" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="41">
</span><span class="cx"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
</span><span class="lines">@@ -55,10 +59,10 @@
</span><span class="cx"> </toolbarItem>
</span><span class="cx"> <toolbarItem implicitItemIdentifier="E1A9D32A-59E3-467B-9ABA-A95780416E69" label="Go Forward" paletteLabel="Go Forward" image="NSGoRightTemplate" id="57" customClass="MBToolbarItem">
</span><span class="cx"> <nil key="toolTip"/>
</span><del>- <size key="minSize" width="32" height="25"/>
- <size key="maxSize" width="32" height="25"/>
</del><ins>+ <size key="minSize" width="32" height="27"/>
+ <size key="maxSize" width="32" height="27"/>
</ins><span class="cx"> <button key="view" verticalHuggingPriority="750" id="42">
</span><del>- <rect key="frame" x="19" y="14" width="32" height="25"/>
</del><ins>+ <rect key="frame" x="18" y="14" width="32" height="25"/>
</ins><span class="cx"> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
</span><span class="cx"> <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="NSGoRightTemplate" imagePosition="overlaps" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="43">
</span><span class="cx"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
</span><span class="lines">@@ -71,8 +75,8 @@
</span><span class="cx"> </toolbarItem>
</span><span class="cx"> <toolbarItem implicitItemIdentifier="88C16109-D40F-4682-BCE4-CBEE2EDE32D2" label="Refresh" paletteLabel="Refresh" image="NSRefreshTemplate" id="58" customClass="MBToolbarItem">
</span><span class="cx"> <nil key="toolTip"/>
</span><del>- <size key="minSize" width="29" height="25"/>
- <size key="maxSize" width="29" height="25"/>
</del><ins>+ <size key="minSize" width="29" height="27"/>
+ <size key="maxSize" width="29" height="27"/>
</ins><span class="cx"> <button key="view" verticalHuggingPriority="750" id="23">
</span><span class="cx"> <rect key="frame" x="10" y="14" width="29" height="25"/>
</span><span class="cx"> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
</span><span class="lines">@@ -87,10 +91,10 @@
</span><span class="cx"> </toolbarItem>
</span><span class="cx"> <toolbarItem implicitItemIdentifier="76DCF2B0-1DDE-47D2-9212-705E6E310CCE" label="Use Shrink To Fit" paletteLabel="Use Shrink To Fit" image="NSEnterFullScreenTemplate" id="81" customClass="MBToolbarItem">
</span><span class="cx"> <nil key="toolTip"/>
</span><del>- <size key="minSize" width="29" height="25"/>
- <size key="maxSize" width="29" height="25"/>
</del><ins>+ <size key="minSize" width="29" height="27"/>
+ <size key="maxSize" width="29" height="27"/>
</ins><span class="cx"> <button key="view" verticalHuggingPriority="750" id="82">
</span><del>- <rect key="frame" x="19" y="14" width="29" height="25"/>
</del><ins>+ <rect key="frame" x="34" y="14" width="29" height="25"/>
</ins><span class="cx"> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
</span><span class="cx"> <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="NSEnterFullScreenTemplate" imagePosition="overlaps" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="83">
</span><span class="cx"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
</span><span class="lines">@@ -101,14 +105,21 @@
</span><span class="cx"> </connections>
</span><span class="cx"> </button>
</span><span class="cx"> </toolbarItem>
</span><del>- <toolbarItem implicitItemIdentifier="6BDC61B7-F1A8-425A-A212-9CAC59C56385" label="Progress" paletteLabel="Progress" tag="-1" id="60">
</del><ins>+ <toolbarItem implicitItemIdentifier="F1738B7F-895C-48F7-955D-0915E150BE1B" label="Share" paletteLabel="Share" image="NSShareTemplate" id="dJx-dw-gcC" customClass="MBToolbarItem">
</ins><span class="cx"> <nil key="toolTip"/>
</span><del>- <size key="minSize" width="16" height="16"/>
- <size key="maxSize" width="16" height="16"/>
- <progressIndicator key="view" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="1" displayedWhenStopped="NO" bezeled="NO" controlSize="small" style="spinning" id="21">
- <rect key="frame" x="19" y="14" width="16" height="16"/>
- <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
- </progressIndicator>
</del><ins>+ <size key="minSize" width="29" height="27"/>
+ <size key="maxSize" width="29" height="27"/>
+ <button key="view" verticalHuggingPriority="750" id="1hB-AH-eUl">
+ <rect key="frame" x="5" y="14" width="29" height="25"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="NSShareTemplate" imagePosition="overlaps" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="S1v-UD-QhI">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ <connections>
+ <action selector="share:" target="-2" id="5e3-hg-bKN"/>
+ </connections>
+ </buttonCell>
+ </button>
</ins><span class="cx"> </toolbarItem>
</span><span class="cx"> <toolbarItem implicitItemIdentifier="255D29F2-C9AA-4B4B-BB43-B38FCD6A0BBB" label="Location" paletteLabel="Location" id="59">
</span><span class="cx"> <nil key="toolTip"/>
</span><span class="lines">@@ -127,6 +138,15 @@
</span><span class="cx"> </connections>
</span><span class="cx"> </textField>
</span><span class="cx"> </toolbarItem>
</span><ins>+ <toolbarItem implicitItemIdentifier="86912BAA-B8D0-400F-BFEE-71FC166986E6" label="Progress" paletteLabel="Progress" tag="-1" id="60">
+ <nil key="toolTip"/>
+ <size key="minSize" width="16" height="16"/>
+ <size key="maxSize" width="16" height="16"/>
+ <progressIndicator key="view" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="1" displayedWhenStopped="NO" bezeled="NO" controlSize="small" style="spinning" id="21">
+ <rect key="frame" x="19" y="14" width="16" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ </progressIndicator>
+ </toolbarItem>
</ins><span class="cx"> </allowedToolbarItems>
</span><span class="cx"> <defaultToolbarItems>
</span><span class="cx"> <toolbarItem reference="56"/>
</span><span class="lines">@@ -134,6 +154,7 @@
</span><span class="cx"> <toolbarItem reference="58"/>
</span><span class="cx"> <toolbarItem reference="59"/>
</span><span class="cx"> <toolbarItem reference="60"/>
</span><ins>+ <toolbarItem reference="dJx-dw-gcC"/>
</ins><span class="cx"> </defaultToolbarItems>
</span><span class="cx"> </toolbar>
</span><span class="cx"> <connections>
</span><span class="lines">@@ -170,5 +191,6 @@
</span><span class="cx"> <image name="NSGoLeftTemplate" width="9" height="12"/>
</span><span class="cx"> <image name="NSGoRightTemplate" width="9" height="12"/>
</span><span class="cx"> <image name="NSRefreshTemplate" width="11" height="15"/>
</span><ins>+ <image name="NSShareTemplate" width="11" height="16"/>
</ins><span class="cx"> </resources>
</span><span class="cx"> </document>
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacBrowserWindowControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/BrowserWindowController.h (199629 => 199630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/BrowserWindowController.h 2016-04-16 22:52:48 UTC (rev 199629)
+++ trunk/Tools/MiniBrowser/mac/BrowserWindowController.h 2016-04-17 00:10:45 UTC (rev 199630)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> IBOutlet NSButton *reloadButton;
</span><span class="cx"> IBOutlet NSButton *backButton;
</span><span class="cx"> IBOutlet NSButton *forwardButton;
</span><ins>+ IBOutlet NSButton *share;
</ins><span class="cx"> IBOutlet NSToolbar *toolbar;
</span><span class="cx"> IBOutlet NSTextField *urlText;
</span><span class="cx"> IBOutlet NSView *containerView;
</span><span class="lines">@@ -48,6 +49,7 @@
</span><span class="cx"> - (IBAction)openLocation:(id)sender;
</span><span class="cx">
</span><span class="cx"> - (IBAction)fetch:(id)sender;
</span><ins>+- (IBAction)share:(id)sender;
</ins><span class="cx"> - (IBAction)reload:(id)sender;
</span><span class="cx"> - (IBAction)forceRepaint:(id)sender;
</span><span class="cx"> - (IBAction)goBack:(id)sender;
</span><span class="lines">@@ -75,6 +77,7 @@
</span><span class="cx"> - (void)didChangeSettings;
</span><span class="cx">
</span><span class="cx"> - (NSURL *)currentURL;
</span><ins>+- (NSView *)mainContentView;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacBrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/BrowserWindowController.m (199629 => 199630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/BrowserWindowController.m 2016-04-16 22:52:48 UTC (rev 199629)
+++ trunk/Tools/MiniBrowser/mac/BrowserWindowController.m 2016-04-17 00:10:45 UTC (rev 199630)
</span><span class="lines">@@ -25,8 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #import "BrowserWindowController.h"
</span><span class="cx">
</span><del>-@interface BrowserWindowController ()
-
</del><ins>+@interface BrowserWindowController () <NSSharingServicePickerDelegate, NSSharingServiceDelegate>
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation BrowserWindowController
</span><span class="lines">@@ -41,6 +40,12 @@
</span><span class="cx"> {
</span><span class="cx"> self.window.styleMask |= NSWindowStyleMaskFullSizeContentView;
</span><span class="cx">
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+ [share sendActionOn:NSEventMaskLeftMouseDown];
+#else
+ [share sendActionOn:NSLeftMouseDownMask];
+#endif
+
</ins><span class="cx"> [super windowDidLoad];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -68,6 +73,13 @@
</span><span class="cx"> return [@"http://" stringByAppendingString:address];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (IBAction)share:(id)sender
+{
+ NSSharingServicePicker *picker = [[NSSharingServicePicker alloc] initWithItems:@[ self.currentURL ]];
+ picker.delegate = self;
+ [picker showRelativeToRect:CGRectZero ofView:sender preferredEdge:NSRectEdgeMinY];
+}
+
</ins><span class="cx"> - (IBAction)fetch:(id)sender
</span><span class="cx"> {
</span><span class="cx"> [self doesNotRecognizeSelector:_cmd];
</span><span class="lines">@@ -172,4 +184,65 @@
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSView *)mainContentView
+{
+ [self doesNotRecognizeSelector:_cmd];
+ return nil;
+}
+
+#pragma mark -
+#pragma mark NSSharingServicePickerDelegate
+
+- (NSArray<NSSharingService *> *)sharingServicePicker:(NSSharingServicePicker *)sharingServicePicker sharingServicesForItems:(NSArray *)items proposedSharingServices:(NSArray<NSSharingService *> *)proposedServices
+{
+ return proposedServices;
+}
+
+- (nullable id <NSSharingServiceDelegate>)sharingServicePicker:(NSSharingServicePicker *)sharingServicePicker delegateForSharingService:(NSSharingService *)sharingService
+{
+ return self;
+}
+
+- (void)sharingServicePicker:(NSSharingServicePicker *)sharingServicePicker didChooseSharingService:(nullable NSSharingService *)service
+{
+}
+
+#pragma mark -
+#pragma mark NSSharingServiceDelegate
+
+- (NSRect)sharingService:(NSSharingService *)sharingService sourceFrameOnScreenForShareItem:(id)item
+{
+ NSRect rect = [self.window convertRectToScreen:self.mainContentView.bounds];
+
+ return rect;
+}
+
+static CGRect coreGraphicsScreenRectForAppKitScreenRect(NSRect rect)
+{
+ NSScreen *firstScreen = [NSScreen screens][0];
+ return CGRectMake(NSMinX(rect), NSHeight(firstScreen.frame) - NSMinY(rect) - NSHeight(rect), NSWidth(rect), NSHeight(rect));
+}
+
+- (NSImage *)sharingService:(NSSharingService *)sharingService transitionImageForShareItem:(id)item contentRect:(NSRect *)contentRect
+{
+ NSRect contentFrame = [self.window convertRectToScreen:self.mainContentView.bounds];
+
+ CGRect frame = coreGraphicsScreenRectForAppKitScreenRect(NSRectToCGRect(contentFrame));
+ CGImageRef imageRef = CGWindowListCreateImage(frame, kCGWindowListOptionIncludingWindow, (CGWindowID)[self.window windowNumber], kCGWindowImageBoundsIgnoreFraming);
+
+ if (!imageRef)
+ return nil;
+
+ NSImage *image = [[NSImage alloc] initWithCGImage:imageRef size:NSZeroSize];
+ CGImageRelease(imageRef);
+
+ return image;
+}
+
+- (nullable NSWindow *)sharingService:(NSSharingService *)sharingService sourceWindowForShareItems:(NSArray *)items sharingContentScope:(NSSharingContentScope *)sharingContentScope
+{
+ *sharingContentScope = NSSharingContentScopeFull;
+ return self.window;
+}
+
</ins><span class="cx"> @end
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK1BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (199629 => 199630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2016-04-16 22:52:48 UTC (rev 199629)
+++ trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2016-04-17 00:10:45 UTC (rev 199630)
</span><span class="lines">@@ -250,6 +250,11 @@
</span><span class="cx"> return _webView.mainFrame.dataSource.request.URL;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSView *)mainContentView
+{
+ return _webView;
+}
+
</ins><span class="cx"> - (void)didChangeSettings
</span><span class="cx"> {
</span><span class="cx"> SettingsController *settings = [SettingsController shared];
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK2BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (199629 => 199630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2016-04-16 22:52:48 UTC (rev 199629)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2016-04-17 00:10:45 UTC (rev 199630)
</span><span class="lines">@@ -260,6 +260,11 @@
</span><span class="cx"> return _webView.URL;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSView *)mainContentView
+{
+ return _webView;
+}
+
</ins><span class="cx"> - (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)item
</span><span class="cx"> {
</span><span class="cx"> SEL action = item.action;
</span></span></pre>
</div>
</div>
</body>
</html>