Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Side by Side Diff: content/browser/shared_worker/shared_worker_service_impl.cc

Issue 423173002: Use base::STLSetDifference() in place of std::set_difference() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: assign result of STLSetDifference() Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/shared_worker/shared_worker_service_impl.h" 5 #include "content/browser/shared_worker/shared_worker_service_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
(...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after
628 process_id)) { 628 process_id)) {
629 dependent_renderers.insert(process_id); 629 dependent_renderers.insert(process_id);
630 } 630 }
631 } 631 }
632 return dependent_renderers; 632 return dependent_renderers;
633 } 633 }
634 634
635 void SharedWorkerServiceImpl::CheckWorkerDependency() { 635 void SharedWorkerServiceImpl::CheckWorkerDependency() {
636 const std::set<int> current_worker_depended_renderers = 636 const std::set<int> current_worker_depended_renderers =
637 GetRenderersWithWorkerDependency(); 637 GetRenderersWithWorkerDependency();
638 std::vector<int> added_items; 638 std::vector<int> added_items
639 std::vector<int> removed_items; 639 = base::STLSetDifference<int>(current_worker_depended_renderers,
640 std::set_difference(current_worker_depended_renderers.begin(), 640 last_worker_depended_renderers);
641 current_worker_depended_renderers.end(), 641 std::vector<int> removed_items
642 last_worker_depended_renderers_.begin(), 642 = base::STLSetDifference<int>(last_worker_depended_renderers,
643 last_worker_depended_renderers_.end(), 643 currentworker_depended_renderers);
Andrew T Wilson (Slow) 2014/08/01 15:01:59 This change won't compile due to a typo - how did
644 std::back_inserter(added_items));
645 std::set_difference(last_worker_depended_renderers_.begin(),
646 last_worker_depended_renderers_.end(),
647 current_worker_depended_renderers.begin(),
648 current_worker_depended_renderers.end(),
649 std::back_inserter(removed_items));
650 if (!added_items.empty() || !removed_items.empty()) { 644 if (!added_items.empty() || !removed_items.empty()) {
651 last_worker_depended_renderers_ = current_worker_depended_renderers; 645 last_worker_depended_renderers_ = current_worker_depended_renderers;
652 update_worker_dependency_(added_items, removed_items); 646 update_worker_dependency_(added_items, removed_items);
653 } 647 }
654 } 648 }
655 649
656 void SharedWorkerServiceImpl::ChangeUpdateWorkerDependencyFuncForTesting( 650 void SharedWorkerServiceImpl::ChangeUpdateWorkerDependencyFuncForTesting(
657 UpdateWorkerDependencyFunc new_func) { 651 UpdateWorkerDependencyFunc new_func) {
658 update_worker_dependency_ = new_func; 652 update_worker_dependency_ = new_func;
659 } 653 }
660 654
661 void SharedWorkerServiceImpl::ChangeTryIncrementWorkerRefCountFuncForTesting( 655 void SharedWorkerServiceImpl::ChangeTryIncrementWorkerRefCountFuncForTesting(
662 bool (*new_func)(int)) { 656 bool (*new_func)(int)) {
663 s_try_increment_worker_ref_count_ = new_func; 657 s_try_increment_worker_ref_count_ = new_func;
664 } 658 }
665 659
666 } // namespace content 660 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698