Diff
Modified: branches/safari-600.3-branch/Source/WebCore/ChangeLog (175309 => 175310)
--- 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)
@@ -1,3 +1,15 @@
+2014-10-29 Lucas Forschler <[email protected]>
+
+ Merge r172542
+
+ 2014-08-13 Mark Rowe <[email protected]>
+
+ <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.
+
2014-10-28 Dana Burkart <[email protected]>
Merge r174791. <rdar://problem/18753175>
Modified: branches/safari-600.3-branch/Source/WebCore/rendering/RenderThemeMac.mm (175309 => 175310)
--- 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)
@@ -89,22 +89,26 @@
#define APPKIT_PRIVATE_CLASS
#endif
+#if __has_include(<AppKit/NSSharingService_Private.h>)
+#import <AppKit/NSSharingService_Private.h>
+#else
+typedef enum {
+ NSSharingServicePickerStyleRollover = 1
+} NSSharingServicePickerStyle;
+#endif
+
#if __has_include(<AppKit/NSServicesRolloverButtonCell.h>)
#import <AppKit/NSServicesRolloverButtonCell.h>
+#else
+@interface NSServicesRolloverButtonCell : NSButtonCell
+@end
#endif
@interface NSServicesRolloverButtonCell (Details)
+ (NSServicesRolloverButtonCell *)serviceRolloverButtonCellForStyle:(NSSharingServicePickerStyle)style;
+- (NSRect)rectForBounds:(NSRect)bounds preferredEdge:(NSRectEdge)preferredEdge;
@end
-#if __has_include(<AppKit/NSSharingService_Private.h>)
-#import <AppKit/NSSharingService_Private.h>
-#else
-typedef enum {
- NSSharingServicePickerStyleRollover = 1
-} NSSharingServicePickerStyle;
-#endif
-
#endif // ENABLE(SERVICE_CONTROLS)
// The methods in this file are specific to the Mac OS X platform.
Modified: branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog (175309 => 175310)
--- 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)
@@ -1,3 +1,15 @@
+2014-10-29 Lucas Forschler <[email protected]>
+
+ Merge r172542
+
+ 2014-08-13 Mark Rowe <[email protected]>
+
+ <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.
+
2014-10-28 Lucas Forschler <[email protected]>
Merge r175183
Modified: branches/safari-600.3-branch/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm (175309 => 175310)
--- 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)
@@ -39,12 +39,17 @@
#import <WebCore/ContextMenuController.h>
#import <WebCore/Page.h>
+#endif
+
@interface NSSharingServicePicker (Private)
@property NSSharingServicePickerStyle style;
- (NSMenu *)menu;
@end
-#endif
+@interface NSSharingService (Private)
+@property (readonly) NSSharingServiceType type;
+@end
+
#if __has_include(<AppKit/NSItemProvider.h>)
#import <AppKit/NSItemProvider.h>
#else
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (175309 => 175310)
--- 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)
@@ -1,3 +1,16 @@
+2014-10-29 Lucas Forschler <[email protected]>
+
+ Merge r172542
+
+ 2014-08-13 Mark Rowe <[email protected]>
+
+ <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.
+
2014-10-28 Dana Burkart <[email protected]>
Merge r174791. <rdar://problem/18753175>
Modified: branches/safari-600.3-branch/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h (175309 => 175310)
--- 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)
@@ -32,8 +32,13 @@
#include <libproc_internal.h>
#endif
+#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
extern "C" int proc_importance_assertion_begin_with_msg(mach_msg_header_t*, mach_msg_trailer_t*, uint64_t*);
extern "C" int proc_importance_assertion_complete(uint64_t assertion_handle);
+#endif
namespace IPC {
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (175309 => 175310)
--- 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)
@@ -54,6 +54,12 @@
NSSharingServicePickerStyleRollover = 1,
NSSharingServicePickerStyleTextSelection = 2
} NSSharingServicePickerStyle;
+
+typedef enum {
+ NSSharingServiceTypeEditor = 2
+} NSSharingServiceType;
+
+typedef NSUInteger NSSharingServiceMask;
#endif
@interface NSSharingServicePicker (Details)
@@ -61,6 +67,10 @@
- (NSMenu *)menu;
@end
+@interface NSSharingService (Private)
+@property (readonly) NSSharingServiceType type;
+@end
+
#endif // ENABLE(SERVICE_CONTROLS)
using namespace WebCore;
Modified: branches/safari-600.3-branch/Tools/ChangeLog (175309 => 175310)
--- 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)
@@ -1,3 +1,15 @@
+2014-10-29 Lucas Forschler <[email protected]>
+
+ Merge r172542
+
+ 2014-08-13 Mark Rowe <[email protected]>
+
+ <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.
+
2014-10-28 Dana Burkart <[email protected]>
Merge r174525. <rdar://problem/18640876>
Modified: branches/safari-600.3-branch/Tools/DumpRenderTree/mac/TextInputController.m (175309 => 175310)
--- 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)
@@ -43,7 +43,7 @@
#if __has_include(<AppKit/NSTextInputContext_Private.h>)
#import <AppKit/NSTextInputContext_Private.h>
#else
-extern "C" NSString *NSTextInsertionUndoableAttributeName;
+NSString *NSTextInsertionUndoableAttributeName;
#endif
#endif
