From fab02809c61c301a2531a0d844f4ba14e783c6c6 Mon Sep 17 00:00:00 2001 From: Haojian Wu Date: Sun, 10 Jul 2016 11:52:28 +0200 Subject: [PATCH 1/6] Modernize to C++11: NULL => nullptr. No functional change. --- atom/browser/api/atom_api_menu.cc | 2 +- atom/browser/api/event.cc | 14 +++++------ atom/browser/atom_browser_main_parts.cc | 2 +- atom/browser/atom_browser_main_parts_posix.cc | 10 ++++---- atom/browser/net/asar/url_request_asar_job.cc | 4 ++-- atom/browser/relauncher_mac.cc | 4 ++-- atom/browser/window_list.cc | 2 +- atom/common/api/atom_bindings.cc | 2 +- atom/common/asar/archive.cc | 6 ++--- .../v8_value_converter.cc | 10 ++++---- atom/common/node_bindings_mac.cc | 2 +- atom/renderer/api/atom_api_renderer_ipc.cc | 8 +++---- .../chrome/browser/browser_process.cc | 4 ++-- .../media/native_desktop_media_list.cc | 4 ++-- .../chrome/browser/printing/print_job.cc | 16 ++++++------- .../browser/printing/print_job_manager.cc | 4 ++-- .../browser/printing/print_job_worker.cc | 8 +++---- .../printing/print_view_manager_base.cc | 2 +- .../chrome/browser/printing/printer_query.cc | 2 +- .../printing/printing_message_filter.cc | 2 +- .../chrome/browser/process_singleton_posix.cc | 2 +- ...per_isolated_file_system_message_filter.cc | 2 +- .../browser/speech/tts_controller_impl.cc | 14 +++++------ .../renderer/pepper/pepper_flash_menu_host.cc | 2 +- .../pepper/pepper_flash_renderer_host.cc | 2 +- .../printing/print_web_view_helper.cc | 24 +++++++++---------- .../spellchecker/spellcheck_worditerator.cc | 4 ++-- chromium_src/extensions/common/url_pattern.cc | 4 ++-- .../stream_listen_socket.cc | 2 +- 29 files changed, 82 insertions(+), 82 deletions(-) diff --git a/atom/browser/api/atom_api_menu.cc b/atom/browser/api/atom_api_menu.cc index 5e66850c754..54a3d4e8132 100644 --- a/atom/browser/api/atom_api_menu.cc +++ b/atom/browser/api/atom_api_menu.cc @@ -21,7 +21,7 @@ namespace api { Menu::Menu(v8::Isolate* isolate) : model_(new AtomMenuModel(this)), - parent_(NULL) { + parent_(nullptr) { } Menu::~Menu() { diff --git a/atom/browser/api/event.cc b/atom/browser/api/event.cc index 2554e4ad0da..8c60eda2471 100644 --- a/atom/browser/api/event.cc +++ b/atom/browser/api/event.cc @@ -12,8 +12,8 @@ namespace mate { Event::Event(v8::Isolate* isolate) - : sender_(NULL), - message_(NULL) { + : sender_(nullptr), + message_(nullptr) { Init(isolate); } @@ -31,8 +31,8 @@ void Event::SetSenderAndMessage(content::WebContents* sender, } void Event::WebContentsDestroyed() { - sender_ = NULL; - message_ = NULL; + sender_ = nullptr; + message_ = nullptr; } void Event::PreventDefault(v8::Isolate* isolate) { @@ -41,13 +41,13 @@ void Event::PreventDefault(v8::Isolate* isolate) { } bool Event::SendReply(const base::string16& json) { - if (message_ == NULL || sender_ == NULL) + if (message_ == nullptr || sender_ == nullptr) return false; AtomViewHostMsg_Message_Sync::WriteReplyParams(message_, json); bool success = sender_->Send(message_); - message_ = NULL; - sender_ = NULL; + message_ = nullptr; + sender_ = nullptr; return success; } diff --git a/atom/browser/atom_browser_main_parts.cc b/atom/browser/atom_browser_main_parts.cc index b933d1073bb..66c1bd8303a 100644 --- a/atom/browser/atom_browser_main_parts.cc +++ b/atom/browser/atom_browser_main_parts.cc @@ -32,7 +32,7 @@ void Erase(T* container, typename T::iterator iter) { } // static -AtomBrowserMainParts* AtomBrowserMainParts::self_ = NULL; +AtomBrowserMainParts* AtomBrowserMainParts::self_ = nullptr; AtomBrowserMainParts::AtomBrowserMainParts() : fake_browser_process_(new BrowserProcess), diff --git a/atom/browser/atom_browser_main_parts_posix.cc b/atom/browser/atom_browser_main_parts_posix.cc index 2a0dddc4748..8c96f91bfe6 100644 --- a/atom/browser/atom_browser_main_parts_posix.cc +++ b/atom/browser/atom_browser_main_parts_posix.cc @@ -43,7 +43,7 @@ void GracefulShutdownHandler(int signal) { struct sigaction action; memset(&action, 0, sizeof(action)); action.sa_handler = SIG_DFL; - RAW_CHECK(sigaction(signal, &action, NULL) == 0); + RAW_CHECK(sigaction(signal, &action, nullptr) == 0); RAW_CHECK(g_pipe_pid == getpid()); RAW_CHECK(g_shutdown_pipe_write_fd != -1); @@ -171,7 +171,7 @@ void AtomBrowserMainParts::HandleSIGCHLD() { struct sigaction action; memset(&action, 0, sizeof(action)); action.sa_handler = SIGCHLDHandler; - CHECK_EQ(sigaction(SIGCHLD, &action, NULL), 0); + CHECK_EQ(sigaction(SIGCHLD, &action, nullptr), 0); } void AtomBrowserMainParts::HandleShutdownSignals() { @@ -211,15 +211,15 @@ void AtomBrowserMainParts::HandleShutdownSignals() { struct sigaction action; memset(&action, 0, sizeof(action)); action.sa_handler = SIGTERMHandler; - CHECK_EQ(sigaction(SIGTERM, &action, NULL), 0); + CHECK_EQ(sigaction(SIGTERM, &action, nullptr), 0); // Also handle SIGINT - when the user terminates the browser via Ctrl+C. If // the browser process is being debugged, GDB will catch the SIGINT first. action.sa_handler = SIGINTHandler; - CHECK_EQ(sigaction(SIGINT, &action, NULL), 0); + CHECK_EQ(sigaction(SIGINT, &action, nullptr), 0); // And SIGHUP, for when the terminal disappears. On shutdown, many Linux // distros send SIGHUP, SIGTERM, and then SIGKILL. action.sa_handler = SIGHUPHandler; - CHECK_EQ(sigaction(SIGHUP, &action, NULL), 0); + CHECK_EQ(sigaction(SIGHUP, &action, nullptr), 0); } } // namespace atom diff --git a/atom/browser/net/asar/url_request_asar_job.cc b/atom/browser/net/asar/url_request_asar_job.cc index 39e55a35cbc..9bcdfc6ff78 100644 --- a/atom/browser/net/asar/url_request_asar_job.cc +++ b/atom/browser/net/asar/url_request_asar_job.cc @@ -183,7 +183,7 @@ bool URLRequestAsarJob::IsRedirectResponse(GURL* location, net::Filter* URLRequestAsarJob::SetupFilter() const { // Bug 9936 - .svgz files needs to be decompressed. return base::LowerCaseEqualsASCII(file_path_.Extension(), ".svgz") - ? net::Filter::GZipFactory() : NULL; + ? net::Filter::GZipFactory() : nullptr; } bool URLRequestAsarJob::GetMimeType(std::string* mime_type) const { @@ -338,7 +338,7 @@ void URLRequestAsarJob::DidRead(scoped_refptr buf, int result) { DCHECK_GE(remaining_bytes_, 0); } - buf = NULL; + buf = nullptr; ReadRawDataComplete(result); } diff --git a/atom/browser/relauncher_mac.cc b/atom/browser/relauncher_mac.cc index ef26f8441df..ac4c874c560 100644 --- a/atom/browser/relauncher_mac.cc +++ b/atom/browser/relauncher_mac.cc @@ -43,7 +43,7 @@ void RelauncherSynchronizeWithParent() { struct kevent change = { 0 }; EV_SET(&change, parent_pid, EVFILT_PROC, EV_ADD, NOTE_EXIT, 0, NULL); - if (kevent(kq.get(), &change, 1, NULL, 0, NULL) == -1) { + if (kevent(kq.get(), &change, 1, nullptr, 0, nullptr) == -1) { PLOG(ERROR) << "kevent (add)"; return; } @@ -58,7 +58,7 @@ void RelauncherSynchronizeWithParent() { // write above to complete. The parent process is now free to exit. Wait for // that to happen. struct kevent event; - int events = kevent(kq.get(), NULL, 0, &event, 1, NULL); + int events = kevent(kq.get(), nullptr, 0, &event, 1, nullptr); if (events != 1) { if (events < 0) { PLOG(ERROR) << "kevent (monitor)"; diff --git a/atom/browser/window_list.cc b/atom/browser/window_list.cc index b3bec5d08c1..537499022ea 100644 --- a/atom/browser/window_list.cc +++ b/atom/browser/window_list.cc @@ -17,7 +17,7 @@ base::LazyInstance>::Leaky WindowList::observers_ = LAZY_INSTANCE_INITIALIZER; // static -WindowList* WindowList::instance_ = NULL; +WindowList* WindowList::instance_ = nullptr; // static WindowList* WindowList::GetInstance() { diff --git a/atom/common/api/atom_bindings.cc b/atom/common/api/atom_bindings.cc index 599fc674989..b5a51ad507e 100644 --- a/atom/common/api/atom_bindings.cc +++ b/atom/common/api/atom_bindings.cc @@ -25,7 +25,7 @@ namespace { struct DummyClass { bool crash; }; void Crash() { - static_cast(NULL)->crash = true; + static_cast(nullptr)->crash = true; } void Hang() { diff --git a/atom/common/asar/archive.cc b/atom/common/asar/archive.cc index c2306c3c8f3..e622effe5d3 100644 --- a/atom/common/asar/archive.cc +++ b/atom/common/asar/archive.cc @@ -41,7 +41,7 @@ bool GetFilesNode(const base::DictionaryValue* root, // Test for symbol linked directory. std::string link; if (dir->GetStringWithoutPathExpansion("link", &link)) { - const base::DictionaryValue* linked_node = NULL; + const base::DictionaryValue* linked_node = nullptr; if (!GetNodeFromPath(link, root, &linked_node)) return false; dir = linked_node; @@ -60,7 +60,7 @@ bool GetChildNode(const base::DictionaryValue* root, return true; } - const base::DictionaryValue* files = NULL; + const base::DictionaryValue* files = nullptr; return GetFilesNode(root, dir, &files) && files->GetDictionaryWithoutPathExpansion(name, out); } @@ -78,7 +78,7 @@ bool GetNodeFromPath(std::string path, for (size_t delimiter_position = path.find_first_of(kSeparators); delimiter_position != std::string::npos; delimiter_position = path.find_first_of(kSeparators)) { - const base::DictionaryValue* child = NULL; + const base::DictionaryValue* child = nullptr; if (!GetChildNode(root, path.substr(0, delimiter_position), dir, &child)) return false; diff --git a/atom/common/native_mate_converters/v8_value_converter.cc b/atom/common/native_mate_converters/v8_value_converter.cc index ff96b727e02..a4ecc3ded97 100644 --- a/atom/common/native_mate_converters/v8_value_converter.cc +++ b/atom/common/native_mate_converters/v8_value_converter.cc @@ -162,7 +162,7 @@ v8::Local V8ValueConverter::ToV8Array( v8::Local result(v8::Array::New(isolate, val->GetSize())); for (size_t i = 0; i < val->GetSize(); ++i) { - const base::Value* child = NULL; + const base::Value* child = nullptr; CHECK(val->Get(i, &child)); v8::Local child_v8 = ToV8ValueImpl(isolate, child); @@ -214,7 +214,7 @@ base::Value* V8ValueConverter::FromV8ValueImpl( FromV8ValueState::Level state_level(state); if (state->HasReachedMaxRecursionDepth()) - return NULL; + return nullptr; if (val->IsNull()) return base::Value::CreateNullValue().release(); @@ -235,7 +235,7 @@ base::Value* V8ValueConverter::FromV8ValueImpl( if (val->IsUndefined()) // JSON.stringify ignores undefined. - return NULL; + return nullptr; if (val->IsDate()) { v8::Date* date = v8::Date::Cast(*val); @@ -265,7 +265,7 @@ base::Value* V8ValueConverter::FromV8ValueImpl( if (val->IsFunction()) { if (!function_allowed_) // JSON.stringify refuses to convert function(){}. - return NULL; + return nullptr; return FromV8Object(val->ToObject(), state, isolate); } @@ -278,7 +278,7 @@ base::Value* V8ValueConverter::FromV8ValueImpl( } LOG(ERROR) << "Unexpected v8 value type encountered."; - return NULL; + return nullptr; } base::Value* V8ValueConverter::FromV8Array( diff --git a/atom/common/node_bindings_mac.cc b/atom/common/node_bindings_mac.cc index 9e61d27f496..6be1226ae31 100644 --- a/atom/common/node_bindings_mac.cc +++ b/atom/common/node_bindings_mac.cc @@ -54,7 +54,7 @@ void NodeBindingsMac::PollEvents() { // Wait for new libuv events. int r; do { - r = select(fd + 1, &readset, NULL, NULL, timeout == -1 ? NULL : &tv); + r = select(fd + 1, &readset, nullptr, nullptr, timeout == -1 ? nullptr : &tv); } while (r == -1 && errno == EINTR); } diff --git a/atom/renderer/api/atom_api_renderer_ipc.cc b/atom/renderer/api/atom_api_renderer_ipc.cc index a82562f9361..49f917292bb 100644 --- a/atom/renderer/api/atom_api_renderer_ipc.cc +++ b/atom/renderer/api/atom_api_renderer_ipc.cc @@ -20,11 +20,11 @@ namespace { RenderView* GetCurrentRenderView() { WebLocalFrame* frame = WebLocalFrame::frameForCurrentContext(); if (!frame) - return NULL; + return nullptr; WebView* view = frame->view(); if (!view) - return NULL; // can happen during closing. + return nullptr; // can happen during closing. return RenderView::FromWebView(view); } @@ -33,7 +33,7 @@ void Send(mate::Arguments* args, const base::string16& channel, const base::ListValue& arguments) { RenderView* render_view = GetCurrentRenderView(); - if (render_view == NULL) + if (render_view == nullptr) return; bool success = render_view->Send(new AtomViewHostMsg_Message( @@ -49,7 +49,7 @@ base::string16 SendSync(mate::Arguments* args, base::string16 json; RenderView* render_view = GetCurrentRenderView(); - if (render_view == NULL) + if (render_view == nullptr) return json; IPC::SyncMessage* message = new AtomViewHostMsg_Message_Sync( diff --git a/chromium_src/chrome/browser/browser_process.cc b/chromium_src/chrome/browser/browser_process.cc index 2c07333210e..34e79812bf2 100644 --- a/chromium_src/chrome/browser/browser_process.cc +++ b/chromium_src/chrome/browser/browser_process.cc @@ -7,7 +7,7 @@ #include "chrome/browser/printing/print_job_manager.h" #include "ui/base/l10n/l10n_util.h" -BrowserProcess* g_browser_process = NULL; +BrowserProcess* g_browser_process = nullptr; BrowserProcess::BrowserProcess() { g_browser_process = this; @@ -16,7 +16,7 @@ BrowserProcess::BrowserProcess() { } BrowserProcess::~BrowserProcess() { - g_browser_process = NULL; + g_browser_process = nullptr; } std::string BrowserProcess::GetApplicationLocale() { diff --git a/chromium_src/chrome/browser/media/native_desktop_media_list.cc b/chromium_src/chrome/browser/media/native_desktop_media_list.cc index a524dfcf38c..410a9430a33 100644 --- a/chromium_src/chrome/browser/media/native_desktop_media_list.cc +++ b/chromium_src/chrome/browser/media/native_desktop_media_list.cc @@ -220,7 +220,7 @@ void NativeDesktopMediaList::Worker::Refresh( webrtc::SharedMemory* NativeDesktopMediaList::Worker::CreateSharedMemory( size_t size) { - return NULL; + return nullptr; } void NativeDesktopMediaList::Worker::OnCaptureCompleted( @@ -236,7 +236,7 @@ NativeDesktopMediaList::NativeDesktopMediaList( update_period_(base::TimeDelta::FromMilliseconds(kDefaultUpdatePeriod)), thumbnail_size_(100, 100), view_dialog_id_(-1), - observer_(NULL), + observer_(nullptr), weak_factory_(this) { base::SequencedWorkerPool* worker_pool = BrowserThread::GetBlockingPool(); capture_task_runner_ = worker_pool->GetSequencedTaskRunner( diff --git a/chromium_src/chrome/browser/printing/print_job.cc b/chromium_src/chrome/browser/printing/print_job.cc index 87971055e68..0d4ad0d4389 100644 --- a/chromium_src/chrome/browser/printing/print_job.cc +++ b/chromium_src/chrome/browser/printing/print_job.cc @@ -38,7 +38,7 @@ void HoldRefCallback(const scoped_refptr& owner, namespace printing { PrintJob::PrintJob() - : source_(NULL), + : source_(nullptr), worker_(), settings_(), is_job_pending_(false), @@ -106,7 +106,7 @@ void PrintJob::GetSettingsDone(const PrintSettings& new_settings, PrintJobWorker* PrintJob::DetachWorker(PrintJobWorkerOwner* new_owner) { NOTREACHED(); - return NULL; + return nullptr; } const PrintSettings& PrintJob::settings() const { @@ -139,7 +139,7 @@ void PrintJob::StartPrinting() { // Tell everyone! scoped_refptr details( - new JobEventDetails(JobEventDetails::NEW_DOC, document_.get(), NULL)); + new JobEventDetails(JobEventDetails::NEW_DOC, document_.get(), nullptr)); content::NotificationService::current()->Notify( chrome::NOTIFICATION_PRINT_JOB_EVENT, content::Source(this), @@ -163,7 +163,7 @@ void PrintJob::Stop() { ControlledWorkerShutdown(); } else { // Flush the cached document. - UpdatePrintedDocument(NULL); + UpdatePrintedDocument(nullptr); } } @@ -183,7 +183,7 @@ void PrintJob::Cancel() { } // Make sure a Cancel() is broadcast. scoped_refptr details( - new JobEventDetails(JobEventDetails::FAILED, NULL, NULL)); + new JobEventDetails(JobEventDetails::FAILED, nullptr, nullptr)); content::NotificationService::current()->Notify( chrome::NOTIFICATION_PRINT_JOB_EVENT, content::Source(this), @@ -207,7 +207,7 @@ bool PrintJob::FlushJob(base::TimeDelta timeout) { } void PrintJob::DisconnectSource() { - source_ = NULL; + source_ = nullptr; if (document_.get()) document_->DisconnectSource(); } @@ -388,7 +388,7 @@ void PrintJob::OnDocumentDone() { Stop(); scoped_refptr details( - new JobEventDetails(JobEventDetails::JOB_DONE, document_.get(), NULL)); + new JobEventDetails(JobEventDetails::JOB_DONE, document_.get(), nullptr)); content::NotificationService::current()->Notify( chrome::NOTIFICATION_PRINT_JOB_EVENT, content::Source(this), @@ -434,7 +434,7 @@ void PrintJob::ControlledWorkerShutdown() { is_job_pending_ = false; registrar_.RemoveAll(); - UpdatePrintedDocument(NULL); + UpdatePrintedDocument(nullptr); } void PrintJob::HoldUntilStopIsCalled() { diff --git a/chromium_src/chrome/browser/printing/print_job_manager.cc b/chromium_src/chrome/browser/printing/print_job_manager.cc index ec08a989233..a2e4fc1a718 100644 --- a/chromium_src/chrome/browser/printing/print_job_manager.cc +++ b/chromium_src/chrome/browser/printing/print_job_manager.cc @@ -41,7 +41,7 @@ scoped_refptr PrintQueriesQueue::PopPrinterQuery( return current_query; } } - return NULL; + return nullptr; } scoped_refptr PrintQueriesQueue::CreatePrinterQuery( @@ -90,7 +90,7 @@ void PrintJobManager::Shutdown() { StopJobs(true); if (queue_.get()) queue_->Shutdown(); - queue_ = NULL; + queue_ = nullptr; } void PrintJobManager::StopJobs(bool wait_for_finish) { diff --git a/chromium_src/chrome/browser/printing/print_job_worker.cc b/chromium_src/chrome/browser/printing/print_job_worker.cc index 7a88a8570c4..ad9bdf45bdb 100644 --- a/chromium_src/chrome/browser/printing/print_job_worker.cc +++ b/chromium_src/chrome/browser/printing/print_job_worker.cc @@ -62,9 +62,9 @@ gfx::NativeView PrintingContextDelegate::GetParentView() { content::RenderViewHost* view = content::RenderViewHost::FromID(render_process_id_, render_view_id_); if (!view) - return NULL; + return nullptr; content::WebContents* wc = content::WebContents::FromRenderViewHost(view); - return wc ? wc->GetNativeView() : NULL; + return wc ? wc->GetNativeView() : nullptr; } std::string PrintingContextDelegate::GetAppLocale() { @@ -343,7 +343,7 @@ void PrintJobWorker::OnDocumentDone() { base::RetainedRef(document_), nullptr)); // Makes sure the variables are reinitialized. - document_ = NULL; + document_ = nullptr; } void PrintJobWorker::SpoolPage(PrintedPage* page) { @@ -397,7 +397,7 @@ void PrintJobWorker::OnFailure() { Cancel(); // Makes sure the variables are reinitialized. - document_ = NULL; + document_ = nullptr; page_number_ = PageNumber::npos(); } diff --git a/chromium_src/chrome/browser/printing/print_view_manager_base.cc b/chromium_src/chrome/browser/printing/print_view_manager_base.cc index 2bbafdd8e55..7de8ae56fd7 100644 --- a/chromium_src/chrome/browser/printing/print_view_manager_base.cc +++ b/chromium_src/chrome/browser/printing/print_view_manager_base.cc @@ -394,7 +394,7 @@ void PrintViewManagerBase::ReleasePrintJob() { content::Source(print_job_.get())); print_job_->DisconnectSource(); // Don't close the worker thread. - print_job_ = NULL; + print_job_ = nullptr; } bool PrintViewManagerBase::RunInnerMessageLoop() { diff --git a/chromium_src/chrome/browser/printing/printer_query.cc b/chromium_src/chrome/browser/printing/printer_query.cc index 72e2b85f635..d36d51a9f89 100644 --- a/chromium_src/chrome/browser/printing/printer_query.cc +++ b/chromium_src/chrome/browser/printing/printer_query.cc @@ -122,7 +122,7 @@ bool PrinterQuery::is_callback_pending() const { } bool PrinterQuery::is_valid() const { - return worker_.get() != NULL; + return worker_.get() != nullptr; } } // namespace printing diff --git a/chromium_src/chrome/browser/printing/printing_message_filter.cc b/chromium_src/chrome/browser/printing/printing_message_filter.cc index 819c6af5b02..31a7cf535a6 100644 --- a/chromium_src/chrome/browser/printing/printing_message_filter.cc +++ b/chromium_src/chrome/browser/printing/printing_message_filter.cc @@ -246,7 +246,7 @@ content::WebContents* PrintingMessageFilter::GetWebContentsForRenderView( DCHECK_CURRENTLY_ON(BrowserThread::UI); content::RenderViewHost* view = content::RenderViewHost::FromID( render_process_id_, render_view_id); - return view ? content::WebContents::FromRenderViewHost(view) : NULL; + return view ? content::WebContents::FromRenderViewHost(view) : nullptr; } void PrintingMessageFilter::OnGetDefaultPrintSettings(IPC::Message* reply_msg) { diff --git a/chromium_src/chrome/browser/process_singleton_posix.cc b/chromium_src/chrome/browser/process_singleton_posix.cc index 5742b358520..cb624fec5ae 100644 --- a/chromium_src/chrome/browser/process_singleton_posix.cc +++ b/chromium_src/chrome/browser/process_singleton_posix.cc @@ -171,7 +171,7 @@ int WaitSocketForRead(int fd, const base::TimeDelta& timeout) { FD_ZERO(&read_fds); FD_SET(fd, &read_fds); - return HANDLE_EINTR(select(fd + 1, &read_fds, NULL, NULL, &tv)); + return HANDLE_EINTR(select(fd + 1, &read_fds, nullptr, nullptr, &tv)); } // Read a message from a socket fd, with an optional timeout. diff --git a/chromium_src/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc b/chromium_src/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc index 10c07906af9..bf4d0f02a66 100644 --- a/chromium_src/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc +++ b/chromium_src/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc @@ -26,7 +26,7 @@ PepperIsolatedFileSystemMessageFilter::Create(PP_Instance instance, int unused_render_frame_id; if (!host->GetRenderFrameIDsForInstance( instance, &render_process_id, &unused_render_frame_id)) { - return NULL; + return nullptr; } return new PepperIsolatedFileSystemMessageFilter( render_process_id, diff --git a/chromium_src/chrome/browser/speech/tts_controller_impl.cc b/chromium_src/chrome/browser/speech/tts_controller_impl.cc index 610ce165675..3147e855081 100644 --- a/chromium_src/chrome/browser/speech/tts_controller_impl.cc +++ b/chromium_src/chrome/browser/speech/tts_controller_impl.cc @@ -115,10 +115,10 @@ TtsControllerImpl* TtsControllerImpl::GetInstance() { } TtsControllerImpl::TtsControllerImpl() - : current_utterance_(NULL), + : current_utterance_(nullptr), paused_(false), - platform_impl_(NULL), - tts_engine_delegate_(NULL) { + platform_impl_(nullptr), + tts_engine_delegate_(nullptr) { } TtsControllerImpl::~TtsControllerImpl() { @@ -206,7 +206,7 @@ void TtsControllerImpl::SpeakNow(Utterance* utterance) { if (!sends_end_event) { utterance->Finish(); delete utterance; - current_utterance_ = NULL; + current_utterance_ = nullptr; SpeakNextUtterance(); } #endif @@ -222,7 +222,7 @@ void TtsControllerImpl::SpeakNow(Utterance* utterance) { voice, utterance->continuous_parameters()); if (!success) - current_utterance_ = NULL; + current_utterance_ = nullptr; // If the native voice wasn't able to process this speech, see if // the browser has built-in TTS that isn't loaded yet. @@ -323,7 +323,7 @@ void TtsControllerImpl::GetVoices(content::BrowserContext* browser_context, } bool TtsControllerImpl::IsSpeaking() { - return current_utterance_ != NULL || GetPlatformImpl()->IsSpeaking(); + return current_utterance_ != nullptr || GetPlatformImpl()->IsSpeaking(); } void TtsControllerImpl::FinishCurrentUtterance() { @@ -332,7 +332,7 @@ void TtsControllerImpl::FinishCurrentUtterance() { current_utterance_->OnTtsEvent(TTS_EVENT_INTERRUPTED, kInvalidCharIndex, std::string()); delete current_utterance_; - current_utterance_ = NULL; + current_utterance_ = nullptr; } } diff --git a/chromium_src/chrome/renderer/pepper/pepper_flash_menu_host.cc b/chromium_src/chrome/renderer/pepper/pepper_flash_menu_host.cc index 3b7a438f722..424b6ac6fdb 100644 --- a/chromium_src/chrome/renderer/pepper/pepper_flash_menu_host.cc +++ b/chromium_src/chrome/renderer/pepper/pepper_flash_menu_host.cc @@ -195,7 +195,7 @@ void PepperFlashMenuHost::OnMenuClosed(int request_id) { void PepperFlashMenuHost::SendMenuReply(int32_t result, int action) { ppapi::host::ReplyMessageContext reply_context( ppapi::proxy::ResourceMessageReplyParams(pp_resource(), 0), - NULL, + nullptr, MSG_ROUTING_NONE); reply_context.params.set_result(result); host()->SendReply(reply_context, PpapiPluginMsg_FlashMenu_ShowReply(action)); diff --git a/chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc b/chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc index 59046b328bf..6606d736c04 100644 --- a/chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc +++ b/chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc @@ -115,7 +115,7 @@ bool IsSimpleHeader(const std::string& lower_case_header_name, &lower_case_mime_type, &lower_case_charset, &had_charset, - NULL); + nullptr); return lower_case_mime_type == "application/x-www-form-urlencoded" || lower_case_mime_type == "multipart/form-data" || lower_case_mime_type == "text/plain"; diff --git a/chromium_src/chrome/renderer/printing/print_web_view_helper.cc b/chromium_src/chrome/renderer/printing/print_web_view_helper.cc index 7ff3471f953..0ab64248cf8 100644 --- a/chromium_src/chrome/renderer/printing/print_web_view_helper.cc +++ b/chromium_src/chrome/renderer/printing/print_web_view_helper.cc @@ -110,8 +110,8 @@ PrintMsg_Print_Params GetCssPrintParams( // Invalid page size and/or margins. We just use the default setting. if (new_content_width < 1 || new_content_height < 1) { - CHECK(frame != NULL); - page_css_params = GetCssPrintParams(NULL, page_index, page_params); + CHECK(frame != nullptr); + page_css_params = GetCssPrintParams(nullptr, page_index, page_params); return page_css_params; } @@ -254,7 +254,7 @@ void ComputeWebKitPrintParamsInDesiredDpi( blink::WebPlugin* GetPlugin(const blink::WebFrame* frame) { return frame->document().isPluginDocument() ? - frame->document().to().plugin() : NULL; + frame->document().to().plugin() : nullptr; } bool PrintingNodeOrPdfFrame(const blink::WebFrame* frame, @@ -323,7 +323,7 @@ FrameReference::FrameReference(blink::WebLocalFrame* frame) { } FrameReference::FrameReference() { - Reset(NULL); + Reset(nullptr); } FrameReference::~FrameReference() { @@ -334,20 +334,20 @@ void FrameReference::Reset(blink::WebLocalFrame* frame) { view_ = frame->view(); frame_ = frame; } else { - view_ = NULL; - frame_ = NULL; + view_ = nullptr; + frame_ = nullptr; } } blink::WebLocalFrame* FrameReference::GetFrame() { - if (view_ == NULL || frame_ == NULL) - return NULL; - for (blink::WebFrame* frame = view_->mainFrame(); frame != NULL; + if (view_ == nullptr || frame_ == nullptr) + return nullptr; + for (blink::WebFrame* frame = view_->mainFrame(); frame != nullptr; frame = frame->traverseNext(false)) { if (frame == frame_) return frame_; } - return NULL; + return nullptr; } blink::WebView* FrameReference::view() { @@ -477,7 +477,7 @@ PrepareFrameAndViewForPrint::PrepareFrameAndViewForPrint( frame->printBegin(web_print_params_, node_to_print_); print_params = CalculatePrintParamsForCss(frame, 0, print_params, ignore_css_margins, fit_to_page, - NULL); + nullptr); frame->printEnd(); } ComputeWebKitPrintParamsInDesiredDpi(print_params, &web_print_params_); @@ -623,7 +623,7 @@ void PrepareFrameAndViewForPrint::FinishPrinting() { web_view->close(); } } - frame_.Reset(NULL); + frame_.Reset(nullptr); on_ready_.Reset(); } diff --git a/chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.cc b/chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.cc index 46465f4dfd4..4b1b0395627 100644 --- a/chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.cc +++ b/chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.cc @@ -301,8 +301,8 @@ bool SpellcheckCharAttribute::OutputDefault(UChar c, // SpellcheckWordIterator implementation: SpellcheckWordIterator::SpellcheckWordIterator() - : text_(NULL), - attribute_(NULL), + : text_(nullptr), + attribute_(nullptr), iterator_() { } diff --git a/chromium_src/extensions/common/url_pattern.cc b/chromium_src/extensions/common/url_pattern.cc index 4303689fe81..b963626b98f 100644 --- a/chromium_src/extensions/common/url_pattern.cc +++ b/chromium_src/extensions/common/url_pattern.cc @@ -346,7 +346,7 @@ bool URLPattern::SetPort(const std::string& port) { bool URLPattern::MatchesURL(const GURL& test) const { const GURL* test_url = &test; - bool has_inner_url = test.inner_url() != NULL; + bool has_inner_url = test.inner_url() != nullptr; if (has_inner_url) { if (!test.SchemeIsFileSystem()) @@ -370,7 +370,7 @@ bool URLPattern::MatchesURL(const GURL& test) const { bool URLPattern::MatchesSecurityOrigin(const GURL& test) const { const GURL* test_url = &test; - bool has_inner_url = test.inner_url() != NULL; + bool has_inner_url = test.inner_url() != nullptr; if (has_inner_url) { if (!test.SchemeIsFileSystem()) diff --git a/chromium_src/net/test/embedded_test_server/stream_listen_socket.cc b/chromium_src/net/test/embedded_test_server/stream_listen_socket.cc index 2514c636cbe..0b93c7a9369 100644 --- a/chromium_src/net/test/embedded_test_server/stream_listen_socket.cc +++ b/chromium_src/net/test/embedded_test_server/stream_listen_socket.cc @@ -123,7 +123,7 @@ int StreamListenSocket::GetPeerAddress(IPEndPoint* address) const { } SocketDescriptor StreamListenSocket::AcceptSocket() { - SocketDescriptor conn = HANDLE_EINTR(accept(socket_, NULL, NULL)); + SocketDescriptor conn = HANDLE_EINTR(accept(socket_, nullptr, nullptr)); if (conn == kInvalidSocket) LOG(ERROR) << "Error accepting connection."; else From 04f9d35312a37a4e3d9d6a1785d7b1830b0234b6 Mon Sep 17 00:00:00 2001 From: Haojian Wu Date: Sun, 10 Jul 2016 13:09:55 +0200 Subject: [PATCH 2/6] Modernize to C++11: Use `auto` key to improve code readability and maintainability. --- atom/app/uv_task_runner.cc | 2 +- atom/browser/api/atom_api_session.cc | 2 +- atom/browser/common_web_contents_delegate.cc | 9 ++++----- atom/browser/net/asar/asar_protocol_handler.cc | 2 +- atom/browser/net/asar/url_request_asar_job.cc | 4 ++-- atom/browser/net/atom_url_request_job_factory.cc | 6 +++--- atom/browser/net/url_request_async_asar_job.cc | 2 +- atom/browser/net/url_request_buffer_job.cc | 2 +- atom/browser/net/url_request_string_job.cc | 2 +- atom/common/native_mate_converters/callback.cc | 2 +- .../native_mate_converters/v8_value_converter.cc | 4 ++-- atom/utility/atom_content_utility_client.cc | 3 +-- .../browser/extensions/global_shortcut_listener.cc | 12 +++++------- .../browser/media/native_desktop_media_list.cc | 5 ++--- chromium_src/chrome/browser/printing/print_job.cc | 6 ++---- .../chrome/browser/printing/print_job_manager.cc | 11 +++++------ .../chrome/browser/printing/print_job_worker.cc | 2 +- .../printing/print_preview_message_handler.cc | 2 +- .../chrome/browser/process_singleton_posix.cc | 7 ++----- .../pepper/pepper_flash_clipboard_message_filter.cc | 4 +--- .../chrome/browser/speech/tts_controller_impl.cc | 9 +++------ chromium_src/extensions/common/url_pattern.cc | 6 ++---- 22 files changed, 43 insertions(+), 61 deletions(-) diff --git a/atom/app/uv_task_runner.cc b/atom/app/uv_task_runner.cc index 097cc3bcda1..7857ace3a2b 100644 --- a/atom/app/uv_task_runner.cc +++ b/atom/app/uv_task_runner.cc @@ -21,7 +21,7 @@ UvTaskRunner::~UvTaskRunner() { bool UvTaskRunner::PostDelayedTask(const tracked_objects::Location& from_here, const base::Closure& task, base::TimeDelta delay) { - uv_timer_t* timer = new uv_timer_t; + auto* timer = new uv_timer_t; timer->data = this; uv_timer_init(loop_, timer); uv_timer_start(timer, UvTaskRunner::OnTimeout, delay.InMilliseconds(), 0); diff --git a/atom/browser/api/atom_api_session.cc b/atom/browser/api/atom_api_session.cc index 4a4ffba0c84..5b517c10a1b 100644 --- a/atom/browser/api/atom_api_session.cc +++ b/atom/browser/api/atom_api_session.cc @@ -266,7 +266,7 @@ void DoCacheActionInIO( // Call GetBackend and make the backend's ptr accessable in OnGetBackend. using BackendPtr = disk_cache::Backend*; - BackendPtr* backend_ptr = new BackendPtr(nullptr); + auto* backend_ptr = new BackendPtr(nullptr); net::CompletionCallback on_get_backend = base::Bind(&OnGetBackend, base::Owned(backend_ptr), action, callback); int rv = http_cache->GetBackend(backend_ptr, on_get_backend); diff --git a/atom/browser/common_web_contents_delegate.cc b/atom/browser/common_web_contents_delegate.cc index c275d4aee74..5dcc3823c91 100644 --- a/atom/browser/common_web_contents_delegate.cc +++ b/atom/browser/common_web_contents_delegate.cc @@ -94,7 +94,7 @@ FileSystem CreateFileSystemStruct( } base::DictionaryValue* CreateFileSystemValue(const FileSystem& file_system) { - base::DictionaryValue* file_system_value = new base::DictionaryValue(); + auto* file_system_value = new base::DictionaryValue(); file_system_value->SetString("fileSystemName", file_system.file_system_name); file_system_value->SetString("rootURL", file_system.root_url); file_system_value->SetString("fileSystemPath", file_system.file_system_path); @@ -377,7 +377,7 @@ content::SecurityStyle CommonWebContentsDelegate::GetSecurityStyle( void CommonWebContentsDelegate::DevToolsSaveToFile( const std::string& url, const std::string& content, bool save_as) { base::FilePath path; - PathsMap::iterator it = saved_files_.find(url); + auto it = saved_files_.find(url); if (it != saved_files_.end() && !save_as) { path = it->second; } else { @@ -402,7 +402,7 @@ void CommonWebContentsDelegate::DevToolsSaveToFile( void CommonWebContentsDelegate::DevToolsAppendToFile( const std::string& url, const std::string& content) { - PathsMap::iterator it = saved_files_.find(url); + auto it = saved_files_.find(url); if (it == saved_files_.end()) return; @@ -610,8 +610,7 @@ void CommonWebContentsDelegate::OnDevToolsSearchCompleted( const std::string& file_system_path, const std::vector& file_paths) { base::ListValue file_paths_value; - for (std::vector::const_iterator it(file_paths.begin()); - it != file_paths.end(); ++it) { + for (auto it(file_paths.begin()); it != file_paths.end(); ++it) { file_paths_value.AppendString(*it); } base::FundamentalValue request_id_value(request_id); diff --git a/atom/browser/net/asar/asar_protocol_handler.cc b/atom/browser/net/asar/asar_protocol_handler.cc index 324f8339c8c..ffa2b3c9f28 100644 --- a/atom/browser/net/asar/asar_protocol_handler.cc +++ b/atom/browser/net/asar/asar_protocol_handler.cc @@ -22,7 +22,7 @@ net::URLRequestJob* AsarProtocolHandler::MaybeCreateJob( net::NetworkDelegate* network_delegate) const { base::FilePath full_path; net::FileURLToFilePath(request->url(), &full_path); - URLRequestAsarJob* job = new URLRequestAsarJob(request, network_delegate); + auto* job = new URLRequestAsarJob(request, network_delegate); job->Initialize(file_task_runner_, full_path); return job; } diff --git a/atom/browser/net/asar/url_request_asar_job.cc b/atom/browser/net/asar/url_request_asar_job.cc index 9bcdfc6ff78..2352668e179 100644 --- a/atom/browser/net/asar/url_request_asar_job.cc +++ b/atom/browser/net/asar/url_request_asar_job.cc @@ -111,7 +111,7 @@ void URLRequestAsarJob::Start() { if (rv != net::ERR_IO_PENDING) DidOpen(rv); } else if (type_ == TYPE_FILE) { - FileMetaInfo* meta_info = new FileMetaInfo(); + auto* meta_info = new FileMetaInfo(); file_task_runner_->PostTaskAndReply( FROM_HERE, base::Bind(&URLRequestAsarJob::FetchMetaInfo, file_path_, @@ -224,7 +224,7 @@ int URLRequestAsarJob::GetResponseCode() const { void URLRequestAsarJob::GetResponseInfo(net::HttpResponseInfo* info) { std::string status("HTTP/1.1 200 OK"); - net::HttpResponseHeaders* headers = new net::HttpResponseHeaders(status); + auto* headers = new net::HttpResponseHeaders(status); headers->AddHeader(atom::kCORSHeader); info->headers = headers; diff --git a/atom/browser/net/atom_url_request_job_factory.cc b/atom/browser/net/atom_url_request_job_factory.cc index d0caf183e91..7e2eb95149c 100644 --- a/atom/browser/net/atom_url_request_job_factory.cc +++ b/atom/browser/net/atom_url_request_job_factory.cc @@ -27,7 +27,7 @@ bool AtomURLRequestJobFactory::SetProtocolHandler( const std::string& scheme, std::unique_ptr protocol_handler) { if (!protocol_handler) { - ProtocolHandlerMap::iterator it = protocol_handler_map_.find(scheme); + auto it = protocol_handler_map_.find(scheme); if (it == protocol_handler_map_.end()) return false; @@ -66,7 +66,7 @@ ProtocolHandler* AtomURLRequestJobFactory::GetProtocolHandler( const std::string& scheme) const { DCHECK_CURRENTLY_ON(BrowserThread::IO); - ProtocolHandlerMap::const_iterator it = protocol_handler_map_.find(scheme); + auto it = protocol_handler_map_.find(scheme); if (it == protocol_handler_map_.end()) return nullptr; return it->second; @@ -87,7 +87,7 @@ net::URLRequestJob* AtomURLRequestJobFactory::MaybeCreateJobWithProtocolHandler( net::NetworkDelegate* network_delegate) const { DCHECK_CURRENTLY_ON(BrowserThread::IO); - ProtocolHandlerMap::const_iterator it = protocol_handler_map_.find(scheme); + auto it = protocol_handler_map_.find(scheme); if (it == protocol_handler_map_.end()) return nullptr; return it->second->MaybeCreateJob(request, network_delegate); diff --git a/atom/browser/net/url_request_async_asar_job.cc b/atom/browser/net/url_request_async_asar_job.cc index 1234bccf430..942f06233e3 100644 --- a/atom/browser/net/url_request_async_asar_job.cc +++ b/atom/browser/net/url_request_async_asar_job.cc @@ -40,7 +40,7 @@ void URLRequestAsyncAsarJob::StartAsync(std::unique_ptr options) { void URLRequestAsyncAsarJob::GetResponseInfo(net::HttpResponseInfo* info) { std::string status("HTTP/1.1 200 OK"); - net::HttpResponseHeaders* headers = new net::HttpResponseHeaders(status); + auto* headers = new net::HttpResponseHeaders(status); headers->AddHeader(kCORSHeader); info->headers = headers; diff --git a/atom/browser/net/url_request_buffer_job.cc b/atom/browser/net/url_request_buffer_job.cc index c713099c76a..70f46030817 100644 --- a/atom/browser/net/url_request_buffer_job.cc +++ b/atom/browser/net/url_request_buffer_job.cc @@ -72,7 +72,7 @@ void URLRequestBufferJob::GetResponseInfo(net::HttpResponseInfo* info) { status.append(" "); status.append(net::GetHttpReasonPhrase(status_code_)); status.append("\0\0", 2); - net::HttpResponseHeaders* headers = new net::HttpResponseHeaders(status); + auto* headers = new net::HttpResponseHeaders(status); headers->AddHeader(kCORSHeader); diff --git a/atom/browser/net/url_request_string_job.cc b/atom/browser/net/url_request_string_job.cc index 59945e66db0..abec345e63d 100644 --- a/atom/browser/net/url_request_string_job.cc +++ b/atom/browser/net/url_request_string_job.cc @@ -31,7 +31,7 @@ void URLRequestStringJob::StartAsync(std::unique_ptr options) { void URLRequestStringJob::GetResponseInfo(net::HttpResponseInfo* info) { std::string status("HTTP/1.1 200 OK"); - net::HttpResponseHeaders* headers = new net::HttpResponseHeaders(status); + auto* headers = new net::HttpResponseHeaders(status); headers->AddHeader(kCORSHeader); diff --git a/atom/common/native_mate_converters/callback.cc b/atom/common/native_mate_converters/callback.cc index 8bf5c459b0a..dc6d30fd23d 100644 --- a/atom/common/native_mate_converters/callback.cc +++ b/atom/common/native_mate_converters/callback.cc @@ -123,7 +123,7 @@ v8::Local CreateFunctionFromTranslater( v8::Local call_translater = v8::Local::New(isolate, g_call_translater); - TranslaterHolder* holder = new TranslaterHolder; + auto* holder = new TranslaterHolder; holder->translater = translater; return BindFunctionWith(isolate, isolate->GetCurrentContext(), diff --git a/atom/common/native_mate_converters/v8_value_converter.cc b/atom/common/native_mate_converters/v8_value_converter.cc index a4ecc3ded97..37e09aec575 100644 --- a/atom/common/native_mate_converters/v8_value_converter.cc +++ b/atom/common/native_mate_converters/v8_value_converter.cc @@ -55,7 +55,7 @@ class V8ValueConverter::FromV8ValueState { // hash. Different hash obviously means different objects, but two objects // in a couple of thousands could have the same identity hash. std::pair range = unique_map_.equal_range(hash); - for (Iterator it = range.first; it != range.second; ++it) { + for (auto it = range.first; it != range.second; ++it) { // Operator == for handles actually compares the underlying objects. if (it->second == handle) return false; @@ -295,7 +295,7 @@ base::Value* V8ValueConverter::FromV8Array( val->CreationContext() != isolate->GetCurrentContext()) scope.reset(new v8::Context::Scope(val->CreationContext())); - base::ListValue* result = new base::ListValue(); + auto* result = new base::ListValue(); // Only fields with integer keys are carried over to the ListValue. for (uint32_t i = 0; i < val->Length(); ++i) { diff --git a/atom/utility/atom_content_utility_client.cc b/atom/utility/atom_content_utility_client.cc index aff567fbcaa..518be30510c 100644 --- a/atom/utility/atom_content_utility_client.cc +++ b/atom/utility/atom_content_utility_client.cc @@ -58,8 +58,7 @@ bool AtomContentUtilityClient::OnMessageReceived( IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() - for (Handlers::iterator it = handlers_.begin(); - !handled && it != handlers_.end(); ++it) { + for (auto it = handlers_.begin(); !handled && it != handlers_.end(); ++it) { handled = (*it)->OnMessageReceived(message); } diff --git a/chromium_src/chrome/browser/extensions/global_shortcut_listener.cc b/chromium_src/chrome/browser/extensions/global_shortcut_listener.cc index 925cb40d0f9..937b54c8d7b 100644 --- a/chromium_src/chrome/browser/extensions/global_shortcut_listener.cc +++ b/chromium_src/chrome/browser/extensions/global_shortcut_listener.cc @@ -53,7 +53,7 @@ void GlobalShortcutListener::UnregisterAccelerator( if (IsShortcutHandlingSuspended()) return; - AcceleratorMap::iterator it = accelerator_map_.find(accelerator); + auto it = accelerator_map_.find(accelerator); // We should never get asked to unregister something that we didn't register. DCHECK(it != accelerator_map_.end()); // The caller should call this function with the right observer. @@ -70,10 +70,10 @@ void GlobalShortcutListener::UnregisterAccelerators(Observer* observer) { if (IsShortcutHandlingSuspended()) return; - AcceleratorMap::iterator it = accelerator_map_.begin(); + auto it = accelerator_map_.begin(); while (it != accelerator_map_.end()) { if (it->second == observer) { - AcceleratorMap::iterator to_remove = it++; + auto to_remove = it++; UnregisterAccelerator(to_remove->first, observer); } else { ++it; @@ -87,9 +87,7 @@ void GlobalShortcutListener::SetShortcutHandlingSuspended(bool suspended) { return; shortcut_handling_suspended_ = suspended; - for (AcceleratorMap::iterator it = accelerator_map_.begin(); - it != accelerator_map_.end(); - ++it) { + for (auto it = accelerator_map_.begin(); it != accelerator_map_.end(); ++it) { // On Linux, when shortcut handling is suspended we cannot simply early // return in NotifyKeyPressed (similar to what we do for non-global // shortcuts) because we'd eat the keyboard event thereby preventing the @@ -108,7 +106,7 @@ bool GlobalShortcutListener::IsShortcutHandlingSuspended() const { void GlobalShortcutListener::NotifyKeyPressed( const ui::Accelerator& accelerator) { - AcceleratorMap::iterator iter = accelerator_map_.find(accelerator); + auto iter = accelerator_map_.find(accelerator); if (iter == accelerator_map_.end()) { // This should never occur, because if it does, we have failed to unregister // or failed to clean up the map after unregistering the shortcut. diff --git a/chromium_src/chrome/browser/media/native_desktop_media_list.cc b/chromium_src/chrome/browser/media/native_desktop_media_list.cc index 410a9430a33..8908a604867 100644 --- a/chromium_src/chrome/browser/media/native_desktop_media_list.cc +++ b/chromium_src/chrome/browser/media/native_desktop_media_list.cc @@ -152,8 +152,7 @@ void NativeDesktopMediaList::Worker::Refresh( if (window_capturer_) { webrtc::WindowCapturer::WindowList windows; if (window_capturer_->GetWindowList(&windows)) { - for (webrtc::WindowCapturer::WindowList::iterator it = windows.begin(); - it != windows.end(); ++it) { + for (auto it = windows.begin(); it != windows.end(); ++it) { // Skip the picker dialog window. if (it->id != view_dialog_id) { sources.push_back(SourceDescription( @@ -199,7 +198,7 @@ void NativeDesktopMediaList::Worker::Refresh( new_image_hashes[source.id] = frame_hash; // Scale the image only if it has changed. - ImageHashesMap::iterator it = image_hashes_.find(source.id); + auto it = image_hashes_.find(source.id); if (it == image_hashes_.end() || it->second != frame_hash) { gfx::ImageSkia thumbnail = ScaleDesktopFrame(std::move(current_frame_), thumbnail_size); diff --git a/chromium_src/chrome/browser/printing/print_job.cc b/chromium_src/chrome/browser/printing/print_job.cc index 0d4ad0d4389..abc1f3c652f 100644 --- a/chromium_src/chrome/browser/printing/print_job.cc +++ b/chromium_src/chrome/browser/printing/print_job.cc @@ -71,10 +71,8 @@ void PrintJob::Initialize(PrintJobWorkerOwner* job, worker_.reset(job->DetachWorker(this)); settings_ = job->settings(); - PrintedDocument* new_doc = - new PrintedDocument(settings_, - source_, - job->cookie(), + auto* new_doc = + new PrintedDocument(settings_, source_, job->cookie(), content::BrowserThread::GetBlockingPool()); new_doc->set_page_count(page_count); UpdatePrintedDocument(new_doc); diff --git a/chromium_src/chrome/browser/printing/print_job_manager.cc b/chromium_src/chrome/browser/printing/print_job_manager.cc index a2e4fc1a718..9f009ce859e 100644 --- a/chromium_src/chrome/browser/printing/print_job_manager.cc +++ b/chromium_src/chrome/browser/printing/print_job_manager.cc @@ -32,8 +32,8 @@ void PrintQueriesQueue::QueuePrinterQuery(PrinterQuery* job) { scoped_refptr PrintQueriesQueue::PopPrinterQuery( int document_cookie) { base::AutoLock lock(lock_); - for (PrinterQueries::iterator itr = queued_queries_.begin(); - itr != queued_queries_.end(); ++itr) { + for (auto itr = queued_queries_.begin(); itr != queued_queries_.end(); + ++itr) { if ((*itr)->cookie() == document_cookie && !(*itr)->is_callback_pending()) { scoped_refptr current_query(*itr); queued_queries_.erase(itr); @@ -61,8 +61,8 @@ void PrintQueriesQueue::Shutdown() { // Stop all pending queries, requests to generate print preview do not have // corresponding PrintJob, so any pending preview requests are not covered // by PrintJobManager::StopJobs and should be stopped explicitly. - for (PrinterQueries::iterator itr = queries_to_stop.begin(); - itr != queries_to_stop.end(); ++itr) { + for (auto itr = queries_to_stop.begin(); itr != queries_to_stop.end(); + ++itr) { (*itr)->PostTask(FROM_HERE, base::Bind(&PrinterQuery::StopWorker, *itr)); } } @@ -99,8 +99,7 @@ void PrintJobManager::StopJobs(bool wait_for_finish) { PrintJobs to_stop; to_stop.swap(current_jobs_); - for (PrintJobs::const_iterator job = to_stop.begin(); job != to_stop.end(); - ++job) { + for (auto job = to_stop.begin(); job != to_stop.end(); ++job) { // Wait for two minutes for the print job to be spooled. if (wait_for_finish) (*job)->FlushJob(base::TimeDelta::FromMinutes(2)); diff --git a/chromium_src/chrome/browser/printing/print_job_worker.cc b/chromium_src/chrome/browser/printing/print_job_worker.cc index ad9bdf45bdb..b2040c46384 100644 --- a/chromium_src/chrome/browser/printing/print_job_worker.cc +++ b/chromium_src/chrome/browser/printing/print_job_worker.cc @@ -75,7 +75,7 @@ void NotificationCallback(PrintJobWorkerOwner* print_job, JobEventDetails::Type detail_type, PrintedDocument* document, PrintedPage* page) { - JobEventDetails* details = new JobEventDetails(detail_type, document, page); + auto* details = new JobEventDetails(detail_type, document, page); content::NotificationService::current()->Notify( chrome::NOTIFICATION_PRINT_JOB_EVENT, // We know that is is a PrintJob object in this circumstance. diff --git a/chromium_src/chrome/browser/printing/print_preview_message_handler.cc b/chromium_src/chrome/browser/printing/print_preview_message_handler.cc index d1f3660f8d2..9e1fca5c469 100644 --- a/chromium_src/chrome/browser/printing/print_preview_message_handler.cc +++ b/chromium_src/chrome/browser/printing/print_preview_message_handler.cc @@ -48,7 +48,7 @@ char* CopyPDFDataOnIOThread( if (!shared_buf->Map(params.data_size)) return nullptr; char* memory_pdf_data = static_cast(shared_buf->memory()); - char* pdf_data = new char[params.data_size]; + auto* pdf_data = new char[params.data_size]; memcpy(pdf_data, memory_pdf_data, params.data_size); return pdf_data; } diff --git a/chromium_src/chrome/browser/process_singleton_posix.cc b/chromium_src/chrome/browser/process_singleton_posix.cc index cb624fec5ae..2f99a0b98ec 100644 --- a/chromium_src/chrome/browser/process_singleton_posix.cc +++ b/chromium_src/chrome/browser/process_singleton_posix.cc @@ -579,9 +579,7 @@ void ProcessSingleton::LinuxWatcher::OnFileCanReadWithoutBlocking(int fd) { } int rv = base::SetNonBlocking(connection_socket); DCHECK_EQ(0, rv) << "Failed to make non-blocking socket."; - SocketReader* reader = new SocketReader(this, - ui_message_loop_, - connection_socket); + auto* reader = new SocketReader(this, ui_message_loop_, connection_socket); readers_.insert(reader); } @@ -822,8 +820,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout( to_send.append(current_dir.value()); const std::vector& argv = atom::AtomCommandLine::argv(); - for (std::vector::const_iterator it = argv.begin(); - it != argv.end(); ++it) { + for (auto it = argv.begin(); it != argv.end(); ++it) { to_send.push_back(kTokenDelimiter); to_send.append(*it); } diff --git a/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc b/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc index 4e66d772ec3..76b6ed3a9a8 100644 --- a/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc +++ b/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc @@ -86,9 +86,7 @@ std::string ReadDataFromPickle(const base::string16& format, bool WriteDataToPickle(const std::map& data, base::Pickle* pickle) { pickle->WriteUInt32(data.size()); - for (std::map::const_iterator it = data.begin(); - it != data.end(); - ++it) { + for (auto it = data.begin(); it != data.end(); ++it) { if (!pickle->WriteString16(it->first)) return false; if (!pickle->WriteString(it->second)) diff --git a/chromium_src/chrome/browser/speech/tts_controller_impl.cc b/chromium_src/chrome/browser/speech/tts_controller_impl.cc index 3147e855081..fe3ab7f1c21 100644 --- a/chromium_src/chrome/browser/speech/tts_controller_impl.cc +++ b/chromium_src/chrome/browser/speech/tts_controller_impl.cc @@ -415,10 +415,8 @@ int TtsControllerImpl::GetMatchingVoice( if (utterance->required_event_types().size() > 0) { bool has_all_required_event_types = true; - for (std::set::const_iterator iter = - utterance->required_event_types().begin(); - iter != utterance->required_event_types().end(); - ++iter) { + for (auto iter = utterance->required_event_types().begin(); + iter != utterance->required_event_types().end(); ++iter) { if (voice.events.find(*iter) == voice.events.end()) { has_all_required_event_types = false; break; @@ -436,8 +434,7 @@ int TtsControllerImpl::GetMatchingVoice( } void TtsControllerImpl::VoicesChanged() { - for (std::set::iterator iter = - voices_changed_delegates_.begin(); + for (auto iter = voices_changed_delegates_.begin(); iter != voices_changed_delegates_.end(); ++iter) { (*iter)->OnVoicesChanged(); } diff --git a/chromium_src/extensions/common/url_pattern.cc b/chromium_src/extensions/common/url_pattern.cc index b963626b98f..dc39d95e98e 100644 --- a/chromium_src/extensions/common/url_pattern.cc +++ b/chromium_src/extensions/common/url_pattern.cc @@ -543,8 +543,7 @@ bool URLPattern::Contains(const URLPattern& other) const { bool URLPattern::MatchesAnyScheme( const std::vector& schemes) const { - for (std::vector::const_iterator i = schemes.begin(); - i != schemes.end(); ++i) { + for (auto i = schemes.begin(); i != schemes.end(); ++i) { if (MatchesScheme(*i)) return true; } @@ -554,8 +553,7 @@ bool URLPattern::MatchesAnyScheme( bool URLPattern::MatchesAllSchemes( const std::vector& schemes) const { - for (std::vector::const_iterator i = schemes.begin(); - i != schemes.end(); ++i) { + for (auto i = schemes.begin(); i != schemes.end(); ++i) { if (!MatchesScheme(*i)) return false; } From 3bdeac98bf079f6cf9fdf67cb66a2084eb6aad0d Mon Sep 17 00:00:00 2001 From: Haojian Wu Date: Sun, 10 Jul 2016 13:21:42 +0200 Subject: [PATCH 3/6] Modernize to C++11: use override. --- atom/renderer/api/atom_api_web_frame.cc | 2 +- chromium_src/chrome/browser/printing/print_job_worker.cc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/atom/renderer/api/atom_api_web_frame.cc b/atom/renderer/api/atom_api_web_frame.cc index 0b291d3b552..dce72b58095 100644 --- a/atom/renderer/api/atom_api_web_frame.cc +++ b/atom/renderer/api/atom_api_web_frame.cc @@ -39,7 +39,7 @@ class ScriptExecutionCallback : public blink::WebScriptExecutionCallback { explicit ScriptExecutionCallback(const CompletionCallback& callback) : callback_(callback) {} - ~ScriptExecutionCallback() {} + ~ScriptExecutionCallback() override {} void completed( const blink::WebVector>& result) override { diff --git a/chromium_src/chrome/browser/printing/print_job_worker.cc b/chromium_src/chrome/browser/printing/print_job_worker.cc index b2040c46384..33a8b7d7352 100644 --- a/chromium_src/chrome/browser/printing/print_job_worker.cc +++ b/chromium_src/chrome/browser/printing/print_job_worker.cc @@ -38,10 +38,10 @@ void HoldRefCallback(const scoped_refptr& owner, class PrintingContextDelegate : public PrintingContext::Delegate { public: PrintingContextDelegate(int render_process_id, int render_view_id); - virtual ~PrintingContextDelegate(); + ~PrintingContextDelegate() override; - virtual gfx::NativeView GetParentView() override; - virtual std::string GetAppLocale() override; + gfx::NativeView GetParentView() override; + std::string GetAppLocale() override; private: int render_process_id_; From 55b3f1936f884c99f6eff475af221b4448ed2c93 Mon Sep 17 00:00:00 2001 From: Haojian Wu Date: Sun, 10 Jul 2016 13:32:40 +0200 Subject: [PATCH 4/6] Modernize to C++11: Use for-range loop. --- atom/browser/api/atom_api_session.cc | 6 +++--- atom/browser/api/atom_api_web_contents.cc | 6 +++--- atom/browser/common_web_contents_delegate.cc | 8 ++++---- atom/browser/ui/accelerator_util.cc | 4 ++-- atom/browser/window_list.cc | 4 ++-- atom/common/api/atom_api_native_image.cc | 6 +++--- atom/renderer/atom_render_view_observer.cc | 6 +++--- .../extensions/global_shortcut_listener.cc | 6 +++--- .../browser/media/native_desktop_media_list.cc | 16 ++++++++-------- .../browser/printing/print_job_manager.cc | 11 +++++------ .../chrome/browser/process_singleton_posix.cc | 4 ++-- .../pepper_flash_clipboard_message_filter.cc | 6 +++--- .../pepper/widevine_cdm_message_filter.cc | 12 +++++------- .../browser/speech/tts_controller_impl.cc | 10 ++++------ .../renderer/media/chrome_key_systems.cc | 8 ++++---- .../renderer/printing/print_web_view_helper.cc | 6 +++--- chromium_src/extensions/common/url_pattern.cc | 18 +++++++++--------- 17 files changed, 66 insertions(+), 71 deletions(-) diff --git a/atom/browser/api/atom_api_session.cc b/atom/browser/api/atom_api_session.cc index 5b517c10a1b..ae5854df538 100644 --- a/atom/browser/api/atom_api_session.cc +++ b/atom/browser/api/atom_api_session.cc @@ -241,10 +241,10 @@ void OnGetBackend(disk_cache::Backend** backend_ptr, } else if (action == Session::CacheAction::STATS) { base::StringPairs stats; (*backend_ptr)->GetStats(&stats); - for (size_t i = 0; i < stats.size(); ++i) { - if (stats[i].first == "Current size") { + for (auto& stat : stats) { + if (stat.first == "Current size") { int current_size; - base::StringToInt(stats[i].second, ¤t_size); + base::StringToInt(stat.second, ¤t_size); RunCallbackInUI(callback, current_size); break; } diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc index 2b1d03dbd27..8622942668b 100644 --- a/atom/browser/api/atom_api_web_contents.cc +++ b/atom/browser/api/atom_api_web_contents.cc @@ -685,10 +685,10 @@ void WebContents::TitleWasSet(content::NavigationEntry* entry, void WebContents::DidUpdateFaviconURL( const std::vector& urls) { std::set unique_urls; - for (auto iter = urls.begin(); iter != urls.end(); ++iter) { - if (iter->icon_type != content::FaviconURL::FAVICON) + for (const auto& iter : urls) { + if (iter.icon_type != content::FaviconURL::FAVICON) continue; - const GURL& url = iter->icon_url; + const GURL& url = iter.icon_url; if (url.is_valid()) unique_urls.insert(url); } diff --git a/atom/browser/common_web_contents_delegate.cc b/atom/browser/common_web_contents_delegate.cc index 5dcc3823c91..e94203e0b5a 100644 --- a/atom/browser/common_web_contents_delegate.cc +++ b/atom/browser/common_web_contents_delegate.cc @@ -435,8 +435,8 @@ void CommonWebContentsDelegate::DevToolsRequestFileSystems() { } base::ListValue file_system_value; - for (size_t i = 0; i < file_systems.size(); ++i) - file_system_value.Append(CreateFileSystemValue(file_systems[i])); + for (auto& file_system : file_systems) + file_system_value.Append(CreateFileSystemValue(file_system)); web_contents_->CallClientFunction("DevToolsAPI.fileSystemsLoaded", &file_system_value, nullptr, nullptr); } @@ -610,8 +610,8 @@ void CommonWebContentsDelegate::OnDevToolsSearchCompleted( const std::string& file_system_path, const std::vector& file_paths) { base::ListValue file_paths_value; - for (auto it(file_paths.begin()); it != file_paths.end(); ++it) { - file_paths_value.AppendString(*it); + for (const auto& file_path : file_paths) { + file_paths_value.AppendString(file_path); } base::FundamentalValue request_id_value(request_id); base::StringValue file_system_path_value(file_system_path); diff --git a/atom/browser/ui/accelerator_util.cc b/atom/browser/ui/accelerator_util.cc index 361cd88e05d..1c26af1b396 100644 --- a/atom/browser/ui/accelerator_util.cc +++ b/atom/browser/ui/accelerator_util.cc @@ -30,9 +30,9 @@ bool StringToAccelerator(const std::string& shortcut, // Now, parse it into an accelerator. int modifiers = ui::EF_NONE; ui::KeyboardCode key = ui::VKEY_UNKNOWN; - for (size_t i = 0; i < tokens.size(); i++) { + for (auto& token : tokens) { bool shifted = false; - ui::KeyboardCode code = atom::KeyboardCodeFromStr(tokens[i], &shifted); + ui::KeyboardCode code = atom::KeyboardCodeFromStr(token, &shifted); if (shifted) modifiers |= ui::EF_SHIFT_DOWN; switch (code) { diff --git a/atom/browser/window_list.cc b/atom/browser/window_list.cc index 537499022ea..3568df9e6df 100644 --- a/atom/browser/window_list.cc +++ b/atom/browser/window_list.cc @@ -70,8 +70,8 @@ void WindowList::RemoveObserver(WindowListObserver* observer) { // static void WindowList::CloseAllWindows() { WindowVector windows = GetInstance()->windows_; - for (size_t i = 0; i < windows.size(); ++i) - windows[i]->Close(); + for (auto& window : windows) + window->Close(); } WindowList::WindowList() { diff --git a/atom/common/api/atom_api_native_image.cc b/atom/common/api/atom_api_native_image.cc index 14500496ebf..f694ffe7e96 100644 --- a/atom/common/api/atom_api_native_image.cc +++ b/atom/common/api/atom_api_native_image.cc @@ -63,10 +63,10 @@ float GetScaleFactorFromPath(const base::FilePath& path) { // We don't try to convert string to float here because it is very very // expensive. - for (unsigned i = 0; i < node::arraysize(kScaleFactorPairs); ++i) { - if (base::EndsWith(filename, kScaleFactorPairs[i].name, + for (auto& kScaleFactorPair : kScaleFactorPairs) { + if (base::EndsWith(filename, kScaleFactorPair.name, base::CompareCase::INSENSITIVE_ASCII)) - return kScaleFactorPairs[i].scale; + return kScaleFactorPair.scale; } return 1.0f; diff --git a/atom/renderer/atom_render_view_observer.cc b/atom/renderer/atom_render_view_observer.cc index 7ee93efb39b..e579165d726 100644 --- a/atom/renderer/atom_render_view_observer.cc +++ b/atom/renderer/atom_render_view_observer.cc @@ -132,10 +132,10 @@ void AtomRenderViewObserver::DraggableRegionsChanged(blink::WebFrame* frame) { blink::WebVector webregions = frame->document().draggableRegions(); std::vector regions; - for (size_t i = 0; i < webregions.size(); ++i) { + for (auto& webregion : webregions) { DraggableRegion region; - region.bounds = webregions[i].bounds; - region.draggable = webregions[i].draggable; + region.bounds = webregion.bounds; + region.draggable = webregion.draggable; regions.push_back(region); } Send(new AtomViewHostMsg_UpdateDraggableRegions(routing_id(), regions)); diff --git a/chromium_src/chrome/browser/extensions/global_shortcut_listener.cc b/chromium_src/chrome/browser/extensions/global_shortcut_listener.cc index 937b54c8d7b..d6ba8c6c82e 100644 --- a/chromium_src/chrome/browser/extensions/global_shortcut_listener.cc +++ b/chromium_src/chrome/browser/extensions/global_shortcut_listener.cc @@ -87,16 +87,16 @@ void GlobalShortcutListener::SetShortcutHandlingSuspended(bool suspended) { return; shortcut_handling_suspended_ = suspended; - for (auto it = accelerator_map_.begin(); it != accelerator_map_.end(); ++it) { + for (auto& it : accelerator_map_) { // On Linux, when shortcut handling is suspended we cannot simply early // return in NotifyKeyPressed (similar to what we do for non-global // shortcuts) because we'd eat the keyboard event thereby preventing the // user from setting the shortcut. Therefore we must unregister while // handling is suspended and register when handling resumes. if (shortcut_handling_suspended_) - UnregisterAcceleratorImpl(it->first); + UnregisterAcceleratorImpl(it.first); else - RegisterAcceleratorImpl(it->first); + RegisterAcceleratorImpl(it.first); } } diff --git a/chromium_src/chrome/browser/media/native_desktop_media_list.cc b/chromium_src/chrome/browser/media/native_desktop_media_list.cc index 8908a604867..eec35303530 100644 --- a/chromium_src/chrome/browser/media/native_desktop_media_list.cc +++ b/chromium_src/chrome/browser/media/native_desktop_media_list.cc @@ -152,12 +152,12 @@ void NativeDesktopMediaList::Worker::Refresh( if (window_capturer_) { webrtc::WindowCapturer::WindowList windows; if (window_capturer_->GetWindowList(&windows)) { - for (auto it = windows.begin(); it != windows.end(); ++it) { + for (auto& window : windows) { // Skip the picker dialog window. - if (it->id != view_dialog_id) { + if (window.id != view_dialog_id) { sources.push_back(SourceDescription( - DesktopMediaID(DesktopMediaID::TYPE_WINDOW, it->id), - base::UTF8ToUTF16(it->title))); + DesktopMediaID(DesktopMediaID::TYPE_WINDOW, window.id), + base::UTF8ToUTF16(window.title))); } } } @@ -296,8 +296,8 @@ void NativeDesktopMediaList::OnSourcesList( const std::vector& new_sources) { typedef std::set SourceSet; SourceSet new_source_set; - for (size_t i = 0; i < new_sources.size(); ++i) { - new_source_set.insert(new_sources[i].id); + for (const auto& new_source : new_sources) { + new_source_set.insert(new_source.id); } // Iterate through the old sources to find the removed sources. for (size_t i = 0; i < sources_.size(); ++i) { @@ -310,8 +310,8 @@ void NativeDesktopMediaList::OnSourcesList( // Iterate through the new sources to find the added sources. if (new_sources.size() > sources_.size()) { SourceSet old_source_set; - for (size_t i = 0; i < sources_.size(); ++i) { - old_source_set.insert(sources_[i].id); + for (auto& source : sources_) { + old_source_set.insert(source.id); } for (size_t i = 0; i < new_sources.size(); ++i) { diff --git a/chromium_src/chrome/browser/printing/print_job_manager.cc b/chromium_src/chrome/browser/printing/print_job_manager.cc index 9f009ce859e..17ee260c620 100644 --- a/chromium_src/chrome/browser/printing/print_job_manager.cc +++ b/chromium_src/chrome/browser/printing/print_job_manager.cc @@ -61,9 +61,8 @@ void PrintQueriesQueue::Shutdown() { // Stop all pending queries, requests to generate print preview do not have // corresponding PrintJob, so any pending preview requests are not covered // by PrintJobManager::StopJobs and should be stopped explicitly. - for (auto itr = queries_to_stop.begin(); itr != queries_to_stop.end(); - ++itr) { - (*itr)->PostTask(FROM_HERE, base::Bind(&PrinterQuery::StopWorker, *itr)); + for (auto& itr : queries_to_stop) { + itr->PostTask(FROM_HERE, base::Bind(&PrinterQuery::StopWorker, itr)); } } @@ -99,11 +98,11 @@ void PrintJobManager::StopJobs(bool wait_for_finish) { PrintJobs to_stop; to_stop.swap(current_jobs_); - for (auto job = to_stop.begin(); job != to_stop.end(); ++job) { + for (const auto& job : to_stop) { // Wait for two minutes for the print job to be spooled. if (wait_for_finish) - (*job)->FlushJob(base::TimeDelta::FromMinutes(2)); - (*job)->Stop(); + job->FlushJob(base::TimeDelta::FromMinutes(2)); + job->Stop(); } } diff --git a/chromium_src/chrome/browser/process_singleton_posix.cc b/chromium_src/chrome/browser/process_singleton_posix.cc index 2f99a0b98ec..88dfa9e0fa1 100644 --- a/chromium_src/chrome/browser/process_singleton_posix.cc +++ b/chromium_src/chrome/browser/process_singleton_posix.cc @@ -820,9 +820,9 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout( to_send.append(current_dir.value()); const std::vector& argv = atom::AtomCommandLine::argv(); - for (auto it = argv.begin(); it != argv.end(); ++it) { + for (const auto& it : argv) { to_send.push_back(kTokenDelimiter); - to_send.append(*it); + to_send.append(it); } // Send the message diff --git a/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc b/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc index 76b6ed3a9a8..d402dd9b61b 100644 --- a/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc +++ b/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc @@ -86,10 +86,10 @@ std::string ReadDataFromPickle(const base::string16& format, bool WriteDataToPickle(const std::map& data, base::Pickle* pickle) { pickle->WriteUInt32(data.size()); - for (auto it = data.begin(); it != data.end(); ++it) { - if (!pickle->WriteString16(it->first)) + for (const auto& it : data) { + if (!pickle->WriteString16(it.first)) return false; - if (!pickle->WriteString(it->second)) + if (!pickle->WriteString(it.second)) return false; } return true; diff --git a/chromium_src/chrome/browser/renderer_host/pepper/widevine_cdm_message_filter.cc b/chromium_src/chrome/browser/renderer_host/pepper/widevine_cdm_message_filter.cc index c926b9e94aa..4264f92c6c7 100644 --- a/chromium_src/chrome/browser/renderer_host/pepper/widevine_cdm_message_filter.cc +++ b/chromium_src/chrome/browser/renderer_host/pepper/widevine_cdm_message_filter.cc @@ -43,16 +43,14 @@ void WidevineCdmMessageFilter::OnIsInternalPluginAvailableForMimeType( std::vector plugins; PluginService::GetInstance()->GetInternalPlugins(&plugins); - for (size_t i = 0; i < plugins.size(); ++i) { - const WebPluginInfo& plugin = plugins[i]; + for (auto& plugin : plugins) { const std::vector& mime_types = plugin.mime_types; - for (size_t j = 0; j < mime_types.size(); ++j) { - - if (mime_types[j].mime_type == mime_type) { + for (const auto& j : mime_types) { + if (j.mime_type == mime_type) { *is_available = true; - *additional_param_names = mime_types[j].additional_param_names; - *additional_param_values = mime_types[j].additional_param_values; + *additional_param_names = j.additional_param_names; + *additional_param_values = j.additional_param_values; return; } } diff --git a/chromium_src/chrome/browser/speech/tts_controller_impl.cc b/chromium_src/chrome/browser/speech/tts_controller_impl.cc index fe3ab7f1c21..5e1c630fc4c 100644 --- a/chromium_src/chrome/browser/speech/tts_controller_impl.cc +++ b/chromium_src/chrome/browser/speech/tts_controller_impl.cc @@ -415,9 +415,8 @@ int TtsControllerImpl::GetMatchingVoice( if (utterance->required_event_types().size() > 0) { bool has_all_required_event_types = true; - for (auto iter = utterance->required_event_types().begin(); - iter != utterance->required_event_types().end(); ++iter) { - if (voice.events.find(*iter) == voice.events.end()) { + for (auto iter : utterance->required_event_types()) { + if (voice.events.find(iter) == voice.events.end()) { has_all_required_event_types = false; break; } @@ -434,9 +433,8 @@ int TtsControllerImpl::GetMatchingVoice( } void TtsControllerImpl::VoicesChanged() { - for (auto iter = voices_changed_delegates_.begin(); - iter != voices_changed_delegates_.end(); ++iter) { - (*iter)->OnVoicesChanged(); + for (auto voices_changed_delegate : voices_changed_delegates_) { + voices_changed_delegate->OnVoicesChanged(); } } diff --git a/chromium_src/chrome/renderer/media/chrome_key_systems.cc b/chromium_src/chrome/renderer/media/chrome_key_systems.cc index 417a61fcdab..df51559dafd 100644 --- a/chromium_src/chrome/renderer/media/chrome_key_systems.cc +++ b/chromium_src/chrome/renderer/media/chrome_key_systems.cc @@ -112,13 +112,13 @@ static void AddPepperBasedWidevine( supported_codecs |= media::EME_CODEC_MP4_AAC; #endif // defined(USE_PROPRIETARY_CODECS) - for (size_t i = 0; i < codecs.size(); ++i) { - if (codecs[i] == kCdmSupportedCodecVp8) + for (auto& codec : codecs) { + if (codec == kCdmSupportedCodecVp8) supported_codecs |= media::EME_CODEC_WEBM_VP8; - if (codecs[i] == kCdmSupportedCodecVp9) + if (codec == kCdmSupportedCodecVp9) supported_codecs |= media::EME_CODEC_WEBM_VP9; #if defined(USE_PROPRIETARY_CODECS) - if (codecs[i] == kCdmSupportedCodecAvc1) + if (codec == kCdmSupportedCodecAvc1) supported_codecs |= media::EME_CODEC_MP4_AVC1; #endif // defined(USE_PROPRIETARY_CODECS) } diff --git a/chromium_src/chrome/renderer/printing/print_web_view_helper.cc b/chromium_src/chrome/renderer/printing/print_web_view_helper.cc index 0ab64248cf8..46506343d20 100644 --- a/chromium_src/chrome/renderer/printing/print_web_view_helper.cc +++ b/chromium_src/chrome/renderer/printing/print_web_view_helper.cc @@ -980,10 +980,10 @@ bool PrintWebViewHelper::PrintPagesNative(blink::WebFrame* frame, PrintPageInternal(page_params, frame); } } else { - for (size_t i = 0; i < params.pages.size(); ++i) { - if (params.pages[i] >= page_count) + for (int page : params.pages) { + if (page >= page_count) break; - page_params.page_number = params.pages[i]; + page_params.page_number = page; PrintPageInternal(page_params, frame); } } diff --git a/chromium_src/extensions/common/url_pattern.cc b/chromium_src/extensions/common/url_pattern.cc index dc39d95e98e..3742d2fe38a 100644 --- a/chromium_src/extensions/common/url_pattern.cc +++ b/chromium_src/extensions/common/url_pattern.cc @@ -118,8 +118,8 @@ std::string StripTrailingWildcard(const std::string& path) { namespace extensions { // static bool URLPattern::IsValidSchemeForExtensions(const std::string& scheme) { - for (size_t i = 0; i < arraysize(kValidSchemes); ++i) { - if (scheme == kValidSchemes[i]) + for (auto& kValidScheme : kValidSchemes) { + if (scheme == kValidScheme) return true; } return false; @@ -543,8 +543,8 @@ bool URLPattern::Contains(const URLPattern& other) const { bool URLPattern::MatchesAnyScheme( const std::vector& schemes) const { - for (auto i = schemes.begin(); i != schemes.end(); ++i) { - if (MatchesScheme(*i)) + for (const auto& scheme : schemes) { + if (MatchesScheme(scheme)) return true; } @@ -553,8 +553,8 @@ bool URLPattern::MatchesAnyScheme( bool URLPattern::MatchesAllSchemes( const std::vector& schemes) const { - for (auto i = schemes.begin(); i != schemes.end(); ++i) { - if (!MatchesScheme(*i)) + for (const auto& scheme : schemes) { + if (!MatchesScheme(scheme)) return false; } @@ -584,9 +584,9 @@ std::vector URLPattern::GetExplicitSchemes() const { return result; } - for (size_t i = 0; i < arraysize(kValidSchemes); ++i) { - if (MatchesScheme(kValidSchemes[i])) { - result.push_back(kValidSchemes[i]); + for (auto& kValidScheme : kValidSchemes) { + if (MatchesScheme(kValidScheme)) { + result.push_back(kValidScheme); } } From 2717b963107add68c81fa6e129008723704c7f95 Mon Sep 17 00:00:00 2001 From: Haojian Wu Date: Sun, 10 Jul 2016 15:35:54 +0200 Subject: [PATCH 5/6] Don't change chromium_src files. --- .../chrome/browser/browser_process.cc | 4 +-- .../extensions/global_shortcut_listener.cc | 16 +++++----- .../media/native_desktop_media_list.cc | 23 +++++++------- .../chrome/browser/printing/print_job.cc | 22 +++++++------- .../browser/printing/print_job_manager.cc | 20 +++++++------ .../browser/printing/print_job_worker.cc | 16 +++++----- .../printing/print_preview_message_handler.cc | 2 +- .../printing/print_view_manager_base.cc | 2 +- .../chrome/browser/printing/printer_query.cc | 2 +- .../printing/printing_message_filter.cc | 2 +- .../chrome/browser/process_singleton_posix.cc | 11 ++++--- .../pepper_flash_clipboard_message_filter.cc | 8 +++-- ...per_isolated_file_system_message_filter.cc | 2 +- .../pepper/widevine_cdm_message_filter.cc | 12 ++++---- .../browser/speech/tts_controller_impl.cc | 27 ++++++++++------- .../renderer/media/chrome_key_systems.cc | 8 ++--- .../renderer/pepper/pepper_flash_menu_host.cc | 2 +- .../pepper/pepper_flash_renderer_host.cc | 2 +- .../printing/print_web_view_helper.cc | 30 +++++++++---------- .../spellchecker/spellcheck_worditerator.cc | 4 +-- chromium_src/extensions/common/url_pattern.cc | 24 ++++++++------- .../stream_listen_socket.cc | 2 +- 22 files changed, 131 insertions(+), 110 deletions(-) diff --git a/chromium_src/chrome/browser/browser_process.cc b/chromium_src/chrome/browser/browser_process.cc index 34e79812bf2..2c07333210e 100644 --- a/chromium_src/chrome/browser/browser_process.cc +++ b/chromium_src/chrome/browser/browser_process.cc @@ -7,7 +7,7 @@ #include "chrome/browser/printing/print_job_manager.h" #include "ui/base/l10n/l10n_util.h" -BrowserProcess* g_browser_process = nullptr; +BrowserProcess* g_browser_process = NULL; BrowserProcess::BrowserProcess() { g_browser_process = this; @@ -16,7 +16,7 @@ BrowserProcess::BrowserProcess() { } BrowserProcess::~BrowserProcess() { - g_browser_process = nullptr; + g_browser_process = NULL; } std::string BrowserProcess::GetApplicationLocale() { diff --git a/chromium_src/chrome/browser/extensions/global_shortcut_listener.cc b/chromium_src/chrome/browser/extensions/global_shortcut_listener.cc index d6ba8c6c82e..925cb40d0f9 100644 --- a/chromium_src/chrome/browser/extensions/global_shortcut_listener.cc +++ b/chromium_src/chrome/browser/extensions/global_shortcut_listener.cc @@ -53,7 +53,7 @@ void GlobalShortcutListener::UnregisterAccelerator( if (IsShortcutHandlingSuspended()) return; - auto it = accelerator_map_.find(accelerator); + AcceleratorMap::iterator it = accelerator_map_.find(accelerator); // We should never get asked to unregister something that we didn't register. DCHECK(it != accelerator_map_.end()); // The caller should call this function with the right observer. @@ -70,10 +70,10 @@ void GlobalShortcutListener::UnregisterAccelerators(Observer* observer) { if (IsShortcutHandlingSuspended()) return; - auto it = accelerator_map_.begin(); + AcceleratorMap::iterator it = accelerator_map_.begin(); while (it != accelerator_map_.end()) { if (it->second == observer) { - auto to_remove = it++; + AcceleratorMap::iterator to_remove = it++; UnregisterAccelerator(to_remove->first, observer); } else { ++it; @@ -87,16 +87,18 @@ void GlobalShortcutListener::SetShortcutHandlingSuspended(bool suspended) { return; shortcut_handling_suspended_ = suspended; - for (auto& it : accelerator_map_) { + for (AcceleratorMap::iterator it = accelerator_map_.begin(); + it != accelerator_map_.end(); + ++it) { // On Linux, when shortcut handling is suspended we cannot simply early // return in NotifyKeyPressed (similar to what we do for non-global // shortcuts) because we'd eat the keyboard event thereby preventing the // user from setting the shortcut. Therefore we must unregister while // handling is suspended and register when handling resumes. if (shortcut_handling_suspended_) - UnregisterAcceleratorImpl(it.first); + UnregisterAcceleratorImpl(it->first); else - RegisterAcceleratorImpl(it.first); + RegisterAcceleratorImpl(it->first); } } @@ -106,7 +108,7 @@ bool GlobalShortcutListener::IsShortcutHandlingSuspended() const { void GlobalShortcutListener::NotifyKeyPressed( const ui::Accelerator& accelerator) { - auto iter = accelerator_map_.find(accelerator); + AcceleratorMap::iterator iter = accelerator_map_.find(accelerator); if (iter == accelerator_map_.end()) { // This should never occur, because if it does, we have failed to unregister // or failed to clean up the map after unregistering the shortcut. diff --git a/chromium_src/chrome/browser/media/native_desktop_media_list.cc b/chromium_src/chrome/browser/media/native_desktop_media_list.cc index eec35303530..a524dfcf38c 100644 --- a/chromium_src/chrome/browser/media/native_desktop_media_list.cc +++ b/chromium_src/chrome/browser/media/native_desktop_media_list.cc @@ -152,12 +152,13 @@ void NativeDesktopMediaList::Worker::Refresh( if (window_capturer_) { webrtc::WindowCapturer::WindowList windows; if (window_capturer_->GetWindowList(&windows)) { - for (auto& window : windows) { + for (webrtc::WindowCapturer::WindowList::iterator it = windows.begin(); + it != windows.end(); ++it) { // Skip the picker dialog window. - if (window.id != view_dialog_id) { + if (it->id != view_dialog_id) { sources.push_back(SourceDescription( - DesktopMediaID(DesktopMediaID::TYPE_WINDOW, window.id), - base::UTF8ToUTF16(window.title))); + DesktopMediaID(DesktopMediaID::TYPE_WINDOW, it->id), + base::UTF8ToUTF16(it->title))); } } } @@ -198,7 +199,7 @@ void NativeDesktopMediaList::Worker::Refresh( new_image_hashes[source.id] = frame_hash; // Scale the image only if it has changed. - auto it = image_hashes_.find(source.id); + ImageHashesMap::iterator it = image_hashes_.find(source.id); if (it == image_hashes_.end() || it->second != frame_hash) { gfx::ImageSkia thumbnail = ScaleDesktopFrame(std::move(current_frame_), thumbnail_size); @@ -219,7 +220,7 @@ void NativeDesktopMediaList::Worker::Refresh( webrtc::SharedMemory* NativeDesktopMediaList::Worker::CreateSharedMemory( size_t size) { - return nullptr; + return NULL; } void NativeDesktopMediaList::Worker::OnCaptureCompleted( @@ -235,7 +236,7 @@ NativeDesktopMediaList::NativeDesktopMediaList( update_period_(base::TimeDelta::FromMilliseconds(kDefaultUpdatePeriod)), thumbnail_size_(100, 100), view_dialog_id_(-1), - observer_(nullptr), + observer_(NULL), weak_factory_(this) { base::SequencedWorkerPool* worker_pool = BrowserThread::GetBlockingPool(); capture_task_runner_ = worker_pool->GetSequencedTaskRunner( @@ -296,8 +297,8 @@ void NativeDesktopMediaList::OnSourcesList( const std::vector& new_sources) { typedef std::set SourceSet; SourceSet new_source_set; - for (const auto& new_source : new_sources) { - new_source_set.insert(new_source.id); + for (size_t i = 0; i < new_sources.size(); ++i) { + new_source_set.insert(new_sources[i].id); } // Iterate through the old sources to find the removed sources. for (size_t i = 0; i < sources_.size(); ++i) { @@ -310,8 +311,8 @@ void NativeDesktopMediaList::OnSourcesList( // Iterate through the new sources to find the added sources. if (new_sources.size() > sources_.size()) { SourceSet old_source_set; - for (auto& source : sources_) { - old_source_set.insert(source.id); + for (size_t i = 0; i < sources_.size(); ++i) { + old_source_set.insert(sources_[i].id); } for (size_t i = 0; i < new_sources.size(); ++i) { diff --git a/chromium_src/chrome/browser/printing/print_job.cc b/chromium_src/chrome/browser/printing/print_job.cc index abc1f3c652f..87971055e68 100644 --- a/chromium_src/chrome/browser/printing/print_job.cc +++ b/chromium_src/chrome/browser/printing/print_job.cc @@ -38,7 +38,7 @@ void HoldRefCallback(const scoped_refptr& owner, namespace printing { PrintJob::PrintJob() - : source_(nullptr), + : source_(NULL), worker_(), settings_(), is_job_pending_(false), @@ -71,8 +71,10 @@ void PrintJob::Initialize(PrintJobWorkerOwner* job, worker_.reset(job->DetachWorker(this)); settings_ = job->settings(); - auto* new_doc = - new PrintedDocument(settings_, source_, job->cookie(), + PrintedDocument* new_doc = + new PrintedDocument(settings_, + source_, + job->cookie(), content::BrowserThread::GetBlockingPool()); new_doc->set_page_count(page_count); UpdatePrintedDocument(new_doc); @@ -104,7 +106,7 @@ void PrintJob::GetSettingsDone(const PrintSettings& new_settings, PrintJobWorker* PrintJob::DetachWorker(PrintJobWorkerOwner* new_owner) { NOTREACHED(); - return nullptr; + return NULL; } const PrintSettings& PrintJob::settings() const { @@ -137,7 +139,7 @@ void PrintJob::StartPrinting() { // Tell everyone! scoped_refptr details( - new JobEventDetails(JobEventDetails::NEW_DOC, document_.get(), nullptr)); + new JobEventDetails(JobEventDetails::NEW_DOC, document_.get(), NULL)); content::NotificationService::current()->Notify( chrome::NOTIFICATION_PRINT_JOB_EVENT, content::Source(this), @@ -161,7 +163,7 @@ void PrintJob::Stop() { ControlledWorkerShutdown(); } else { // Flush the cached document. - UpdatePrintedDocument(nullptr); + UpdatePrintedDocument(NULL); } } @@ -181,7 +183,7 @@ void PrintJob::Cancel() { } // Make sure a Cancel() is broadcast. scoped_refptr details( - new JobEventDetails(JobEventDetails::FAILED, nullptr, nullptr)); + new JobEventDetails(JobEventDetails::FAILED, NULL, NULL)); content::NotificationService::current()->Notify( chrome::NOTIFICATION_PRINT_JOB_EVENT, content::Source(this), @@ -205,7 +207,7 @@ bool PrintJob::FlushJob(base::TimeDelta timeout) { } void PrintJob::DisconnectSource() { - source_ = nullptr; + source_ = NULL; if (document_.get()) document_->DisconnectSource(); } @@ -386,7 +388,7 @@ void PrintJob::OnDocumentDone() { Stop(); scoped_refptr details( - new JobEventDetails(JobEventDetails::JOB_DONE, document_.get(), nullptr)); + new JobEventDetails(JobEventDetails::JOB_DONE, document_.get(), NULL)); content::NotificationService::current()->Notify( chrome::NOTIFICATION_PRINT_JOB_EVENT, content::Source(this), @@ -432,7 +434,7 @@ void PrintJob::ControlledWorkerShutdown() { is_job_pending_ = false; registrar_.RemoveAll(); - UpdatePrintedDocument(nullptr); + UpdatePrintedDocument(NULL); } void PrintJob::HoldUntilStopIsCalled() { diff --git a/chromium_src/chrome/browser/printing/print_job_manager.cc b/chromium_src/chrome/browser/printing/print_job_manager.cc index 17ee260c620..ec08a989233 100644 --- a/chromium_src/chrome/browser/printing/print_job_manager.cc +++ b/chromium_src/chrome/browser/printing/print_job_manager.cc @@ -32,8 +32,8 @@ void PrintQueriesQueue::QueuePrinterQuery(PrinterQuery* job) { scoped_refptr PrintQueriesQueue::PopPrinterQuery( int document_cookie) { base::AutoLock lock(lock_); - for (auto itr = queued_queries_.begin(); itr != queued_queries_.end(); - ++itr) { + for (PrinterQueries::iterator itr = queued_queries_.begin(); + itr != queued_queries_.end(); ++itr) { if ((*itr)->cookie() == document_cookie && !(*itr)->is_callback_pending()) { scoped_refptr current_query(*itr); queued_queries_.erase(itr); @@ -41,7 +41,7 @@ scoped_refptr PrintQueriesQueue::PopPrinterQuery( return current_query; } } - return nullptr; + return NULL; } scoped_refptr PrintQueriesQueue::CreatePrinterQuery( @@ -61,8 +61,9 @@ void PrintQueriesQueue::Shutdown() { // Stop all pending queries, requests to generate print preview do not have // corresponding PrintJob, so any pending preview requests are not covered // by PrintJobManager::StopJobs and should be stopped explicitly. - for (auto& itr : queries_to_stop) { - itr->PostTask(FROM_HERE, base::Bind(&PrinterQuery::StopWorker, itr)); + for (PrinterQueries::iterator itr = queries_to_stop.begin(); + itr != queries_to_stop.end(); ++itr) { + (*itr)->PostTask(FROM_HERE, base::Bind(&PrinterQuery::StopWorker, *itr)); } } @@ -89,7 +90,7 @@ void PrintJobManager::Shutdown() { StopJobs(true); if (queue_.get()) queue_->Shutdown(); - queue_ = nullptr; + queue_ = NULL; } void PrintJobManager::StopJobs(bool wait_for_finish) { @@ -98,11 +99,12 @@ void PrintJobManager::StopJobs(bool wait_for_finish) { PrintJobs to_stop; to_stop.swap(current_jobs_); - for (const auto& job : to_stop) { + for (PrintJobs::const_iterator job = to_stop.begin(); job != to_stop.end(); + ++job) { // Wait for two minutes for the print job to be spooled. if (wait_for_finish) - job->FlushJob(base::TimeDelta::FromMinutes(2)); - job->Stop(); + (*job)->FlushJob(base::TimeDelta::FromMinutes(2)); + (*job)->Stop(); } } diff --git a/chromium_src/chrome/browser/printing/print_job_worker.cc b/chromium_src/chrome/browser/printing/print_job_worker.cc index 33a8b7d7352..7a88a8570c4 100644 --- a/chromium_src/chrome/browser/printing/print_job_worker.cc +++ b/chromium_src/chrome/browser/printing/print_job_worker.cc @@ -38,10 +38,10 @@ void HoldRefCallback(const scoped_refptr& owner, class PrintingContextDelegate : public PrintingContext::Delegate { public: PrintingContextDelegate(int render_process_id, int render_view_id); - ~PrintingContextDelegate() override; + virtual ~PrintingContextDelegate(); - gfx::NativeView GetParentView() override; - std::string GetAppLocale() override; + virtual gfx::NativeView GetParentView() override; + virtual std::string GetAppLocale() override; private: int render_process_id_; @@ -62,9 +62,9 @@ gfx::NativeView PrintingContextDelegate::GetParentView() { content::RenderViewHost* view = content::RenderViewHost::FromID(render_process_id_, render_view_id_); if (!view) - return nullptr; + return NULL; content::WebContents* wc = content::WebContents::FromRenderViewHost(view); - return wc ? wc->GetNativeView() : nullptr; + return wc ? wc->GetNativeView() : NULL; } std::string PrintingContextDelegate::GetAppLocale() { @@ -75,7 +75,7 @@ void NotificationCallback(PrintJobWorkerOwner* print_job, JobEventDetails::Type detail_type, PrintedDocument* document, PrintedPage* page) { - auto* details = new JobEventDetails(detail_type, document, page); + JobEventDetails* details = new JobEventDetails(detail_type, document, page); content::NotificationService::current()->Notify( chrome::NOTIFICATION_PRINT_JOB_EVENT, // We know that is is a PrintJob object in this circumstance. @@ -343,7 +343,7 @@ void PrintJobWorker::OnDocumentDone() { base::RetainedRef(document_), nullptr)); // Makes sure the variables are reinitialized. - document_ = nullptr; + document_ = NULL; } void PrintJobWorker::SpoolPage(PrintedPage* page) { @@ -397,7 +397,7 @@ void PrintJobWorker::OnFailure() { Cancel(); // Makes sure the variables are reinitialized. - document_ = nullptr; + document_ = NULL; page_number_ = PageNumber::npos(); } diff --git a/chromium_src/chrome/browser/printing/print_preview_message_handler.cc b/chromium_src/chrome/browser/printing/print_preview_message_handler.cc index 9e1fca5c469..d1f3660f8d2 100644 --- a/chromium_src/chrome/browser/printing/print_preview_message_handler.cc +++ b/chromium_src/chrome/browser/printing/print_preview_message_handler.cc @@ -48,7 +48,7 @@ char* CopyPDFDataOnIOThread( if (!shared_buf->Map(params.data_size)) return nullptr; char* memory_pdf_data = static_cast(shared_buf->memory()); - auto* pdf_data = new char[params.data_size]; + char* pdf_data = new char[params.data_size]; memcpy(pdf_data, memory_pdf_data, params.data_size); return pdf_data; } diff --git a/chromium_src/chrome/browser/printing/print_view_manager_base.cc b/chromium_src/chrome/browser/printing/print_view_manager_base.cc index 7de8ae56fd7..2bbafdd8e55 100644 --- a/chromium_src/chrome/browser/printing/print_view_manager_base.cc +++ b/chromium_src/chrome/browser/printing/print_view_manager_base.cc @@ -394,7 +394,7 @@ void PrintViewManagerBase::ReleasePrintJob() { content::Source(print_job_.get())); print_job_->DisconnectSource(); // Don't close the worker thread. - print_job_ = nullptr; + print_job_ = NULL; } bool PrintViewManagerBase::RunInnerMessageLoop() { diff --git a/chromium_src/chrome/browser/printing/printer_query.cc b/chromium_src/chrome/browser/printing/printer_query.cc index d36d51a9f89..72e2b85f635 100644 --- a/chromium_src/chrome/browser/printing/printer_query.cc +++ b/chromium_src/chrome/browser/printing/printer_query.cc @@ -122,7 +122,7 @@ bool PrinterQuery::is_callback_pending() const { } bool PrinterQuery::is_valid() const { - return worker_.get() != nullptr; + return worker_.get() != NULL; } } // namespace printing diff --git a/chromium_src/chrome/browser/printing/printing_message_filter.cc b/chromium_src/chrome/browser/printing/printing_message_filter.cc index 31a7cf535a6..819c6af5b02 100644 --- a/chromium_src/chrome/browser/printing/printing_message_filter.cc +++ b/chromium_src/chrome/browser/printing/printing_message_filter.cc @@ -246,7 +246,7 @@ content::WebContents* PrintingMessageFilter::GetWebContentsForRenderView( DCHECK_CURRENTLY_ON(BrowserThread::UI); content::RenderViewHost* view = content::RenderViewHost::FromID( render_process_id_, render_view_id); - return view ? content::WebContents::FromRenderViewHost(view) : nullptr; + return view ? content::WebContents::FromRenderViewHost(view) : NULL; } void PrintingMessageFilter::OnGetDefaultPrintSettings(IPC::Message* reply_msg) { diff --git a/chromium_src/chrome/browser/process_singleton_posix.cc b/chromium_src/chrome/browser/process_singleton_posix.cc index 88dfa9e0fa1..5742b358520 100644 --- a/chromium_src/chrome/browser/process_singleton_posix.cc +++ b/chromium_src/chrome/browser/process_singleton_posix.cc @@ -171,7 +171,7 @@ int WaitSocketForRead(int fd, const base::TimeDelta& timeout) { FD_ZERO(&read_fds); FD_SET(fd, &read_fds); - return HANDLE_EINTR(select(fd + 1, &read_fds, nullptr, nullptr, &tv)); + return HANDLE_EINTR(select(fd + 1, &read_fds, NULL, NULL, &tv)); } // Read a message from a socket fd, with an optional timeout. @@ -579,7 +579,9 @@ void ProcessSingleton::LinuxWatcher::OnFileCanReadWithoutBlocking(int fd) { } int rv = base::SetNonBlocking(connection_socket); DCHECK_EQ(0, rv) << "Failed to make non-blocking socket."; - auto* reader = new SocketReader(this, ui_message_loop_, connection_socket); + SocketReader* reader = new SocketReader(this, + ui_message_loop_, + connection_socket); readers_.insert(reader); } @@ -820,9 +822,10 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout( to_send.append(current_dir.value()); const std::vector& argv = atom::AtomCommandLine::argv(); - for (const auto& it : argv) { + for (std::vector::const_iterator it = argv.begin(); + it != argv.end(); ++it) { to_send.push_back(kTokenDelimiter); - to_send.append(it); + to_send.append(*it); } // Send the message diff --git a/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc b/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc index d402dd9b61b..4e66d772ec3 100644 --- a/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc +++ b/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc @@ -86,10 +86,12 @@ std::string ReadDataFromPickle(const base::string16& format, bool WriteDataToPickle(const std::map& data, base::Pickle* pickle) { pickle->WriteUInt32(data.size()); - for (const auto& it : data) { - if (!pickle->WriteString16(it.first)) + for (std::map::const_iterator it = data.begin(); + it != data.end(); + ++it) { + if (!pickle->WriteString16(it->first)) return false; - if (!pickle->WriteString(it.second)) + if (!pickle->WriteString(it->second)) return false; } return true; diff --git a/chromium_src/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc b/chromium_src/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc index bf4d0f02a66..10c07906af9 100644 --- a/chromium_src/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc +++ b/chromium_src/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc @@ -26,7 +26,7 @@ PepperIsolatedFileSystemMessageFilter::Create(PP_Instance instance, int unused_render_frame_id; if (!host->GetRenderFrameIDsForInstance( instance, &render_process_id, &unused_render_frame_id)) { - return nullptr; + return NULL; } return new PepperIsolatedFileSystemMessageFilter( render_process_id, diff --git a/chromium_src/chrome/browser/renderer_host/pepper/widevine_cdm_message_filter.cc b/chromium_src/chrome/browser/renderer_host/pepper/widevine_cdm_message_filter.cc index 4264f92c6c7..c926b9e94aa 100644 --- a/chromium_src/chrome/browser/renderer_host/pepper/widevine_cdm_message_filter.cc +++ b/chromium_src/chrome/browser/renderer_host/pepper/widevine_cdm_message_filter.cc @@ -43,14 +43,16 @@ void WidevineCdmMessageFilter::OnIsInternalPluginAvailableForMimeType( std::vector plugins; PluginService::GetInstance()->GetInternalPlugins(&plugins); - for (auto& plugin : plugins) { + for (size_t i = 0; i < plugins.size(); ++i) { + const WebPluginInfo& plugin = plugins[i]; const std::vector& mime_types = plugin.mime_types; - for (const auto& j : mime_types) { - if (j.mime_type == mime_type) { + for (size_t j = 0; j < mime_types.size(); ++j) { + + if (mime_types[j].mime_type == mime_type) { *is_available = true; - *additional_param_names = j.additional_param_names; - *additional_param_values = j.additional_param_values; + *additional_param_names = mime_types[j].additional_param_names; + *additional_param_values = mime_types[j].additional_param_values; return; } } diff --git a/chromium_src/chrome/browser/speech/tts_controller_impl.cc b/chromium_src/chrome/browser/speech/tts_controller_impl.cc index 5e1c630fc4c..610ce165675 100644 --- a/chromium_src/chrome/browser/speech/tts_controller_impl.cc +++ b/chromium_src/chrome/browser/speech/tts_controller_impl.cc @@ -115,10 +115,10 @@ TtsControllerImpl* TtsControllerImpl::GetInstance() { } TtsControllerImpl::TtsControllerImpl() - : current_utterance_(nullptr), + : current_utterance_(NULL), paused_(false), - platform_impl_(nullptr), - tts_engine_delegate_(nullptr) { + platform_impl_(NULL), + tts_engine_delegate_(NULL) { } TtsControllerImpl::~TtsControllerImpl() { @@ -206,7 +206,7 @@ void TtsControllerImpl::SpeakNow(Utterance* utterance) { if (!sends_end_event) { utterance->Finish(); delete utterance; - current_utterance_ = nullptr; + current_utterance_ = NULL; SpeakNextUtterance(); } #endif @@ -222,7 +222,7 @@ void TtsControllerImpl::SpeakNow(Utterance* utterance) { voice, utterance->continuous_parameters()); if (!success) - current_utterance_ = nullptr; + current_utterance_ = NULL; // If the native voice wasn't able to process this speech, see if // the browser has built-in TTS that isn't loaded yet. @@ -323,7 +323,7 @@ void TtsControllerImpl::GetVoices(content::BrowserContext* browser_context, } bool TtsControllerImpl::IsSpeaking() { - return current_utterance_ != nullptr || GetPlatformImpl()->IsSpeaking(); + return current_utterance_ != NULL || GetPlatformImpl()->IsSpeaking(); } void TtsControllerImpl::FinishCurrentUtterance() { @@ -332,7 +332,7 @@ void TtsControllerImpl::FinishCurrentUtterance() { current_utterance_->OnTtsEvent(TTS_EVENT_INTERRUPTED, kInvalidCharIndex, std::string()); delete current_utterance_; - current_utterance_ = nullptr; + current_utterance_ = NULL; } } @@ -415,8 +415,11 @@ int TtsControllerImpl::GetMatchingVoice( if (utterance->required_event_types().size() > 0) { bool has_all_required_event_types = true; - for (auto iter : utterance->required_event_types()) { - if (voice.events.find(iter) == voice.events.end()) { + for (std::set::const_iterator iter = + utterance->required_event_types().begin(); + iter != utterance->required_event_types().end(); + ++iter) { + if (voice.events.find(*iter) == voice.events.end()) { has_all_required_event_types = false; break; } @@ -433,8 +436,10 @@ int TtsControllerImpl::GetMatchingVoice( } void TtsControllerImpl::VoicesChanged() { - for (auto voices_changed_delegate : voices_changed_delegates_) { - voices_changed_delegate->OnVoicesChanged(); + for (std::set::iterator iter = + voices_changed_delegates_.begin(); + iter != voices_changed_delegates_.end(); ++iter) { + (*iter)->OnVoicesChanged(); } } diff --git a/chromium_src/chrome/renderer/media/chrome_key_systems.cc b/chromium_src/chrome/renderer/media/chrome_key_systems.cc index df51559dafd..417a61fcdab 100644 --- a/chromium_src/chrome/renderer/media/chrome_key_systems.cc +++ b/chromium_src/chrome/renderer/media/chrome_key_systems.cc @@ -112,13 +112,13 @@ static void AddPepperBasedWidevine( supported_codecs |= media::EME_CODEC_MP4_AAC; #endif // defined(USE_PROPRIETARY_CODECS) - for (auto& codec : codecs) { - if (codec == kCdmSupportedCodecVp8) + for (size_t i = 0; i < codecs.size(); ++i) { + if (codecs[i] == kCdmSupportedCodecVp8) supported_codecs |= media::EME_CODEC_WEBM_VP8; - if (codec == kCdmSupportedCodecVp9) + if (codecs[i] == kCdmSupportedCodecVp9) supported_codecs |= media::EME_CODEC_WEBM_VP9; #if defined(USE_PROPRIETARY_CODECS) - if (codec == kCdmSupportedCodecAvc1) + if (codecs[i] == kCdmSupportedCodecAvc1) supported_codecs |= media::EME_CODEC_MP4_AVC1; #endif // defined(USE_PROPRIETARY_CODECS) } diff --git a/chromium_src/chrome/renderer/pepper/pepper_flash_menu_host.cc b/chromium_src/chrome/renderer/pepper/pepper_flash_menu_host.cc index 424b6ac6fdb..3b7a438f722 100644 --- a/chromium_src/chrome/renderer/pepper/pepper_flash_menu_host.cc +++ b/chromium_src/chrome/renderer/pepper/pepper_flash_menu_host.cc @@ -195,7 +195,7 @@ void PepperFlashMenuHost::OnMenuClosed(int request_id) { void PepperFlashMenuHost::SendMenuReply(int32_t result, int action) { ppapi::host::ReplyMessageContext reply_context( ppapi::proxy::ResourceMessageReplyParams(pp_resource(), 0), - nullptr, + NULL, MSG_ROUTING_NONE); reply_context.params.set_result(result); host()->SendReply(reply_context, PpapiPluginMsg_FlashMenu_ShowReply(action)); diff --git a/chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc b/chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc index 6606d736c04..59046b328bf 100644 --- a/chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc +++ b/chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc @@ -115,7 +115,7 @@ bool IsSimpleHeader(const std::string& lower_case_header_name, &lower_case_mime_type, &lower_case_charset, &had_charset, - nullptr); + NULL); return lower_case_mime_type == "application/x-www-form-urlencoded" || lower_case_mime_type == "multipart/form-data" || lower_case_mime_type == "text/plain"; diff --git a/chromium_src/chrome/renderer/printing/print_web_view_helper.cc b/chromium_src/chrome/renderer/printing/print_web_view_helper.cc index 46506343d20..7ff3471f953 100644 --- a/chromium_src/chrome/renderer/printing/print_web_view_helper.cc +++ b/chromium_src/chrome/renderer/printing/print_web_view_helper.cc @@ -110,8 +110,8 @@ PrintMsg_Print_Params GetCssPrintParams( // Invalid page size and/or margins. We just use the default setting. if (new_content_width < 1 || new_content_height < 1) { - CHECK(frame != nullptr); - page_css_params = GetCssPrintParams(nullptr, page_index, page_params); + CHECK(frame != NULL); + page_css_params = GetCssPrintParams(NULL, page_index, page_params); return page_css_params; } @@ -254,7 +254,7 @@ void ComputeWebKitPrintParamsInDesiredDpi( blink::WebPlugin* GetPlugin(const blink::WebFrame* frame) { return frame->document().isPluginDocument() ? - frame->document().to().plugin() : nullptr; + frame->document().to().plugin() : NULL; } bool PrintingNodeOrPdfFrame(const blink::WebFrame* frame, @@ -323,7 +323,7 @@ FrameReference::FrameReference(blink::WebLocalFrame* frame) { } FrameReference::FrameReference() { - Reset(nullptr); + Reset(NULL); } FrameReference::~FrameReference() { @@ -334,20 +334,20 @@ void FrameReference::Reset(blink::WebLocalFrame* frame) { view_ = frame->view(); frame_ = frame; } else { - view_ = nullptr; - frame_ = nullptr; + view_ = NULL; + frame_ = NULL; } } blink::WebLocalFrame* FrameReference::GetFrame() { - if (view_ == nullptr || frame_ == nullptr) - return nullptr; - for (blink::WebFrame* frame = view_->mainFrame(); frame != nullptr; + if (view_ == NULL || frame_ == NULL) + return NULL; + for (blink::WebFrame* frame = view_->mainFrame(); frame != NULL; frame = frame->traverseNext(false)) { if (frame == frame_) return frame_; } - return nullptr; + return NULL; } blink::WebView* FrameReference::view() { @@ -477,7 +477,7 @@ PrepareFrameAndViewForPrint::PrepareFrameAndViewForPrint( frame->printBegin(web_print_params_, node_to_print_); print_params = CalculatePrintParamsForCss(frame, 0, print_params, ignore_css_margins, fit_to_page, - nullptr); + NULL); frame->printEnd(); } ComputeWebKitPrintParamsInDesiredDpi(print_params, &web_print_params_); @@ -623,7 +623,7 @@ void PrepareFrameAndViewForPrint::FinishPrinting() { web_view->close(); } } - frame_.Reset(nullptr); + frame_.Reset(NULL); on_ready_.Reset(); } @@ -980,10 +980,10 @@ bool PrintWebViewHelper::PrintPagesNative(blink::WebFrame* frame, PrintPageInternal(page_params, frame); } } else { - for (int page : params.pages) { - if (page >= page_count) + for (size_t i = 0; i < params.pages.size(); ++i) { + if (params.pages[i] >= page_count) break; - page_params.page_number = page; + page_params.page_number = params.pages[i]; PrintPageInternal(page_params, frame); } } diff --git a/chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.cc b/chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.cc index 4b1b0395627..46465f4dfd4 100644 --- a/chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.cc +++ b/chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.cc @@ -301,8 +301,8 @@ bool SpellcheckCharAttribute::OutputDefault(UChar c, // SpellcheckWordIterator implementation: SpellcheckWordIterator::SpellcheckWordIterator() - : text_(nullptr), - attribute_(nullptr), + : text_(NULL), + attribute_(NULL), iterator_() { } diff --git a/chromium_src/extensions/common/url_pattern.cc b/chromium_src/extensions/common/url_pattern.cc index 3742d2fe38a..4303689fe81 100644 --- a/chromium_src/extensions/common/url_pattern.cc +++ b/chromium_src/extensions/common/url_pattern.cc @@ -118,8 +118,8 @@ std::string StripTrailingWildcard(const std::string& path) { namespace extensions { // static bool URLPattern::IsValidSchemeForExtensions(const std::string& scheme) { - for (auto& kValidScheme : kValidSchemes) { - if (scheme == kValidScheme) + for (size_t i = 0; i < arraysize(kValidSchemes); ++i) { + if (scheme == kValidSchemes[i]) return true; } return false; @@ -346,7 +346,7 @@ bool URLPattern::SetPort(const std::string& port) { bool URLPattern::MatchesURL(const GURL& test) const { const GURL* test_url = &test; - bool has_inner_url = test.inner_url() != nullptr; + bool has_inner_url = test.inner_url() != NULL; if (has_inner_url) { if (!test.SchemeIsFileSystem()) @@ -370,7 +370,7 @@ bool URLPattern::MatchesURL(const GURL& test) const { bool URLPattern::MatchesSecurityOrigin(const GURL& test) const { const GURL* test_url = &test; - bool has_inner_url = test.inner_url() != nullptr; + bool has_inner_url = test.inner_url() != NULL; if (has_inner_url) { if (!test.SchemeIsFileSystem()) @@ -543,8 +543,9 @@ bool URLPattern::Contains(const URLPattern& other) const { bool URLPattern::MatchesAnyScheme( const std::vector& schemes) const { - for (const auto& scheme : schemes) { - if (MatchesScheme(scheme)) + for (std::vector::const_iterator i = schemes.begin(); + i != schemes.end(); ++i) { + if (MatchesScheme(*i)) return true; } @@ -553,8 +554,9 @@ bool URLPattern::MatchesAnyScheme( bool URLPattern::MatchesAllSchemes( const std::vector& schemes) const { - for (const auto& scheme : schemes) { - if (!MatchesScheme(scheme)) + for (std::vector::const_iterator i = schemes.begin(); + i != schemes.end(); ++i) { + if (!MatchesScheme(*i)) return false; } @@ -584,9 +586,9 @@ std::vector URLPattern::GetExplicitSchemes() const { return result; } - for (auto& kValidScheme : kValidSchemes) { - if (MatchesScheme(kValidScheme)) { - result.push_back(kValidScheme); + for (size_t i = 0; i < arraysize(kValidSchemes); ++i) { + if (MatchesScheme(kValidSchemes[i])) { + result.push_back(kValidSchemes[i]); } } diff --git a/chromium_src/net/test/embedded_test_server/stream_listen_socket.cc b/chromium_src/net/test/embedded_test_server/stream_listen_socket.cc index 0b93c7a9369..2514c636cbe 100644 --- a/chromium_src/net/test/embedded_test_server/stream_listen_socket.cc +++ b/chromium_src/net/test/embedded_test_server/stream_listen_socket.cc @@ -123,7 +123,7 @@ int StreamListenSocket::GetPeerAddress(IPEndPoint* address) const { } SocketDescriptor StreamListenSocket::AcceptSocket() { - SocketDescriptor conn = HANDLE_EINTR(accept(socket_, nullptr, nullptr)); + SocketDescriptor conn = HANDLE_EINTR(accept(socket_, NULL, NULL)); if (conn == kInvalidSocket) LOG(ERROR) << "Error accepting connection."; else From 4ac4dacffe2d2ae02e127699198db46a23c232c3 Mon Sep 17 00:00:00 2001 From: Haojian Wu Date: Sun, 10 Jul 2016 15:56:42 +0200 Subject: [PATCH 6/6] Some manual change to for-ranged loop. Use "const auto&" where possible. --- atom/browser/api/atom_api_session.cc | 2 +- atom/browser/common_web_contents_delegate.cc | 2 +- atom/browser/ui/accelerator_util.cc | 2 +- atom/browser/window_list.cc | 2 +- atom/common/api/atom_api_native_image.cc | 2 +- atom/common/node_bindings_mac.cc | 3 ++- atom/renderer/atom_render_view_observer.cc | 2 +- atom/utility/atom_content_utility_client.cc | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/atom/browser/api/atom_api_session.cc b/atom/browser/api/atom_api_session.cc index ae5854df538..c898f5f1b33 100644 --- a/atom/browser/api/atom_api_session.cc +++ b/atom/browser/api/atom_api_session.cc @@ -241,7 +241,7 @@ void OnGetBackend(disk_cache::Backend** backend_ptr, } else if (action == Session::CacheAction::STATS) { base::StringPairs stats; (*backend_ptr)->GetStats(&stats); - for (auto& stat : stats) { + for (const auto& stat : stats) { if (stat.first == "Current size") { int current_size; base::StringToInt(stat.second, ¤t_size); diff --git a/atom/browser/common_web_contents_delegate.cc b/atom/browser/common_web_contents_delegate.cc index e94203e0b5a..f2f0ee8aec5 100644 --- a/atom/browser/common_web_contents_delegate.cc +++ b/atom/browser/common_web_contents_delegate.cc @@ -435,7 +435,7 @@ void CommonWebContentsDelegate::DevToolsRequestFileSystems() { } base::ListValue file_system_value; - for (auto& file_system : file_systems) + for (const auto& file_system : file_systems) file_system_value.Append(CreateFileSystemValue(file_system)); web_contents_->CallClientFunction("DevToolsAPI.fileSystemsLoaded", &file_system_value, nullptr, nullptr); diff --git a/atom/browser/ui/accelerator_util.cc b/atom/browser/ui/accelerator_util.cc index 1c26af1b396..eb89bf0c35f 100644 --- a/atom/browser/ui/accelerator_util.cc +++ b/atom/browser/ui/accelerator_util.cc @@ -30,7 +30,7 @@ bool StringToAccelerator(const std::string& shortcut, // Now, parse it into an accelerator. int modifiers = ui::EF_NONE; ui::KeyboardCode key = ui::VKEY_UNKNOWN; - for (auto& token : tokens) { + for (const auto& token : tokens) { bool shifted = false; ui::KeyboardCode code = atom::KeyboardCodeFromStr(token, &shifted); if (shifted) diff --git a/atom/browser/window_list.cc b/atom/browser/window_list.cc index 3568df9e6df..83bf615aad2 100644 --- a/atom/browser/window_list.cc +++ b/atom/browser/window_list.cc @@ -70,7 +70,7 @@ void WindowList::RemoveObserver(WindowListObserver* observer) { // static void WindowList::CloseAllWindows() { WindowVector windows = GetInstance()->windows_; - for (auto& window : windows) + for (const auto& window : windows) window->Close(); } diff --git a/atom/common/api/atom_api_native_image.cc b/atom/common/api/atom_api_native_image.cc index f694ffe7e96..80275e26a7f 100644 --- a/atom/common/api/atom_api_native_image.cc +++ b/atom/common/api/atom_api_native_image.cc @@ -63,7 +63,7 @@ float GetScaleFactorFromPath(const base::FilePath& path) { // We don't try to convert string to float here because it is very very // expensive. - for (auto& kScaleFactorPair : kScaleFactorPairs) { + for (const auto& kScaleFactorPair : kScaleFactorPairs) { if (base::EndsWith(filename, kScaleFactorPair.name, base::CompareCase::INSENSITIVE_ASCII)) return kScaleFactorPair.scale; diff --git a/atom/common/node_bindings_mac.cc b/atom/common/node_bindings_mac.cc index 6be1226ae31..cbcbdba3605 100644 --- a/atom/common/node_bindings_mac.cc +++ b/atom/common/node_bindings_mac.cc @@ -54,7 +54,8 @@ void NodeBindingsMac::PollEvents() { // Wait for new libuv events. int r; do { - r = select(fd + 1, &readset, nullptr, nullptr, timeout == -1 ? nullptr : &tv); + r = select(fd + 1, &readset, nullptr, nullptr, + timeout == -1 ? nullptr : &tv); } while (r == -1 && errno == EINTR); } diff --git a/atom/renderer/atom_render_view_observer.cc b/atom/renderer/atom_render_view_observer.cc index e579165d726..45a41eef8ac 100644 --- a/atom/renderer/atom_render_view_observer.cc +++ b/atom/renderer/atom_render_view_observer.cc @@ -132,7 +132,7 @@ void AtomRenderViewObserver::DraggableRegionsChanged(blink::WebFrame* frame) { blink::WebVector webregions = frame->document().draggableRegions(); std::vector regions; - for (auto& webregion : webregions) { + for (const auto& webregion : webregions) { DraggableRegion region; region.bounds = webregion.bounds; region.draggable = webregion.draggable; diff --git a/atom/utility/atom_content_utility_client.cc b/atom/utility/atom_content_utility_client.cc index 518be30510c..8d4ccf62893 100644 --- a/atom/utility/atom_content_utility_client.cc +++ b/atom/utility/atom_content_utility_client.cc @@ -58,7 +58,7 @@ bool AtomContentUtilityClient::OnMessageReceived( IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() - for (auto it = handlers_.begin(); !handled && it != handlers_.end(); ++it) { + for (auto it = handlers_.begin(); !handled && it != handlers_.end(); ++it) { handled = (*it)->OnMessageReceived(message); }