<!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>[175310] branches/safari-600.3-branch</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/175310">175310</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-10-29 00:18:15 -0700 (Wed, 29 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/172542">r172542</a>. rdar://problem/18757166</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebCoreChangeLog">branches/safari-600.3-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebCorerenderingRenderThemeMacmm">branches/safari-600.3-branch/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
<li><a href="#branchessafari6003branchSourceWebKitmacChangeLog">branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebKitmacMiscWebSharingServicePickerControllermm">branches/safari-600.3-branch/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2ChangeLog">branches/safari-600.3-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2PlatformIPCmacImportanceAssertionh">branches/safari-600.3-branch/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2UIProcessmacWebContextMenuProxyMacmm">branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm</a></li>
<li><a href="#branchessafari6003branchToolsChangeLog">branches/safari-600.3-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari6003branchToolsDumpRenderTreemacTextInputControllerm">branches/safari-600.3-branch/Tools/DumpRenderTree/mac/TextInputController.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6003branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/ChangeLog (175309 => 175310)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-10-29 06:33:42 UTC (rev 175309)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-10-29 07:18:15 UTC (rev 175310)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-10-29 Lucas Forschler <lforschler@apple.com>
+
+ Merge r172542
+
+ 2014-08-13 Mark Rowe <mrowe@apple.com>
+
+ <https://webkit.org/b/135911> WebKit should build on Yosemite with the public SDK.
+
+ Reviewed by Darin Adler.
+
+ * rendering/RenderThemeMac.mm: Fix the forward-declaration of NSServicesRolloverButtonCell.
+
</ins><span class="cx"> 2014-10-28 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r174791. <rdar://problem/18753175>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/rendering/RenderThemeMac.mm (175309 => 175310)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/rendering/RenderThemeMac.mm 2014-10-29 06:33:42 UTC (rev 175309)
+++ branches/safari-600.3-branch/Source/WebCore/rendering/RenderThemeMac.mm 2014-10-29 07:18:15 UTC (rev 175310)
</span><span class="lines">@@ -89,22 +89,26 @@
</span><span class="cx"> #define APPKIT_PRIVATE_CLASS
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if __has_include(<AppKit/NSSharingService_Private.h>)
+#import <AppKit/NSSharingService_Private.h>
+#else
+typedef enum {
+ NSSharingServicePickerStyleRollover = 1
+} NSSharingServicePickerStyle;
+#endif
+
</ins><span class="cx"> #if __has_include(<AppKit/NSServicesRolloverButtonCell.h>)
</span><span class="cx"> #import <AppKit/NSServicesRolloverButtonCell.h>
</span><ins>+#else
+@interface NSServicesRolloverButtonCell : NSButtonCell
+@end
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @interface NSServicesRolloverButtonCell (Details)
</span><span class="cx"> + (NSServicesRolloverButtonCell *)serviceRolloverButtonCellForStyle:(NSSharingServicePickerStyle)style;
</span><ins>+- (NSRect)rectForBounds:(NSRect)bounds preferredEdge:(NSRectEdge)preferredEdge;
</ins><span class="cx"> @end
</span><span class="cx">
</span><del>-#if __has_include(<AppKit/NSSharingService_Private.h>)
-#import <AppKit/NSSharingService_Private.h>
-#else
-typedef enum {
- NSSharingServicePickerStyleRollover = 1
-} NSSharingServicePickerStyle;
-#endif
-
</del><span class="cx"> #endif // ENABLE(SERVICE_CONTROLS)
</span><span class="cx">
</span><span class="cx"> // The methods in this file are specific to the Mac OS X platform.
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog (175309 => 175310)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-10-29 06:33:42 UTC (rev 175309)
+++ branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-10-29 07:18:15 UTC (rev 175310)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-10-29 Lucas Forschler <lforschler@apple.com>
+
+ Merge r172542
+
+ 2014-08-13 Mark Rowe <mrowe@apple.com>
+
+ <https://webkit.org/b/135911> WebKit should build on Yosemite with the public SDK.
+
+ Reviewed by Darin Adler.
+
+ * Misc/WebSharingServicePickerController.mm: Forward-declare some details related to NSSharingServicePicker.
+
</ins><span class="cx"> 2014-10-28 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r175183
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKitmacMiscWebSharingServicePickerControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm (175309 => 175310)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm 2014-10-29 06:33:42 UTC (rev 175309)
+++ branches/safari-600.3-branch/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm 2014-10-29 07:18:15 UTC (rev 175310)
</span><span class="lines">@@ -39,12 +39,17 @@
</span><span class="cx"> #import <WebCore/ContextMenuController.h>
</span><span class="cx"> #import <WebCore/Page.h>
</span><span class="cx">
</span><ins>+#endif
+
</ins><span class="cx"> @interface NSSharingServicePicker (Private)
</span><span class="cx"> @property NSSharingServicePickerStyle style;
</span><span class="cx"> - (NSMenu *)menu;
</span><span class="cx"> @end
</span><del>-#endif
</del><span class="cx">
</span><ins>+@interface NSSharingService (Private)
+@property (readonly) NSSharingServiceType type;
+@end
+
</ins><span class="cx"> #if __has_include(<AppKit/NSItemProvider.h>)
</span><span class="cx"> #import <AppKit/NSItemProvider.h>
</span><span class="cx"> #else
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (175309 => 175310)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-29 06:33:42 UTC (rev 175309)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-29 07:18:15 UTC (rev 175310)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-10-29 Lucas Forschler <lforschler@apple.com>
+
+ Merge r172542
+
+ 2014-08-13 Mark Rowe <mrowe@apple.com>
+
+ <https://webkit.org/b/135911> WebKit should build on Yosemite with the public SDK.
+
+ Reviewed by Darin Adler.
+
+ * Platform/IPC/mac/ImportanceAssertion.h: Forward-declare the new assertion functions we use.
+ * UIProcess/mac/WebContextMenuProxyMac.mm: Forward-declare some details related to NSSharingServicePicker.
+
</ins><span class="cx"> 2014-10-28 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r174791. <rdar://problem/18753175>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2PlatformIPCmacImportanceAssertionh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h (175309 => 175310)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h 2014-10-29 06:33:42 UTC (rev 175309)
+++ branches/safari-600.3-branch/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h 2014-10-29 07:18:15 UTC (rev 175310)
</span><span class="lines">@@ -32,8 +32,13 @@
</span><span class="cx"> #include <libproc_internal.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+extern "C" int proc_denap_assertion_begin_with_msg(mach_msg_header_t*, uint64_t *);
+extern "C" int proc_denap_assertion_complete(uint64_t);
+#else
</ins><span class="cx"> extern "C" int proc_importance_assertion_begin_with_msg(mach_msg_header_t*, mach_msg_trailer_t*, uint64_t*);
</span><span class="cx"> extern "C" int proc_importance_assertion_complete(uint64_t assertion_handle);
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessmacWebContextMenuProxyMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (175309 => 175310)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2014-10-29 06:33:42 UTC (rev 175309)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2014-10-29 07:18:15 UTC (rev 175310)
</span><span class="lines">@@ -54,6 +54,12 @@
</span><span class="cx"> NSSharingServicePickerStyleRollover = 1,
</span><span class="cx"> NSSharingServicePickerStyleTextSelection = 2
</span><span class="cx"> } NSSharingServicePickerStyle;
</span><ins>+
+typedef enum {
+ NSSharingServiceTypeEditor = 2
+} NSSharingServiceType;
+
+typedef NSUInteger NSSharingServiceMask;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @interface NSSharingServicePicker (Details)
</span><span class="lines">@@ -61,6 +67,10 @@
</span><span class="cx"> - (NSMenu *)menu;
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@interface NSSharingService (Private)
+@property (readonly) NSSharingServiceType type;
+@end
+
</ins><span class="cx"> #endif // ENABLE(SERVICE_CONTROLS)
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span></span></pre></div>
<a id="branchessafari6003branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Tools/ChangeLog (175309 => 175310)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Tools/ChangeLog 2014-10-29 06:33:42 UTC (rev 175309)
+++ branches/safari-600.3-branch/Tools/ChangeLog 2014-10-29 07:18:15 UTC (rev 175310)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-10-29 Lucas Forschler <lforschler@apple.com>
+
+ Merge r172542
+
+ 2014-08-13 Mark Rowe <mrowe@apple.com>
+
+ <https://webkit.org/b/135911> WebKit should build on Yosemite with the public SDK.
+
+ Reviewed by Darin Adler.
+
+ * DumpRenderTree/mac/TextInputController.m: Don't use extern "C" in a non-C++ file.
+
</ins><span class="cx"> 2014-10-28 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r174525. <rdar://problem/18640876>
</span></span></pre></div>
<a id="branchessafari6003branchToolsDumpRenderTreemacTextInputControllerm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Tools/DumpRenderTree/mac/TextInputController.m (175309 => 175310)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Tools/DumpRenderTree/mac/TextInputController.m 2014-10-29 06:33:42 UTC (rev 175309)
+++ branches/safari-600.3-branch/Tools/DumpRenderTree/mac/TextInputController.m 2014-10-29 07:18:15 UTC (rev 175310)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> #if __has_include(<AppKit/NSTextInputContext_Private.h>)
</span><span class="cx"> #import <AppKit/NSTextInputContext_Private.h>
</span><span class="cx"> #else
</span><del>-extern "C" NSString *NSTextInsertionUndoableAttributeName;
</del><ins>+NSString *NSTextInsertionUndoableAttributeName;
</ins><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>