diff options
| author | maf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-03 18:18:02 +0000 |
|---|---|---|
| committer | maf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-03 18:18:02 +0000 |
| commit | c3a0351b95ba245d3c664cf31834bd3523732ca4 (patch) | |
| tree | 51a5f066a730f1d73f54a0db0b5b92ba3f6bed3f /o3d | |
| parent | 70b7447f624d02d4a62e6bc1a9ab9e105cd2be85 (diff) | |
| download | chromium_src-c3a0351b95ba245d3c664cf31834bd3523732ca4.zip chromium_src-c3a0351b95ba245d3c664cf31834bd3523732ca4.tar.gz chromium_src-c3a0351b95ba245d3c664cf31834bd3523732ca4.tar.bz2 | |
Fix other things blocking the Mac GYP release build from completing.
Review URL: http://codereview.chromium.org/194005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25332 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/plugin/mac/main_mac.mm | 5 | ||||
| -rw-r--r-- | o3d/statsreport/uploader_aggregation-mac.mm | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/o3d/plugin/mac/main_mac.mm b/o3d/plugin/mac/main_mac.mm index 5ec0777..9f497b1 100644 --- a/o3d/plugin/mac/main_mac.mm +++ b/o3d/plugin/mac/main_mac.mm @@ -144,7 +144,7 @@ void DispatchKeyboardEvent(PluginObject* obj, theChar = TranslateMacControlCharToWebChar(theChar); int upperChar = (theChar >= 'a' && theChar <='z') ? theChar - 32 : theChar; - Event::Type type; + Event::Type type = Event::TYPE_KEYDOWN; // Init to something valid. switch (kind) { case keyDown: // We'll also have to send a keypress below. @@ -155,6 +155,9 @@ void DispatchKeyboardEvent(PluginObject* obj, break; case keyUp: type = Event::TYPE_KEYUP; + break; + default: + return; break; } Event event(type); diff --git a/o3d/statsreport/uploader_aggregation-mac.mm b/o3d/statsreport/uploader_aggregation-mac.mm index 3db4800..c742490 100644 --- a/o3d/statsreport/uploader_aggregation-mac.mm +++ b/o3d/statsreport/uploader_aggregation-mac.mm @@ -94,6 +94,7 @@ static bool ReportMetrics(const char* extra_url_data, data.sum = [[item objectAtIndex:1] longLongValue]; data.minimum = [[item objectAtIndex:2] longLongValue]; data.maximum = [[item objectAtIndex:3] longLongValue]; + data.align = 0; // Pleases the compiler. current = new TimingMetric(short_name_c_str, data); } break; |