diff options
| author | maf@chromium.org <maf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 00:34:44 +0000 |
|---|---|---|
| committer | maf@chromium.org <maf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 00:34:44 +0000 |
| commit | de4817b40830c7d3af8c63e1f5ae14dde042fed0 (patch) | |
| tree | b80166553c03e360613a122c56b919187fe2bece /o3d/plugin | |
| parent | a14e56a9987689db99734d808768ed3be6a182da (diff) | |
| download | chromium_src-de4817b40830c7d3af8c63e1f5ae14dde042fed0.zip chromium_src-de4817b40830c7d3af8c63e1f5ae14dde042fed0.tar.gz chromium_src-de4817b40830c7d3af8c63e1f5ae14dde042fed0.tar.bz2 | |
Deleting trailing spaces, add ending newline where missing to make lint happy. Also delete some commented out CSS, etc.
Review URL: http://codereview.chromium.org/3083012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55162 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/plugin')
| -rw-r--r-- | o3d/plugin/cross/plugin_metrics.h | 2 | ||||
| -rw-r--r-- | o3d/plugin/mac/graphics_utils_mac.mm | 4 | ||||
| -rw-r--r-- | o3d/plugin/mac/o3d_layer.h | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/o3d/plugin/cross/plugin_metrics.h b/o3d/plugin/cross/plugin_metrics.h index 97e9807..0fcb5e6 100644 --- a/o3d/plugin/cross/plugin_metrics.h +++ b/o3d/plugin/cross/plugin_metrics.h @@ -103,7 +103,7 @@ DECLARE_METRIC_integer(browser_type); DECLARE_METRIC_integer(browser_major_version); DECLARE_METRIC_integer(browser_minor_version); DECLARE_METRIC_integer(browser_bugfix_version); - + // Running time for instance of plugin DECLARE_METRIC_count(uptime_seconds); DECLARE_METRIC_count(cpu_time_seconds); diff --git a/o3d/plugin/mac/graphics_utils_mac.mm b/o3d/plugin/mac/graphics_utils_mac.mm index 34bb36f..ee1aa3f 100644 --- a/o3d/plugin/mac/graphics_utils_mac.mm +++ b/o3d/plugin/mac/graphics_utils_mac.mm @@ -82,11 +82,11 @@ bool IsMacOSTenFiveOrHigher() { } return result; } - + // Returns whether OS is 10.6 (Snow Leopard) or higher. bool IsMacOSTenSixOrHigher() { static bool isCached = false, result = false; - + if (!isCached) { SInt32 major = 0; SInt32 minor = 0; diff --git a/o3d/plugin/mac/o3d_layer.h b/o3d/plugin/mac/o3d_layer.h index 7d8cc69..8b71ea0 100644 --- a/o3d/plugin/mac/o3d_layer.h +++ b/o3d/plugin/mac/o3d_layer.h @@ -48,14 +48,14 @@ using glue::_o3d::PluginObject; - (CGLContextObj)glContext; -- (void)drawInCGLContext:(CGLContextObj)ctx +- (void)drawInCGLContext:(CGLContextObj)ctx pixelFormat:(CGLPixelFormatObj)pf - forLayerTime:(CFTimeInterval)t + forLayerTime:(CFTimeInterval)t displayTime:(const CVTimeStamp *)ts; - (void)setPluginObject:(PluginObject *)obj; -- (void)setWidth:(int)width +- (void)setWidth:(int)width height:(int)height; @end |