Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge #29335: chromium: 60.0.3112.90 -> 61.0.3163.79 [security]
(cherry picked from commit b82b23b)
- Loading branch information
Showing
8 changed files
with
132 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
pkgs/applications/networking/browsers/chromium/patches/chromium-atk-r1.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- a/content/browser/accessibility/browser_accessibility_auralinux.cc.orig 2017-07-27 06:28:01.090257874 +0000 | ||
+++ b/content/browser/accessibility/browser_accessibility_auralinux.cc 2017-07-27 06:28:21.174653680 +0000 | ||
@@ -571,7 +571,7 @@ | ||
// it's best to leave this out rather than break people's builds: | ||
#if defined(ATK_CHECK_VERSION) | ||
#if ATK_CHECK_VERSION(2, 16, 0) | ||
- atk_state_set_add_state(atk_state_set, ATK_STATE_READ_ONLY); | ||
+ atk_state_set_add_state(state_set, ATK_STATE_READ_ONLY); | ||
#endif | ||
#endif | ||
break; |
14 changes: 14 additions & 0 deletions
14
pkgs/applications/networking/browsers/chromium/patches/chromium-gcc-r1.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
diff --git a/base/numerics/safe_math_shared_impl.h b/base/numerics/safe_math_shared_impl.h | ||
index 99f230ce7e9a..de2415d402f5 100644 | ||
--- a/base/numerics/safe_math_shared_impl.h | ||
+++ b/base/numerics/safe_math_shared_impl.h | ||
@@ -21,8 +21,7 @@ | ||
#if !defined(__native_client__) && \ | ||
((defined(__clang__) && \ | ||
((__clang_major__ > 3) || \ | ||
- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \ | ||
- (defined(__GNUC__) && __GNUC__ >= 5)) | ||
+ (__clang_major__ == 3 && __clang_minor__ >= 4)))) | ||
#include "base/numerics/safe_math_clang_gcc_impl.h" | ||
#define BASE_HAS_OPTIMIZED_SAFE_MATH (1) | ||
#else |
66 changes: 66 additions & 0 deletions
66
pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r1.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
--- a/chrome/browser/devtools/devtools_file_system_indexer.cc | ||
+++ b/chrome/browser/devtools/devtools_file_system_indexer.cc | ||
@@ -34,7 +34,6 @@ using base::TimeDelta; | ||
using base::TimeTicks; | ||
using content::BrowserThread; | ||
using std::map; | ||
-using std::set; | ||
using std::string; | ||
using std::vector; | ||
|
||
@@ -191,7 +190,7 @@ vector<FilePath> Index::Search(const string& query) { | ||
if (trigram != kUndefinedTrigram) | ||
trigrams.push_back(trigram); | ||
} | ||
- set<FileId> file_ids; | ||
+ std::set<FileId> file_ids; | ||
bool first = true; | ||
vector<Trigram>::const_iterator it = trigrams.begin(); | ||
for (; it != trigrams.end(); ++it) { | ||
@@ -203,7 +202,7 @@ vector<FilePath> Index::Search(const string& query) { | ||
first = false; | ||
continue; | ||
} | ||
- set<FileId> intersection = base::STLSetIntersection<set<FileId> >( | ||
+ std::set<FileId> intersection = base::STLSetIntersection<std::set<FileId> >( | ||
file_ids, index_[trigram]); | ||
file_ids.swap(intersection); | ||
} | ||
diff --git a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h | ||
index 94bb9161ec85..e40c6387f72e 100644 | ||
--- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h | ||
+++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h | ||
@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents { | ||
allocation_length_(0), | ||
data_(data), | ||
data_length_(0), | ||
- kind_(AllocationKind::kNormal), | ||
+ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal), | ||
deleter_(deleter) {} | ||
DataHandle(void* allocation_base, | ||
size_t allocation_length, | ||
@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents { | ||
reinterpret_cast<uintptr_t>(allocation_base_) + | ||
allocation_length_); | ||
switch (kind_) { | ||
- case AllocationKind::kNormal: | ||
+ case WTF::ArrayBufferContents::AllocationKind::kNormal: | ||
DCHECK(deleter_); | ||
deleter_(data_); | ||
return; | ||
- case AllocationKind::kReservation: | ||
+ case WTF::ArrayBufferContents::AllocationKind::kReservation: | ||
ReleaseReservedMemory(allocation_base_, allocation_length_); | ||
return; | ||
} | ||
--- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000 | ||
+++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000 | ||
@@ -10,7 +10,7 @@ | ||
|
||
#include "webrtc/modules/audio_processing/aec3/aec_state.h" | ||
|
||
-#include <math.h> | ||
+#include <cmath> | ||
#include <numeric> | ||
#include <vector> | ||
|
27 changes: 27 additions & 0 deletions
27
pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r14.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
commit 96c271f8ab2be7ea4199078ea65ac50c6ada4685 | ||
Author: Pawel Hajdan, Jr <phajdan.jr@chromium.org> | ||
Date: Wed Jul 26 21:51:54 2017 +0000 | ||
|
||
wip | ||
|
||
diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py | ||
index 1390560f8e37..ff2ae57c46b0 100755 | ||
--- a/tools/gn/bootstrap/bootstrap.py | ||
+++ b/tools/gn/bootstrap/bootstrap.py | ||
@@ -449,6 +449,7 @@ def write_gn_ninja(path, root_gen_dir, options): | ||
'base/metrics/histogram_base.cc', | ||
'base/metrics/histogram_functions.cc', | ||
'base/metrics/histogram_samples.cc', | ||
+ 'base/metrics/histogram_snapshot_manager.cc', | ||
'base/metrics/metrics_hashes.cc', | ||
'base/metrics/persistent_histogram_allocator.cc', | ||
'base/metrics/persistent_memory_allocator.cc', | ||
@@ -534,7 +535,7 @@ def write_gn_ninja(path, root_gen_dir, options): | ||
'base/trace_event/heap_profiler_allocation_context_tracker.cc', | ||
'base/trace_event/heap_profiler_allocation_register.cc', | ||
'base/trace_event/heap_profiler_event_filter.cc', | ||
- 'base/trace_event/heap_profiler_event_writer.cc', | ||
+ 'base/trace_event/heap_profiler_heap_dump_writer.cc', | ||
'base/trace_event/heap_profiler_serialization_state.cc', | ||
'base/trace_event/heap_profiler_stack_frame_deduplicator.cc', | ||
'base/trace_event/heap_profiler_type_name_deduplicator.cc', |
13 changes: 0 additions & 13 deletions
13
pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r8.patch
This file was deleted.
Oops, something went wrong.
18 changes: 9 additions & 9 deletions
18
pkgs/applications/networking/browsers/chromium/upstream-info.nix
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,18 @@ | ||
# This file is autogenerated from update.sh in the same directory. | ||
{ | ||
beta = { | ||
sha256 = "1sh3rq36sh4g7blajvqfvs06fs5sbrbdp50qq0cvcj4k3fmb4bd8"; | ||
sha256bin64 = "1w67y4z57qm5fwniayncly7a4mjmwqir7gfd54ny8lwlf247d43m"; | ||
version = "60.0.3112.78"; | ||
sha256 = "09q7s5x22vnmvqyz0f1l6qnaryglmsp0rc63qcg5sfvgv2g17g5x"; | ||
sha256bin64 = "12z6z8gjxl4mx8j6db8nnlzrj03rh4qwyrvcf4hqcsv7b1armg6j"; | ||
version = "61.0.3163.79"; | ||
}; | ||
dev = { | ||
sha256 = "0yan2dzx1854f3xslif5682rkb82a1li6vxj12z5s5fxqijhj1jq"; | ||
sha256bin64 = "0ddva2rqnid2gcx3qh72p41wc15869w2w9n0rbdpn662rpl041v1"; | ||
version = "61.0.3163.25"; | ||
sha256 = "168i6dcdl13an3vlr2m83q8fcprgckmclkmzwj70jdkp84qx80fq"; | ||
sha256bin64 = "116vddp01m2ls337zj6r4h1nvybphvldlk9bs8czypx5skn29vbz"; | ||
version = "62.0.3202.9"; | ||
}; | ||
stable = { | ||
sha256 = "1rirhwvccidza4q4z1gqdwcd9v1bymh1m9r2cq8jhiabfrjpjbxl"; | ||
sha256bin64 = "1lw349ips0sgyls3arv864yq5xykfn9jilwkalvllaq6yvdvcvlk"; | ||
version = "60.0.3112.90"; | ||
sha256 = "09q7s5x22vnmvqyz0f1l6qnaryglmsp0rc63qcg5sfvgv2g17g5x"; | ||
sha256bin64 = "0a0wd06c0v061lnmb8x20gqgsg9zqafp2kq1fl3cjm0ldg9rwayw"; | ||
version = "61.0.3163.79"; | ||
}; | ||
} |