diff options
author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-28 20:41:10 +0000 |
---|---|---|
committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-28 20:41:10 +0000 |
commit | be952c3ca6d93968409b246c9439a7d8c2a06bba (patch) | |
tree | 501d38ada79c1fddf10f65fe6c88b27a3df4cb1d /webkit | |
parent | 86c008e8a7da9c00c5a676eb201ba5d0c976748e (diff) | |
download | chromium_src-be952c3ca6d93968409b246c9439a7d8c2a06bba.zip chromium_src-be952c3ca6d93968409b246c9439a7d8c2a06bba.tar.gz chromium_src-be952c3ca6d93968409b246c9439a7d8c2a06bba.tar.bz2 |
Fix a ton of compiler warnings.
Most of these are classes with virtual methods lacking virtual destructors
or NULL used in non-pointer context.
BUG=none
TEST=app_unittests && base_unittests
--gtest_filter=-ConditionVariableTest.LargeFastTaskTest
patch by Jacob Mandelson <jlmjlm [at] gmail>
http://codereview.chromium.org/171028/show
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24792 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/api/public/linux/WebSandboxSupport.h | 3 | ||||
-rw-r--r-- | webkit/glue/devtools/devtools_rpc.h | 2 | ||||
-rw-r--r-- | webkit/glue/webcursor_unittest.cc | 10 |
3 files changed, 9 insertions, 6 deletions
diff --git a/webkit/api/public/linux/WebSandboxSupport.h b/webkit/api/public/linux/WebSandboxSupport.h index 4e20387..a8a5eaf 100644 --- a/webkit/api/public/linux/WebSandboxSupport.h +++ b/webkit/api/public/linux/WebSandboxSupport.h @@ -49,6 +49,9 @@ namespace WebKit { // Returns a string with the font family on an empty string if the // request cannot be satisfied. virtual WebString getFontFamilyForCharacters(const WebUChar* characters, size_t numCharacters) = 0; + + protected: + ~WebSandboxSupport() { } }; } // namespace WebKit diff --git a/webkit/glue/devtools/devtools_rpc.h b/webkit/glue/devtools/devtools_rpc.h index 072116e..84a2a7e 100644 --- a/webkit/glue/devtools/devtools_rpc.h +++ b/webkit/glue/devtools/devtools_rpc.h @@ -225,7 +225,7 @@ class Class {\ Class() { \ class_name = #Class; \ } \ - ~Class() {} \ + virtual ~Class() {} \ \ STRUCT( \ TOOLS_RPC_API_METHOD0, \ diff --git a/webkit/glue/webcursor_unittest.cc b/webkit/glue/webcursor_unittest.cc index 1a15bf8..51fd433 100644 --- a/webkit/glue/webcursor_unittest.cc +++ b/webkit/glue/webcursor_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -22,7 +22,7 @@ TEST(WebCursorTest, CursorSerialization) { ok_custom_pickle.WriteInt(4); ok_custom_pickle.WriteUInt32(0); // Custom Windows message. - ok_custom_pickle.WriteIntPtr(NULL); + ok_custom_pickle.WriteIntPtr(0); void* iter = NULL; EXPECT_TRUE(custom_cursor.Deserialize(&ok_custom_pickle, &iter)); @@ -39,7 +39,7 @@ TEST(WebCursorTest, CursorSerialization) { short_custom_pickle.WriteInt(3); short_custom_pickle.WriteUInt32(0); // Custom Windows message. - ok_custom_pickle.WriteIntPtr(NULL); + ok_custom_pickle.WriteIntPtr(0); iter = NULL; EXPECT_FALSE(custom_cursor.Deserialize(&short_custom_pickle, &iter)); @@ -58,7 +58,7 @@ TEST(WebCursorTest, CursorSerialization) { for (int i = 0; i < kTooBigSize; ++i) large_custom_pickle.WriteUInt32(0); // Custom Windows message. - ok_custom_pickle.WriteIntPtr(NULL); + ok_custom_pickle.WriteIntPtr(0); iter = NULL; EXPECT_FALSE(custom_cursor.Deserialize(&large_custom_pickle, &iter)); @@ -75,7 +75,7 @@ TEST(WebCursorTest, CursorSerialization) { neg_custom_pickle.WriteInt(4); neg_custom_pickle.WriteUInt32(0); // Custom Windows message. - neg_custom_pickle.WriteIntPtr(NULL); + neg_custom_pickle.WriteIntPtr(0); iter = NULL; EXPECT_FALSE(custom_cursor.Deserialize(&neg_custom_pickle, &iter)); } |