diff options
| -rw-r--r-- | content/renderer/render_view_browsertest_mac.mm | 4 | ||||
| -rw-r--r-- | webkit/plugins/npapi/plugin_web_event_converter_mac.mm | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/content/renderer/render_view_browsertest_mac.mm b/content/renderer/render_view_browsertest_mac.mm index 0ec7230..dfb70b00 100644 --- a/content/renderer/render_view_browsertest_mac.mm +++ b/content/renderer/render_view_browsertest_mac.mm @@ -26,11 +26,7 @@ NSEvent* CmdDeadKeyEvent(NSEventType type, unsigned short code) { default: CHECK(false); } - // TODO(thakis): Remove this once clang is smarter, http://crbug.com/111861 -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wformat" NSString* s = [NSString stringWithFormat:@"%C", uniChar]; -#pragma clang diagnostic pop return [NSEvent keyEventWithType:type location:NSMakePoint(0, 0) 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; |