diff options
author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 01:02:56 +0000 |
---|---|---|
committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 01:02:56 +0000 |
commit | bd5174ddc1e9dd3ac8099e380f1e92152df9b789 (patch) | |
tree | 551b41843a1291fc409a55bb134f36075e90db8a /content | |
parent | 4e6ffdeb72dead790b276ea580210c9f4584b277 (diff) | |
download | chromium_src-bd5174ddc1e9dd3ac8099e380f1e92152df9b789.zip chromium_src-bd5174ddc1e9dd3ac8099e380f1e92152df9b789.tar.gz chromium_src-bd5174ddc1e9dd3ac8099e380f1e92152df9b789.tar.bz2 |
Fix some coverity defects (mostly pass by value).
CID=15414,15415,15413,15412,15402,14582,13684,12723,15407,14785,14511,13975,13647,11655,10891,9103,8402,8394,10924,8497,others
BUG=none
TEST=trybots
Review URL: http://codereview.chromium.org/6665012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77740 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r-- | content/browser/device_orientation/provider_impl.cc | 2 | ||||
-rw-r--r-- | content/browser/device_orientation/provider_impl.h | 3 | ||||
-rw-r--r-- | content/browser/plugin_service.cc | 2 | ||||
-rw-r--r-- | content/browser/plugin_service.h | 2 | ||||
-rw-r--r-- | content/browser/renderer_host/audio_renderer_host.cc | 12 | ||||
-rw-r--r-- | content/browser/renderer_host/p2p_socket_host.h | 2 | ||||
-rw-r--r-- | content/browser/renderer_host/p2p_socket_host_posix.cc | 16 | ||||
-rw-r--r-- | content/browser/renderer_host/p2p_socket_host_posix.h | 2 | ||||
-rw-r--r-- | content/browser/renderer_host/p2p_sockets_host.cc | 4 | ||||
-rw-r--r-- | content/browser/renderer_host/p2p_sockets_host.h | 4 | ||||
-rw-r--r-- | content/browser/tab_contents/tab_contents.cc | 3 | ||||
-rw-r--r-- | content/browser/tab_contents/tab_contents.h | 2 |
12 files changed, 29 insertions, 25 deletions
diff --git a/content/browser/device_orientation/provider_impl.cc b/content/browser/device_orientation/provider_impl.cc index 27c155f..433e806 100644 --- a/content/browser/device_orientation/provider_impl.cc +++ b/content/browser/device_orientation/provider_impl.cc @@ -68,7 +68,7 @@ void ProviderImpl::Stop() { } void ProviderImpl::DoInitializePollingThread( - std::vector<DataFetcherFactory> factories) { + const std::vector<DataFetcherFactory>& factories) { DCHECK(MessageLoop::current() == polling_thread_->message_loop()); typedef std::vector<DataFetcherFactory>::const_iterator Iterator; diff --git a/content/browser/device_orientation/provider_impl.h b/content/browser/device_orientation/provider_impl.h index e8e2b99..1207e47 100644 --- a/content/browser/device_orientation/provider_impl.h +++ b/content/browser/device_orientation/provider_impl.h @@ -43,7 +43,8 @@ class ProviderImpl : public Provider { // Method for finding a suitable DataFetcher and starting the polling. // Runs on the polling_thread_. - void DoInitializePollingThread(std::vector<DataFetcherFactory> factories); + void DoInitializePollingThread( + const std::vector<DataFetcherFactory>& factories); void ScheduleInitializePollingThread(); // Method for polling a DataFetcher. Runs on the polling_thread_. diff --git a/content/browser/plugin_service.cc b/content/browser/plugin_service.cc index 1b6544c..95249f74d 100644 --- a/content/browser/plugin_service.cc +++ b/content/browser/plugin_service.cc @@ -537,7 +537,7 @@ bool PluginService::PrivatePluginAllowedForURL(const FilePath& plugin_path, url.host() == required_url.host()); } -void PluginService::OverridePluginForTab(OverriddenPlugin plugin) { +void PluginService::OverridePluginForTab(const OverriddenPlugin& plugin) { base::AutoLock auto_lock(overridden_plugins_lock_); overridden_plugins_.push_back(plugin); } diff --git a/content/browser/plugin_service.h b/content/browser/plugin_service.h index 98c392d..4d0db82 100644 --- a/content/browser/plugin_service.h +++ b/content/browser/plugin_service.h @@ -128,7 +128,7 @@ class PluginService bool PrivatePluginAllowedForURL(const FilePath& plugin_path, const GURL& url); // Safe to be called from any thread. - void OverridePluginForTab(OverriddenPlugin plugin); + void OverridePluginForTab(const OverriddenPlugin& plugin); // The UI thread's message loop MessageLoop* main_message_loop() { return main_message_loop_; } diff --git a/content/browser/renderer_host/audio_renderer_host.cc b/content/browser/renderer_host/audio_renderer_host.cc index 4fac389..da542e6 100644 --- a/content/browser/renderer_host/audio_renderer_host.cc +++ b/content/browser/renderer_host/audio_renderer_host.cc @@ -12,20 +12,22 @@ #include "content/browser/renderer_host/audio_sync_reader.h" #include "ipc/ipc_logging.h" +namespace { + // The minimum number of samples in a hardware packet. // This value is selected so that we can handle down to 5khz sample rate. -static const int kMinSamplesPerHardwarePacket = 1024; +const int kMinSamplesPerHardwarePacket = 1024; // The maximum number of samples in a hardware packet. // This value is selected so that we can handle up to 192khz sample rate. -static const int kMaxSamplesPerHardwarePacket = 64 * 1024; +const int kMaxSamplesPerHardwarePacket = 64 * 1024; // This constant governs the hardware audio buffer size, this value should be // chosen carefully. // This value is selected so that we have 8192 samples for 48khz streams. -static const int kMillisecondsPerHardwarePacket = 170; +const int kMillisecondsPerHardwarePacket = 170; -static uint32 SelectSamplesPerPacket(AudioParameters params) { +uint32 SelectSamplesPerPacket(const AudioParameters& params) { // Select the number of samples that can provide at least // |kMillisecondsPerHardwarePacket| worth of audio data. int samples = kMinSamplesPerHardwarePacket; @@ -37,6 +39,8 @@ static uint32 SelectSamplesPerPacket(AudioParameters params) { return samples; } +} // namespace + AudioRendererHost::AudioEntry::AudioEntry() : render_view_id(0), stream_id(0), diff --git a/content/browser/renderer_host/p2p_socket_host.h b/content/browser/renderer_host/p2p_socket_host.h index 8692888..6d8656c 100644 --- a/content/browser/renderer_host/p2p_socket_host.h +++ b/content/browser/renderer_host/p2p_socket_host.h @@ -23,7 +23,7 @@ class P2PSocketHost { virtual bool Init() = 0; // Sends |data| on the socket to |socket_address|. - virtual void Send(P2PSocketAddress socket_address, + virtual void Send(const P2PSocketAddress& socket_address, const std::vector<char>& data) = 0; protected: diff --git a/content/browser/renderer_host/p2p_socket_host_posix.cc b/content/browser/renderer_host/p2p_socket_host_posix.cc index f9ae31f..e7a804b 100644 --- a/content/browser/renderer_host/p2p_socket_host_posix.cc +++ b/content/browser/renderer_host/p2p_socket_host_posix.cc @@ -71,7 +71,8 @@ bool GetLocalAddress(sockaddr_in* addr) { return found; } -bool SocketAddressToSockAddr(P2PSocketAddress address, sockaddr_in* addr) { +bool SocketAddressToSockAddr(const P2PSocketAddress& address, + sockaddr_in* addr) { // TODO(sergeyu): Add IPv6 support. if (address.address.size() != 4) { return false; @@ -179,22 +180,19 @@ bool P2PSocketHostPosix::Init() { } void P2PSocketHostPosix::OnError() { - if (socket_ != 0) { + if (socket_ > 0) close(socket_); - socket_ = 0; - } + socket_ = 0; - if (state_ == STATE_UNINITIALIZED || state_ == STATE_OPEN) { + if (state_ == STATE_UNINITIALIZED || state_ == STATE_OPEN) host_->Send(new P2PMsg_OnError(routing_id_, id_)); - } state_ = STATE_ERROR; } void P2PSocketHostPosix::DidCompleteRead() { - if (state_ != STATE_OPEN) { + if (state_ != STATE_OPEN) return; - } std::vector<char> data; data.resize(4096); @@ -224,7 +222,7 @@ void P2PSocketHostPosix::DidCompleteRead() { } } -void P2PSocketHostPosix::Send(P2PSocketAddress socket_address, +void P2PSocketHostPosix::Send(const P2PSocketAddress& socket_address, const std::vector<char>& data) { sockaddr_in addr; SocketAddressToSockAddr(socket_address, &addr); diff --git a/content/browser/renderer_host/p2p_socket_host_posix.h b/content/browser/renderer_host/p2p_socket_host_posix.h index 14dbc87..236c24d 100644 --- a/content/browser/renderer_host/p2p_socket_host_posix.h +++ b/content/browser/renderer_host/p2p_socket_host_posix.h @@ -16,7 +16,7 @@ class P2PSocketHostPosix : public P2PSocketHost { virtual ~P2PSocketHostPosix(); virtual bool Init(); - virtual void Send(P2PSocketAddress socket_address, + virtual void Send(const P2PSocketAddress& socket_address, const std::vector<char>& data); private: diff --git a/content/browser/renderer_host/p2p_sockets_host.cc b/content/browser/renderer_host/p2p_sockets_host.cc index aa2ef0a..bf1c880 100644 --- a/content/browser/renderer_host/p2p_sockets_host.cc +++ b/content/browser/renderer_host/p2p_sockets_host.cc @@ -41,7 +41,7 @@ bool P2PSocketsHost::OnMessageReceived(const IPC::Message& message, void P2PSocketsHost::OnCreateSocket( const IPC::Message& msg, P2PSocketType type, int socket_id, - P2PSocketAddress remote_address) { + const P2PSocketAddress& remote_address) { if (sockets_.Lookup(socket_id)) { LOG(ERROR) << "Received P2PHostMsg_CreateSocket for socket " "that already exists."; @@ -67,7 +67,7 @@ void P2PSocketsHost::OnCreateSocket( } void P2PSocketsHost::OnSend(const IPC::Message& msg, int socket_id, - P2PSocketAddress socket_address, + const P2PSocketAddress& socket_address, const std::vector<char>& data) { P2PSocketHost* socket = sockets_.Lookup(socket_id); if (!socket) { diff --git a/content/browser/renderer_host/p2p_sockets_host.h b/content/browser/renderer_host/p2p_sockets_host.h index ed56ace..37ec8fd 100644 --- a/content/browser/renderer_host/p2p_sockets_host.h +++ b/content/browser/renderer_host/p2p_sockets_host.h @@ -24,9 +24,9 @@ class P2PSocketsHost : public BrowserMessageFilter { private: void OnCreateSocket(const IPC::Message& msg, P2PSocketType type, - int socket_id, P2PSocketAddress remote_address); + int socket_id, const P2PSocketAddress& remote_address); void OnSend(const IPC::Message& msg, int socket_id, - P2PSocketAddress socket_address, + const P2PSocketAddress& socket_address, const std::vector<char>& data); void OnDestroySocket(const IPC::Message& msg, int socket_id); diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc index abb05ab..c494174 100644 --- a/content/browser/tab_contents/tab_contents.cc +++ b/content/browser/tab_contents/tab_contents.cc @@ -2787,7 +2787,8 @@ const Extension* TabContents::GetExtensionContaining(const GURL& url) { extension : extensions_service->GetExtensionByWebExtent(url); } -void TabContents::OnImageLoaded(SkBitmap* image, ExtensionResource resource, +void TabContents::OnImageLoaded(SkBitmap* image, + const ExtensionResource& resource, int index) { if (image) { extension_app_icon_ = *image; diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h index e93fbc5..031a28f 100644 --- a/content/browser/tab_contents/tab_contents.h +++ b/content/browser/tab_contents/tab_contents.h @@ -1024,7 +1024,7 @@ class TabContents : public PageNavigator, void UpdateExtensionAppIcon(const Extension* extension); // ImageLoadingTracker::Observer. - virtual void OnImageLoaded(SkBitmap* image, ExtensionResource resource, + virtual void OnImageLoaded(SkBitmap* image, const ExtensionResource& resource, int index); // NetworkChangeNotifier::OnlineStateObserver: |