summaryrefslogtreecommitdiffstats
path: root/o3d/core
diff options
context:
space:
mode:
authormaf@chromium.org <maf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-06 00:34:44 +0000
committermaf@chromium.org <maf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-06 00:34:44 +0000
commitde4817b40830c7d3af8c63e1f5ae14dde042fed0 (patch)
treeb80166553c03e360613a122c56b919187fe2bece /o3d/core
parenta14e56a9987689db99734d808768ed3be6a182da (diff)
downloadchromium_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/core')
-rw-r--r--o3d/core/cross/gl/primitive_gl.cc2
-rw-r--r--o3d/core/cross/message_queue.cc2
-rw-r--r--o3d/core/cross/primitive.cc2
-rw-r--r--o3d/core/cross/stream_bank.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/o3d/core/cross/gl/primitive_gl.cc b/o3d/core/cross/gl/primitive_gl.cc
index 61ed5d8..5c7eb73 100644
--- a/o3d/core/cross/gl/primitive_gl.cc
+++ b/o3d/core/cross/gl/primitive_gl.cc
@@ -85,7 +85,7 @@ void PrimitiveGL::PlatformSpecificRender(Renderer* renderer,
EffectGL* effect_gl = down_cast<EffectGL*>(material->effect());
DLOG_ASSERT(effect_gl);
StreamBankGL* stream_bank_gl = down_cast<StreamBankGL*>(stream_bank());
- DLOG_ASSERT(stream_bank_gl);
+ DLOG_ASSERT(stream_bank_gl);
ParamCacheGL* param_cache_gl = down_cast<ParamCacheGL*>(param_cache);
ParamCacheGL::VaryingParameterMap& varying_map =
diff --git a/o3d/core/cross/message_queue.cc b/o3d/core/cross/message_queue.cc
index 06e39c8..42f46804 100644
--- a/o3d/core/cross/message_queue.cc
+++ b/o3d/core/cross/message_queue.cc
@@ -190,7 +190,7 @@ String MessageQueue::GetSocketAddress() const {
// Checks the message queue for an incoming message. If one is found
// then it processes it, otherwise it just returns.
bool MessageQueue::CheckForNewMessages(bool* has_new_texture) {
- // The flag will be set to true if we receive a new texture in
+ // The flag will be set to true if we receive a new texture in
// ProcessMessageUpdateTexture2DRect() or
// ProcessMessageUpdateTexture2D()
has_new_texture_ = false;
diff --git a/o3d/core/cross/primitive.cc b/o3d/core/cross/primitive.cc
index e2dad14..876fa71b 100644
--- a/o3d/core/cross/primitive.cc
+++ b/o3d/core/cross/primitive.cc
@@ -131,7 +131,7 @@ void Primitive::Render(Renderer* renderer,
return;
}
- PlatformSpecificRender(renderer, draw_element, material, override,
+ PlatformSpecificRender(renderer, draw_element, material, override,
param_cache);
}
diff --git a/o3d/core/cross/stream_bank.h b/o3d/core/cross/stream_bank.h
index 1c62d7d..c5d6bd9 100644
--- a/o3d/core/cross/stream_bank.h
+++ b/o3d/core/cross/stream_bank.h
@@ -58,7 +58,7 @@ class StreamBank : public VertexSource {
return change_count_;
}
- // True if all the streams on this streambank are renderable.
+ // True if all the streams on this streambank are renderable.
bool renderable() const {
return renderable_;
}