Title: [184479] branches/safari-601.1.32-branch/Source/WebKit2
- Revision
- 184479
- Author
- [email protected]
- Date
- 2015-05-18 07:22:53 -0700 (Mon, 18 May 2015)
Log Message
Merge r184052. rdar://problem/20890647
Modified Paths
Diff
Modified: branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog (184478 => 184479)
--- branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-18 14:22:43 UTC (rev 184478)
+++ branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-18 14:22:53 UTC (rev 184479)
@@ -1,5 +1,16 @@
2015-05-18 Matthew Hanson <[email protected]>
+ Merge r184052. rdar://problem/20890647
+
+ 2015-05-10 Darin Adler <[email protected]>
+
+ Fix build.
+
+ * Platform/mac/MenuUtilities.mm: Added includes that were somehow omitted in what
+ I committed before.
+
+2015-05-18 Matthew Hanson <[email protected]>
+
Merge r184047. rdar://problem/20890647
2015-05-10 Darin Adler <[email protected]>
Modified: branches/safari-601.1.32-branch/Source/WebKit2/Platform/mac/MenuUtilities.mm (184478 => 184479)
--- branches/safari-601.1.32-branch/Source/WebKit2/Platform/mac/MenuUtilities.mm 2015-05-18 14:22:43 UTC (rev 184478)
+++ branches/safari-601.1.32-branch/Source/WebKit2/Platform/mac/MenuUtilities.mm 2015-05-18 14:22:53 UTC (rev 184479)
@@ -27,8 +27,8 @@
#import "MenuUtilities.h"
#import "StringUtilities.h"
+#import <WebCore/DataDetectorsSPI.h>
#import <WebCore/LocalizedStrings.h>
-#import <WebCore/SoftLinking.h>
#import <objc/runtime.h>
#if ENABLE(TELEPHONE_NUMBER_DETECTION) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
@@ -104,6 +104,7 @@
return menu;
}
+
#endif
} // namespace WebKit
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
