mac: Don't do our Chinese Handwriting IME hack on OS X 10.9+

content/renderer/renderer_main_platform_delegate_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/renderer_main_platform_delegate.h"
 
 #include <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 #include <objc/runtime.h>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #import "base/mac/foundation_util.h"
+#import "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/sys_string_conversions.h"
 #include "content/common/sandbox_mac.h"
 #include "content/public/common/content_switches.h"
 #import "content/public/common/injection_test_mac.h"
 #include "content/common/sandbox_init_mac.h"
 #include "third_party/mach_override/mach_override.h"
 
 extern "C" {
 // SPI logging functions for CF that are exported externally.
@@ skipping 95 matching lines @@
       NOTREACHED() << "Failed to load bundle";
       return false;
     }
     sandbox_tests_bundle_ = [tests_bundle retain];
     [objc_getClass("RendererSandboxTestsRunner") setLogFunction:LogTestMessage];
   }
   return true;
 }
 
 bool RendererMainPlatformDelegate::EnableSandbox() {
+  // http://openradar.appspot.com/radar?id=1156410 is fixed on OS X 10.9+.
   // See http://crbug.com/31225 and http://crbug.com/152566
-  // TODO: Don't do this on newer OS X revisions that have a fix for
-  // http://openradar.appspot.com/radar?id=1156410
   // To check if this is broken:
   // 1. Enable Multi language input (simplified chinese)
   // 2. Ensure "Show/Hide Trackpad Handwriting" shortcut works.
   //    (ctrl+shift+space).
   // 3. Now open a new tab in Google Chrome or start Google Chrome
   // 4. Try ctrl+shift+space shortcut again. Shortcut will not work, IME will
   //    either not appear or (worse) not disappear on ctrl-shift-space.
   //    (Run `ps aux | grep Chinese` (10.6/10.7) or `ps aux | grep Trackpad`
   //    and then kill that pid to make it go away.)
   //
   // Chinese Handwriting was introduced in 10.6 and is confirmed broken on
-  // 10.6, 10.7, and 10.8.
-  mach_error_t err = mach_override_ptr(
-      (void*)&TISCreateInputSourceList,
-      (void*)&CrTISCreateInputSourceList,
-      NULL);
-  CHECK_EQ(err_none, err);
+  // 10.6, 10.7, and 10.8. It's reportedly fixed on 10.9.
+  bool needs_ime_hack = !base::mac::IsOSLaterThanMountainLion_DontCallThis();

[Bernhard Bauer, 2013/02/28 13:50:26]

Bwahaha

 
-  // Override the private CFLog function so that the console is not spammed
-  // by TIS failing to connect to HIServices over XPC.
-  err = mach_override_ptr((void*)&CFLog, (void*)&CrRendererCFLog, NULL);
-  CHECK_EQ(err_none, err);
+  if (needs_ime_hack) {
+    mach_error_t err = mach_override_ptr(
+        (void*)&TISCreateInputSourceList,

[jamesr, 2013/02/28 20:25:26]

why the c-style casts?

+        (void*)&CrTISCreateInputSourceList,
+        NULL);
+    CHECK_EQ(err_none, err);
+
+    // Override the private CFLog function so that the console is not spammed
+    // by TIS failing to connect to HIServices over XPC.
+    err = mach_override_ptr((void*)&CFLog, (void*)&CrRendererCFLog, NULL);
+    CHECK_EQ(err_none, err);
+  }
 
   // Enable the sandbox.
   bool sandbox_initialized = InitializeSandbox();
 
-  // After the sandbox is initialized, call into TIS. Doing this before
-  // the sandbox is in place will open up renderer access to the
-  // pasteboard and an XPC connection to "com.apple.hiservices-xpcservice".
-  base::mac::ScopedCFTypeRef<TISInputSourceRef> layout_source(
-      TISCopyCurrentKeyboardLayoutInputSource());
-  base::mac::ScopedCFTypeRef<TISInputSourceRef> input_source(
-      TISCopyCurrentKeyboardInputSource());
+  if (needs_ime_hack) {
+    // After the sandbox is initialized, call into TIS. Doing this before
+    // the sandbox is in place will open up renderer access to the
+    // pasteboard and an XPC connection to "com.apple.hiservices-xpcservice".
+    base::mac::ScopedCFTypeRef<TISInputSourceRef> layout_source(
+        TISCopyCurrentKeyboardLayoutInputSource());
+    base::mac::ScopedCFTypeRef<TISInputSourceRef> input_source(
+        TISCopyCurrentKeyboardInputSource());
 
-  CFTypeRef source_list[] = { layout_source.get(), input_source.get() };
-  g_text_input_services_source_list_ = CFArrayCreate(kCFAllocatorDefault,
-      source_list, arraysize(source_list), &kCFTypeArrayCallBacks);
+    CFTypeRef source_list[] = { layout_source.get(), input_source.get() };
+    g_text_input_services_source_list_ = CFArrayCreate(kCFAllocatorDefault,
+        source_list, arraysize(source_list), &kCFTypeArrayCallBacks);
+  }
 
   return sandbox_initialized;
 }
 
 void RendererMainPlatformDelegate::RunSandboxTests(bool no_sandbox) {
   Class tests_runner = objc_getClass("RendererSandboxTestsRunner");
   if (tests_runner) {
     if (![tests_runner runTests])
       LOG(ERROR) << "Running renderer with failing sandbox tests!";
     [sandbox_tests_bundle_ unload];
     [sandbox_tests_bundle_ release];
     sandbox_tests_bundle_ = nil;
   }
 }
 
 }  // namespace content