diff options
| author | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-13 20:25:13 +0000 |
|---|---|---|
| committer | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-13 20:25:13 +0000 |
| commit | 0e43c608a908c57215d1bda701661303ee6b41a0 (patch) | |
| tree | 4db4910cef623132ac679a73cb53711ee5506042 /chrome/chrome_renderer.gypi | |
| parent | 41619a9a170f58ba841613b30d405340e60e5b58 (diff) | |
| download | chromium_src-0e43c608a908c57215d1bda701661303ee6b41a0.zip chromium_src-0e43c608a908c57215d1bda701661303ee6b41a0.tar.gz chromium_src-0e43c608a908c57215d1bda701661303ee6b41a0.tar.bz2 | |
[Reverting 81332. Reason for revert: page_cycler_intl2 showing huge regression in vm_size_final_r on Mac 10.5 only: http://build.chromium.org/f/chromium/perf/mac-release-10.5/intl2/report.html?history=150&rev=-1&graph=vm_size_final_r]
Revert 81332 - Mac: Let chrome coexist with the Chinese Handwriting IME.The renderer sandbox breaks the Chinese Handwriting shortcut while Chromeis running, even when Chrome is not active: In a nutshell, Carbon tries to loadthe IME in every process, and if that fails, it uninstalls the toggle shorcut. Itfails in the renderer process due to the sandbox. See the bug for details.Prewarming (patch set 1) doesn't work because that opens up clipboardaccess to the renderer - the IME doesn't load correctly if it doesn't haveclipboard access.dyld __interpose based interposing (patch set 2) doesn't work becauseTISCreateInputSourceList and its broken caller are in the sameframework (HIToolbox).Hence, use binary rewriting to return an arbitrary array with size > 0 to makeHIToolbox believe that the IME loads correctly, so that it doesn't uninstall theglobal handwriting keyboard shortcut.BUG=31225TEST=Enable Chinese in the input menu. Make sure Chrome's not running.Note that ctrl-shift-space opens and dismisses the Handwriting IME(you need a multitouch trackpad for that). Open Chrome, note that theIME still works.(If you run Chrome without this patch, the IME will be broken until you do ps aux | grep Chineseand then kill $CHINESE_HANDWRITING_PIDand then toggle the IME once through the Menu Extra menu.)It is a good idea to have a Terminal open during testing, because killingthe task is the only way to dismiss the IME with the keyboard without thisCL.Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=81308Review URL: http://codereview.chromium.org/6801056
TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/6836022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81468 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_renderer.gypi')
| -rw-r--r-- | chrome/chrome_renderer.gypi | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi index 5bcb197..1530296 100644 --- a/chrome/chrome_renderer.gypi +++ b/chrome/chrome_renderer.gypi @@ -184,11 +184,7 @@ 'renderer/nacl_desc_wrapper_chrome.cc', ], }], - ['OS=="mac"', { - 'dependencies': [ - '../third_party/mach_override/mach_override.gyp:mach_override', - ], - }], + # Linux-specific rules. ['OS=="linux"', { 'conditions': [ [ 'linux_use_tcmalloc==1', { @@ -203,11 +199,13 @@ '../sandbox/sandbox.gyp:sandbox', ], }], + # BSD-specific rules. ['OS=="openbsd" or OS=="freebsd"', { 'dependencies': [ '../build/linux/system.gyp:gtk', ], }], + # Windows-specific rules. ['OS=="win"', { 'include_dirs': [ '<(DEPTH)/third_party/wtl/include', |