Title: [185043] branches/safari-601.1.32-branch/Source/WebKit2
Diff
Modified: branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog (185042 => 185043)
--- branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-31 18:03:52 UTC (rev 185042)
+++ branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-31 19:21:20 UTC (rev 185043)
@@ -1,3 +1,17 @@
+2015-05-31 Babak Shafiei <[email protected]>
+
+ Merge r184059.
+
+ 2015-05-10 Darin Adler <[email protected]>
+
+ 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-29 Babak Shafiei <[email protected]>
Custom patch to turn off ENABLE_PICTURE_SIZES. rdar://problem/21155654
Modified: branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (185042 => 185043)
--- branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-05-31 18:03:52 UTC (rev 185042)
+++ branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-05-31 19:21:20 UTC (rev 185043)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
