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

Unified Diff: webkit/plugins/npapi/plugin_web_event_converter_mac.mm

Issue 9346020: Try to fix 10.6 build after clang revert. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 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/renderer/render_view_browsertest_mac.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/npapi/plugin_web_event_converter_mac.mm
diff --git a/webkit/plugins/npapi/plugin_web_event_converter_mac.mm b/webkit/plugins/npapi/plugin_web_event_converter_mac.mm
index f0ac8f7aeefa4ffbbf7d1987ebd142622bbd4354..928cacee04b4ee8add75846f6ba6b8befb67e1e1 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;
« no previous file with comments | « content/renderer/render_view_browsertest_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698