Title: [172369] trunk/Source/WebKit2
- Revision
- 172369
- Author
- [email protected]
- Date
- 2014-08-08 18:12:28 -0700 (Fri, 08 Aug 2014)
Log Message
Build fix for 32-bit.
* UIProcess/mac/ServicesController.mm:
(WebKit::ServicesController::ServicesController):
Don't dynamically refresh services in 32-bit apps. It's not possible
to write a 32-bit app with the Modern API, so this doesn't matter.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (172368 => 172369)
--- trunk/Source/WebKit2/ChangeLog 2014-08-09 00:23:38 UTC (rev 172368)
+++ trunk/Source/WebKit2/ChangeLog 2014-08-09 01:12:28 UTC (rev 172369)
@@ -1,5 +1,14 @@
2014-08-08 Tim Horton <[email protected]>
+ Build fix for 32-bit.
+
+ * UIProcess/mac/ServicesController.mm:
+ (WebKit::ServicesController::ServicesController):
+ Don't dynamically refresh services in 32-bit apps. It's not possible
+ to write a 32-bit app with the Modern API, so this doesn't matter.
+
+2014-08-08 Tim Horton <[email protected]>
+
[mac] Dynamically update serviceability when the set of services changes
https://bugs.webkit.org/show_bug.cgi?id=135738
<rdar://problem/17533459>
Modified: trunk/Source/WebKit2/UIProcess/mac/ServicesController.mm (172368 => 172369)
--- trunk/Source/WebKit2/UIProcess/mac/ServicesController.mm 2014-08-09 00:23:38 UTC (rev 172368)
+++ trunk/Source/WebKit2/UIProcess/mac/ServicesController.mm 2014-08-09 01:12:28 UTC (rev 172369)
@@ -49,6 +49,7 @@
- (NSMenu *)menu;
@end
+#ifdef __LP64__
#if __has_include(<Foundation/NSExtension.h>)
#import <Foundation/NSExtension.h>
#else
@@ -59,6 +60,7 @@
@interface NSExtension (Details)
+ (id)beginMatchingExtensionsWithAttributes:(NSDictionary *)attributes completion:(void (^)(NSArray *matchingExtensions, NSError *error))handler;
@end
+#endif // __LP64__
namespace WebKit {
@@ -77,6 +79,7 @@
{
refreshExistingServices();
+#ifdef __LP64__
auto refreshCallback = [](NSArray *, NSError *) {
// We coalese refreshes from the notification callbacks because they can come in small batches.
ServicesController::shared().refreshExistingServices(false);
@@ -86,6 +89,7 @@
m_extensionWatcher = [NSExtension beginMatchingExtensionsWithAttributes:extensionAttributes completion:refreshCallback];
auto uiExtensionAttributes = @{ @"NSExtensionPointName" : @"com.apple.ui-services" };
m_uiExtensionWatcher = [NSExtension beginMatchingExtensionsWithAttributes:uiExtensionAttributes completion:refreshCallback];
+#endif // __LP64__
}
void ServicesController::refreshExistingServices(bool refreshImmediately)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
