diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-07 16:28:42 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-07 16:28:42 +0000 |
| commit | c56351d8967bea83f908760c418daa5199e00428 (patch) | |
| tree | 782735319020b50605e6062314e20718213efb24 /webkit | |
| parent | 3fc68d1df5567f424c7fb9cc6cc4d967acd4bd60 (diff) | |
| download | chromium_src-c56351d8967bea83f908760c418daa5199e00428.zip chromium_src-c56351d8967bea83f908760c418daa5199e00428.tar.gz chromium_src-c56351d8967bea83f908760c418daa5199e00428.tar.bz2 | |
Try to fix 10.6 build after clang revert.
BUG=111861
TEST=build with the 10.6 sdk
TBR=rsesek
Review URL: https://chromiumcodereview.appspot.com/9346020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120783 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/plugins/npapi/plugin_web_event_converter_mac.mm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/webkit/plugins/npapi/plugin_web_event_converter_mac.mm b/webkit/plugins/npapi/plugin_web_event_converter_mac.mm index f0ac8f7..928cace 100644 --- a/webkit/plugins/npapi/plugin_web_event_converter_mac.mm +++ b/webkit/plugins/npapi/plugin_web_event_converter_mac.mm @@ -209,11 +209,15 @@ bool CocoaPluginWebEventConverter::ConvertKeyboardEvent( return true; } + // TODO(thakis): Remove this once clang is smarter, http://crbug.com/111861 +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wformat" cocoa_event_.data.key.characters = reinterpret_cast<NPNSString*>( [NSString stringWithFormat:@"%S", key_event.text]); cocoa_event_.data.key.charactersIgnoringModifiers = reinterpret_cast<NPNSString*>( [NSString stringWithFormat:@"%S", key_event.unmodifiedText]); +#pragma clang diagnostic pop if (key_event.modifiers & WebInputEvent::IsAutoRepeat) cocoa_event_.data.key.isARepeat = true; |