Fix internal Apple builds on Mavericks.
authordarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 10 May 2015 23:28:55 +0000 (23:28 +0000)
committerdarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 10 May 2015 23:28:55 +0000 (23:28 +0000)
* 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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@184059 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/API/mac/WKView.mm

index 90fdcd392922432135d70ee793878298729d6664..7aaa44a2b95b998ffa3a34b749d6d530182111a9 100644 (file)
@@ -1,3 +1,13 @@
+2015-05-10  Darin Adler  <darin@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  <mitz@apple.com>
 
         iOS internal build fix.
index f3a015839e89b37e17113b8b8e51a42536693de4..f5e185b17a08bdfefa0c05f7a907fe6fd1385c22 100644 (file)
@@ -4603,7 +4603,6 @@ static NSString *pathWithUniqueFilenameForPath(NSString *path)
     _data->_gestureController->setDidMoveSwipeSnapshotCallback(callback);
 }
 
-
 - (NSArray *)_actionMenuItemsForHitTestResult:(WKHitTestResultRef)hitTestResult withType:(_WKActionMenuType)type defaultActionMenuItems:(NSArray *)defaultMenuItems
 {
     return defaultMenuItems;
@@ -4633,7 +4632,6 @@ static NSString *pathWithUniqueFilenameForPath(NSString *path)
 
 - (void)_didChangeContentSize:(NSSize)newSize
 {
-
 }
 
 - (void)_dismissContentRelativeChildWindows
@@ -4647,9 +4645,11 @@ static NSString *pathWithUniqueFilenameForPath(NSString *path)
         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];