equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 831d03cde86aa6b8803d5ac431e2d28bf85c9289 |
2 # Parent af0655f894a27ef60aa8438af7939a5ebc498df0 |
3 |
3 |
4 diff --git a/gfx/skia/skia/include/codec/SkEncodedOrigin.h b/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
4 diff --git a/gfx/skia/skia/include/codec/SkEncodedOrigin.h b/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
5 --- a/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
5 --- a/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
6 +++ b/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
6 +++ b/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
7 @@ -36,16 +36,17 @@ static inline SkMatrix SkEncodedOriginTo |
7 @@ -36,16 +36,17 @@ static inline SkMatrix SkEncodedOriginTo |
418 Precision::constructFractionSignificant( |
418 Precision::constructFractionSignificant( |
419 const FractionPrecision &base, |
419 const FractionPrecision &base, |
420 diff --git a/js/src/irregexp/imported/regexp-parser.cc b/js/src/irregexp/imported/regexp-parser.cc |
420 diff --git a/js/src/irregexp/imported/regexp-parser.cc b/js/src/irregexp/imported/regexp-parser.cc |
421 --- a/js/src/irregexp/imported/regexp-parser.cc |
421 --- a/js/src/irregexp/imported/regexp-parser.cc |
422 +++ b/js/src/irregexp/imported/regexp-parser.cc |
422 +++ b/js/src/irregexp/imported/regexp-parser.cc |
423 @@ -2644,16 +2644,17 @@ bool MayContainStrings(ClassSetOperandTy |
423 @@ -2764,16 +2764,17 @@ bool MayContainStrings(ClassSetOperandTy |
424 return false; |
424 return false; |
425 case ClassSetOperandType::kCharacterClassEscape: |
425 case ClassSetOperandType::kCharacterClassEscape: |
426 case ClassSetOperandType::kClassStringDisjunction: |
426 case ClassSetOperandType::kClassStringDisjunction: |
427 return operand->AsClassSetOperand()->has_strings(); |
427 return operand->AsClassSetOperand()->has_strings(); |
428 case ClassSetOperandType::kNestedClass: |
428 case ClassSetOperandType::kNestedClass: |
432 + UNREACHABLE(); |
432 + UNREACHABLE(); |
433 } |
433 } |
434 |
434 |
435 } // namespace |
435 } // namespace |
436 |
436 |
437 // TODO(v8:11935): Change permalink once proposal is in stage 4. |
|
438 // https://arai-a.github.io/ecma262-compare/snapshot.html?pr=2418#prod-ClassUnion |
|
439 template <class CharT> |
437 template <class CharT> |
440 RegExpTree* RegExpParserImpl<CharT>::ParseClassUnion( |
438 void RegExpParserImpl<CharT>::AddMaybeSimpleCaseFoldedRange( |
|
439 ZoneList<CharacterRange>* ranges, CharacterRange new_range) { |
|
440 DCHECK(unicode_sets()); |
441 diff --git a/third_party/libwebrtc/api/adaptation/resource.cc b/third_party/libwebrtc/api/adaptation/resource.cc |
441 diff --git a/third_party/libwebrtc/api/adaptation/resource.cc b/third_party/libwebrtc/api/adaptation/resource.cc |
442 --- a/third_party/libwebrtc/api/adaptation/resource.cc |
442 --- a/third_party/libwebrtc/api/adaptation/resource.cc |
443 +++ b/third_party/libwebrtc/api/adaptation/resource.cc |
443 +++ b/third_party/libwebrtc/api/adaptation/resource.cc |
444 @@ -17,16 +17,17 @@ namespace webrtc { |
444 @@ -17,16 +17,17 @@ namespace webrtc { |
445 const char* ResourceUsageStateToString(ResourceUsageState usage_state) { |
445 const char* ResourceUsageStateToString(ResourceUsageState usage_state) { |
682 |
682 |
683 std::string VideoSendStream::StreamStats::ToString() const { |
683 std::string VideoSendStream::StreamStats::ToString() const { |
684 diff --git a/third_party/libwebrtc/media/base/codec.cc b/third_party/libwebrtc/media/base/codec.cc |
684 diff --git a/third_party/libwebrtc/media/base/codec.cc b/third_party/libwebrtc/media/base/codec.cc |
685 --- a/third_party/libwebrtc/media/base/codec.cc |
685 --- a/third_party/libwebrtc/media/base/codec.cc |
686 +++ b/third_party/libwebrtc/media/base/codec.cc |
686 +++ b/third_party/libwebrtc/media/base/codec.cc |
687 @@ -201,16 +201,17 @@ bool Codec::Matches(const Codec& codec, |
687 @@ -200,16 +200,17 @@ bool Codec::Matches(const Codec& codec) |
688 (codec.bitrate == 0 || bitrate <= 0 || |
688 (codec.bitrate == 0 || bitrate <= 0 || |
689 bitrate == codec.bitrate) && |
689 bitrate == codec.bitrate) && |
690 ((codec.channels < 2 && channels < 2) || |
690 ((codec.channels < 2 && channels < 2) || |
691 channels == codec.channels); |
691 channels == codec.channels); |
692 |
692 |