summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-18 16:00:38 +0000
committerericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-18 16:00:38 +0000
commitd324ab33283100c0800809b394cbde3dd1dcd801 (patch)
treeda83b2b01f7346790f1cf426cf7f252fa6d30089 /base
parent7cb98a23d0be29c2b5ceafa6f9e4b1d8e98cd282 (diff)
downloadchromium_src-d324ab33283100c0800809b394cbde3dd1dcd801.zip
chromium_src-d324ab33283100c0800809b394cbde3dd1dcd801.tar.gz
chromium_src-d324ab33283100c0800809b394cbde3dd1dcd801.tar.bz2
Cleanup some comment typos.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@984 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/clipboard.h2
-rw-r--r--base/clipboard_win.cc6
-rw-r--r--base/condition_variable.h2
-rw-r--r--base/condition_variable_test.cc6
-rw-r--r--base/debug_on_start.h4
-rw-r--r--base/file_util.cc2
-rw-r--r--base/file_util.h4
-rw-r--r--base/file_util_unittest.cc2
-rw-r--r--base/gfx/convolver.cc4
-rw-r--r--base/gfx/font_utils.h2
-rw-r--r--base/gfx/platform_canvas_unittest.cc2
-rw-r--r--base/gfx/platform_canvas_win.h2
-rw-r--r--base/multiprocess_test.h2
13 files changed, 20 insertions, 20 deletions
diff --git a/base/clipboard.h b/base/clipboard.h
index 047ba4c..4b3c570 100644
--- a/base/clipboard.h
+++ b/base/clipboard.h
@@ -113,7 +113,7 @@ class Clipboard {
void ReadBookmark(std::wstring* title, std::string* url) const;
// Reads a file or group of files from the clipboard, if available, into the
- // out paramter.
+ // out parameter.
void ReadFile(std::wstring* file) const;
void ReadFiles(std::vector<std::wstring>* files) const;
diff --git a/base/clipboard_win.cc b/base/clipboard_win.cc
index b5b5bf2..be79e5b 100644
--- a/base/clipboard_win.cc
+++ b/base/clipboard_win.cc
@@ -52,7 +52,7 @@ class ClipboardLock {
}
bool Acquire(HWND owner) {
- // We shouldn't be calling this if we already own the clipbard lock.
+ // We shouldn't be calling this if we already own the clipboard lock.
DCHECK(!we_own_the_lock_);
// We already have the lock. We don't want to stomp on the other use.
@@ -81,7 +81,7 @@ class ClipboardLock {
return we_own_the_lock_;
}
- // Having failed, we yeild our timeslice to other processes. ::Yield seems
+ // Having failed, we yield our timeslice to other processes. ::Yield seems
// to be insufficient here, so we sleep for 5 ms.
if (attempts < (kMaxAttemptsToOpenClipboard - 1))
::Sleep(5);
@@ -92,7 +92,7 @@ class ClipboardLock {
}
void Release() {
- // We should only be calling this if we already own the clipbard lock.
+ // We should only be calling this if we already own the clipboard lock.
DCHECK(we_own_the_lock_);
// We we don't have the lock, there is nothing to release.
diff --git a/base/condition_variable.h b/base/condition_variable.h
index f30ffba..cbfe519 100644
--- a/base/condition_variable.h
+++ b/base/condition_variable.h
@@ -72,7 +72,7 @@
// threads that were waiting when the request was made will indeed
// get signaled. Some implementations mess up, and don't signal them
// all, while others allow the wait to be effectively turned off (for
-// for a while while waiting threads come around). This implementation
+// a while while waiting threads come around). This implementation
// appears correct, as it will not "lose" any signals, and will guarantee
// that all threads get signaled by Broadcast().
//
diff --git a/base/condition_variable_test.cc b/base/condition_variable_test.cc
index af76c1d..ff4d71e 100644
--- a/base/condition_variable_test.cc
+++ b/base/condition_variable_test.cc
@@ -67,8 +67,8 @@ class ConditionVariableTest : public testing::Test {
// Define a class that will control activities an several multi-threaded tests.
// The general structure of multi-threaded tests is that a test case will
// construct an instance of a WorkQueue. The WorkQueue will spin up some
-// threads and control them thoughout their lifetime, as well as maintaining
-// a central respository of the work thread's activity. Finally, the WorkQueue
+// threads and control them throughout their lifetime, as well as maintaining
+// a central repository of the work thread's activity. Finally, the WorkQueue
// will command the the worker threads to terminate. At that point, the test
// cases will validate that the WorkQueue has records showing that the desired
// activities were performed.
@@ -511,7 +511,7 @@ TEST_F(ConditionVariableTest, LargeFastTaskTest) {
}
queue.work_is_available()->Broadcast(); // Force check for shutdown.
- // Wait for shutdows to complete.
+ // Wait for shutdowns to complete.
SPIN_FOR_TIMEDELTA_OR_UNTIL_TRUE(TimeDelta::FromMinutes(1),
queue.shutdown_task_count() == kThreadCount);
Sleep(10); // Be sure they're all shutdown.
diff --git a/base/debug_on_start.h b/base/debug_on_start.h
index 63fc5dc..0d249df 100644
--- a/base/debug_on_start.h
+++ b/base/debug_on_start.h
@@ -67,7 +67,7 @@ class DebugOnStart {
#ifdef _WIN64
// "Fix" the segment. On x64, the .CRT segment is merged into the .rdata segment
-// so it constains const data only.
+// so it contains const data only.
#pragma const_seg(push, ".CRT$XIB")
// Declare the pointer so the CRT will find it.
extern const DebugOnStart::PIFV debug_on_start;
@@ -79,7 +79,7 @@ DECLSPEC_SELECTANY const DebugOnStart::PIFV debug_on_start =
#else // _WIN64
// "Fix" the segment. On x86, the .CRT segment is merged into the .data segment
-// so it constains non-const data only.
+// so it contains non-const data only.
#pragma data_seg(push, ".CRT$XIB")
// Declare the pointer so the CRT will find it.
DECLSPEC_SELECTANY DebugOnStart::PIFV debug_on_start = &DebugOnStart::Init;
diff --git a/base/file_util.cc b/base/file_util.cc
index fabb4ac..868c36e 100644
--- a/base/file_util.cc
+++ b/base/file_util.cc
@@ -152,7 +152,7 @@ void InsertBeforeExtension(std::wstring* path, const std::wstring& suffix) {
void ReplaceIllegalCharacters(std::wstring* file_name, int replace_char) {
DCHECK(file_name);
- // Control characters, formating characters, non-characters, and
+ // Control characters, formatting characters, non-characters, and
// some printable ASCII characters regarded as dangerous ('"*/:<>?\\').
// See http://blogs.msdn.com/michkap/archive/2006/11/03/941420.aspx
// and http://msdn2.microsoft.com/en-us/library/Aa365247.aspx
diff --git a/base/file_util.h b/base/file_util.h
index 01100e8..69ba8b6 100644
--- a/base/file_util.h
+++ b/base/file_util.h
@@ -208,7 +208,7 @@ bool ResolveShortcut(std::wstring* path);
// you have initialized COM before calling into this function. 'source'
// and 'destination' parameters are required, everything else can be NULL.
// 'source' is the existing file, 'destination' is the new link file to be
-// created; for best resoults pass the filename with the .lnk extension.
+// created; for best results pass the filename with the .lnk extension.
// The 'icon' can specify a dll or exe in which case the icon index is the
// resource id.
// Note that if the shortcut exists it will overwrite it.
@@ -220,7 +220,7 @@ bool CreateShortcutLink(const wchar_t *source, const wchar_t *destination,
// Update a Windows shortcut (.LNK file). This method assumes the shortcut
// link already exists (otherwise false is returned). Ensure you have
// initialized COM before calling into this function. Only 'destination'
-// parameter is required, everything else can be NULL (but if everthing else
+// parameter is required, everything else can be NULL (but if everything else
// is NULL no changes are made to the shortcut). 'destination' is the link
// file to be updated. For best results pass the filename with the .lnk
// extension.
diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc
index db77a3f..9a75cd6 100644
--- a/base/file_util_unittest.cc
+++ b/base/file_util_unittest.cc
@@ -684,7 +684,7 @@ TEST_F(FileUtilTest, ResolveShortcutTest) {
contents = ReadTextFile(link_file);
EXPECT_EQ(L"This is the target.", contents);
- // Cleanning
+ // Cleaning
DeleteFile(target_file.c_str());
DeleteFile(link_file.c_str());
CoUninitialize();
diff --git a/base/gfx/convolver.cc b/base/gfx/convolver.cc
index 1bf89c3..cac487d 100644
--- a/base/gfx/convolver.cc
+++ b/base/gfx/convolver.cc
@@ -104,7 +104,7 @@ class CircularRowBuffer {
for (int i = 0; i < num_rows_; i++) {
row_addresses_[i] = &buffer_[cur_row * row_byte_width_];
- // Advance to the next row, wrapping if nexessary.
+ // Advance to the next row, wrapping if necessary.
cur_row++;
if (cur_row == num_rows_)
cur_row = 0;
@@ -239,7 +239,7 @@ void ConvolveVertically(const int16* filter_values,
else
out_row[byte_offset + 3] = alpha;
} else {
- // No alpha channel, the image is opqaue.
+ // No alpha channel, the image is opaque.
out_row[byte_offset + 3] = 0xff;
}
}
diff --git a/base/gfx/font_utils.h b/base/gfx/font_utils.h
index 2e8a6fc..6945c0d 100644
--- a/base/gfx/font_utils.h
+++ b/base/gfx/font_utils.h
@@ -55,7 +55,7 @@ enum GenericFamilyType {
};
// Return a font family that supports a script and belongs to |generic| font family.
-// It can retun NULL and a caller has to implement its own fallback.
+// It can return NULL and a caller has to implement its own fallback.
const wchar_t* GetFontFamilyForScript(UScriptCode script,
GenericFamilyType generic);
diff --git a/base/gfx/platform_canvas_unittest.cc b/base/gfx/platform_canvas_unittest.cc
index 9b0a0d3..7ba4a8f 100644
--- a/base/gfx/platform_canvas_unittest.cc
+++ b/base/gfx/platform_canvas_unittest.cc
@@ -210,7 +210,7 @@ TEST(PlatformCanvasWin, GDILayer) {
}
EXPECT_TRUE(VerifyBlackSquare(canvas, kInnerX, kInnerY, kInnerW, kInnerH));
- // Add a clip on the layer and fill to make make sure clip is correct.
+ // Add a clip on the layer and fill to make sure clip is correct.
canvas.drawColor(SK_ColorWHITE);
{
LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH);
diff --git a/base/gfx/platform_canvas_win.h b/base/gfx/platform_canvas_win.h
index ee87460..f8944d0 100644
--- a/base/gfx/platform_canvas_win.h
+++ b/base/gfx/platform_canvas_win.h
@@ -43,7 +43,7 @@ namespace gfx {
class PlatformCanvasWin : public SkCanvas {
public:
// Set is_opaque if you are going to erase the bitmap and not use
- // tranparency: this will enable some optimizations. The shared_section
+ // transparency: this will enable some optimizations. The shared_section
// parameter is passed to gfx::PlatformDevice::create. See it for details.
//
// If you use the version with no arguments, you MUST call initialize()
diff --git a/base/multiprocess_test.h b/base/multiprocess_test.h
index 21127f3..7e16fb6 100644
--- a/base/multiprocess_test.h
+++ b/base/multiprocess_test.h
@@ -45,7 +45,7 @@ static const wchar_t kRunClientProcess[] = L"client";
//
// 1) Derive your test from MultiProcessTest.
// 2) Modify your mainline so that if it sees the
-// kRuNClientProcess switch, it will deal with it.
+// kRunClientProcess switch, it will deal with it.
// 3) Create a mainline function for the child processes
// 4) Call SpawnChild("foo"), where "foo" is the name of
// the function you wish to run in the child processes.