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.

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

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index d00e1b1614f83c5d10c2af3f20464a74e5b48fa6..5399ef04433110b03b8d46a57434af98cfe11e1d 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2014-08-08  Tim Horton  <timothy_horton@apple.com>
+
+        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  <timothy_horton@apple.com>
 
         [mac] Dynamically update serviceability when the set of services changes
 2014-08-08  Tim Horton  <timothy_horton@apple.com>
 
         [mac] Dynamically update serviceability when the set of services changes

diff --git a/Source/WebKit2/UIProcess/mac/ServicesController.mm b/Source/WebKit2/UIProcess/mac/ServicesController.mm
index bb158e904713419876e5ca0777a5662a6c801410..0d36f44f6b5feb3c69165c9f6ada7aa284f83238 100644 (file)
--- a/Source/WebKit2/UIProcess/mac/ServicesController.mm
+++ b/Source/WebKit2/UIProcess/mac/ServicesController.mm
@@ -49,6 +49,7 @@ typedef enum {
 - (NSMenu *)menu;
 @end
 
 - (NSMenu *)menu;
 @end
 

+#ifdef __LP64__

 #if __has_include(<Foundation/NSExtension.h>)
 #import <Foundation/NSExtension.h>
 #else
 #if __has_include(<Foundation/NSExtension.h>)
 #import <Foundation/NSExtension.h>
 #else


@@ -59,6 +60,7 @@ typedef enum {
 @interface NSExtension (Details)
 + (id)beginMatchingExtensionsWithAttributes:(NSDictionary *)attributes completion:(void (^)(NSArray *matchingExtensions, NSError *error))handler;
 @end
 @interface NSExtension (Details)
 + (id)beginMatchingExtensionsWithAttributes:(NSDictionary *)attributes completion:(void (^)(NSArray *matchingExtensions, NSError *error))handler;
 @end

+#endif // __LP64__

 
 namespace WebKit {
 
 
 namespace WebKit {
 


@@ -77,6 +79,7 @@ ServicesController::ServicesController()
 {
     refreshExistingServices();
 
 {
     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);
     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 @@ ServicesController::ServicesController()
     m_extensionWatcher = [NSExtension beginMatchingExtensionsWithAttributes:extensionAttributes completion:refreshCallback];
     auto uiExtensionAttributes = @{ @"NSExtensionPointName" : @"com.apple.ui-services" };
     m_uiExtensionWatcher = [NSExtension beginMatchingExtensionsWithAttributes:uiExtensionAttributes completion:refreshCallback];
     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)
 }
 
 void ServicesController::refreshExistingServices(bool refreshImmediately)