Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1652)

Unified Diff: content/renderer/renderer_main.cc

Issue 10825302: mac: Remove more 10.5-only code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tweak comments Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/sandbox_mac.mm ('k') | printing/pdf_metafile_cg_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/renderer_main.cc
diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc
index 5618adacb293ac99636e2b531b6bd90571fefe15..a84a3cbf813945fedfe3b2657b6c5c089fc9fce8 100644
--- a/content/renderer/renderer_main.cc
+++ b/content/renderer/renderer_main.cc
@@ -56,16 +56,23 @@ void InstallFrameworkHacks() {
// See http://crbug.com/31225
// TODO: Don't do this on newer OS X revisions that have a fix for
// http://openradar.appspot.com/radar?id=1156410
- if (base::mac::IsOSSnowLeopardOrLater()) {
- // Chinese Handwriting was introduced in 10.6. Since doing this override
- // regresses page cycler memory usage on 10.5, don't do the unnecessary
- // override there.
- mach_error_t err = mach_override_ptr(
- (void*)&TISCreateInputSourceList,
- (void*)&ChromeTISCreateInputSourceList,
- NULL);
- CHECK_EQ(err_none, err);
- }
+ // 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*)&ChromeTISCreateInputSourceList,
+ NULL);
+ CHECK_EQ(err_none, err);
}
#endif // OS_MACOSX
« no previous file with comments | « content/common/sandbox_mac.mm ('k') | printing/pdf_metafile_cg_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698