Commit 963bca63 authored by thakis@chromium.org's avatar thakis@chromium.org

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
parent fa60c1dd
......@@ -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)
......
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment