Title: [184059] trunk/Source/WebKit2
- Revision
- 184059
- Author
- da...@apple.com
- Date
- 2015-05-10 16:28:55 -0700 (Sun, 10 May 2015)
Log Message
Fix internal Apple builds on Mavericks.
* UIProcess/API/mac/WKView.mm:
(-[WKView _dismissContentRelativeChildWindows]): Added missing conditionals around
some code that is for OS X 10.10 or newer only. There were similar conditionals around
other nearby code in this file, and around other uses of the same method in other files,
so matched the style.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (184058 => 184059)
--- trunk/Source/WebKit2/ChangeLog 2015-05-10 22:49:57 UTC (rev 184058)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-10 23:28:55 UTC (rev 184059)
@@ -1,3 +1,13 @@
+2015-05-10 Darin Adler <da...@apple.com>
+
+ Fix internal Apple builds on Mavericks.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _dismissContentRelativeChildWindows]): Added missing conditionals around
+ some code that is for OS X 10.10 or newer only. There were similar conditionals around
+ other nearby code in this file, and around other uses of the same method in other files,
+ so matched the style.
+
2015-05-10 Dan Bernstein <m...@apple.com>
iOS internal build fix.
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (184058 => 184059)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-05-10 22:49:57 UTC (rev 184058)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-05-10 23:28:55 UTC (rev 184059)
@@ -4603,7 +4603,6 @@
_data->_gestureController->setDidMoveSwipeSnapshotCallback(callback);
}
-
- (NSArray *)_actionMenuItemsForHitTestResult:(WKHitTestResultRef)hitTestResult withType:(_WKActionMenuType)type defaultActionMenuItems:(NSArray *)defaultMenuItems
{
return defaultMenuItems;
@@ -4633,7 +4632,6 @@
- (void)_didChangeContentSize:(NSSize)newSize
{
-
}
- (void)_dismissContentRelativeChildWindows
@@ -4647,9 +4645,11 @@
if (Class lookupDefinitionModuleClass = getLULookupDefinitionModuleClass())
[lookupDefinitionModuleClass hideDefinition];
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
DDActionsManager *actionsManager = [getDDActionsManagerClass() sharedManager];
if ([actionsManager respondsToSelector:@selector(requestBubbleClosureUnanchorOnFailure:)])
[actionsManager requestBubbleClosureUnanchorOnFailure:YES];
+#endif
}
[self _clearTextIndicatorWithAnimation:TextIndicatorDismissalAnimation::FadeOut];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
