summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-11 04:58:03 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-11 04:58:03 +0000
commit963bca6353d280d41c254def1cde5f5504b08638 (patch)
treeb9a775fd7055c02f7312534207af8e00ea89989a /webkit
parentfa60c1ddc3a8e2300117c45a853f858f1a91cb98 (diff)
downloadchromium_src-963bca6353d280d41c254def1cde5f5504b08638.zip
chromium_src-963bca6353d280d41c254def1cde5f5504b08638.tar.gz
chromium_src-963bca6353d280d41c254def1cde5f5504b08638.tar.bz2
Revert -Wformat workaround that should no longer be neccessary.
Clang got rolled again in r121610. BUG=111861 TEST=build with the 10.6 sdk TBR=rsesek Review URL: https://chromiumcodereview.appspot.com/9379034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121639 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/plugins/npapi/plugin_web_event_converter_mac.mm4
1 files changed, 0 insertions, 4 deletions
diff --git a/webkit/plugins/npapi/plugin_web_event_converter_mac.mm b/webkit/plugins/npapi/plugin_web_event_converter_mac.mm
index 928cace..f0ac8f7 100644
--- a/webkit/plugins/npapi/plugin_web_event_converter_mac.mm
+++ b/webkit/plugins/npapi/plugin_web_event_converter_mac.mm
@@ -209,15 +209,11 @@ 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;