mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge mozilla-inbound to mozilla-central. a=merge

This commit is contained in:
Dorel Luca 2018-06-10 01:04:17 +03:00
Родитель 25a3c8254c e4164ef1b0
Коммит 3b90edda24
11 изменённых файлов: 96 добавлений и 4 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
gfx/thebes/gfxFcPlatformFontList.cpp
Просмотреть файл

@ -41,7 +41,7 @@
#include "mozilla/X11Util.h" #include "mozilla/X11Util.h"
#endif #endif
#ifdef MOZ_CONTENT_SANDBOX #if defined(MOZ_CONTENT_SANDBOX) && defined (XP_LINUX)
#include "mozilla/SandboxBrokerPolicyFactory.h" #include "mozilla/SandboxBrokerPolicyFactory.h"
#include "mozilla/SandboxSettings.h" #include "mozilla/SandboxSettings.h"
#endif #endif

2
gfx/thebes/gfxFcPlatformFontList.h
Просмотреть файл

@ -23,7 +23,7 @@
#include <cairo.h> #include <cairo.h>
#include <cairo-ft.h> #include <cairo-ft.h>
#ifdef MOZ_CONTENT_SANDBOX #if defined(MOZ_CONTENT_SANDBOX) && defined (XP_LINUX)
#include "mozilla/SandboxBroker.h" #include "mozilla/SandboxBroker.h"
#endif #endif

16
layout/style/crashtests/635153.html Normal file
Просмотреть файл

@ -0,0 +1,16 @@
<!DOCTYPE html>
<html>
<head>
<script>
function boom()
{
var r = document.documentElement;
document.__proto__ = document.createTextNode("text");
r.style.counterReset = "a";
}
</script>
</head>
<body onload="boom();"></body>
</html>

1
layout/style/crashtests/653675.html Normal file
Просмотреть файл

@ -0,0 +1 @@
<body style="-moz-transform: rotate(520327040619807469187028288680706778649deg); position:fixed;"> <body text=black>

7
layout/style/crashtests/694775.html Normal file
Просмотреть файл

@ -0,0 +1,7 @@
<!DOCTYPE html>
<script>
document.documentElement.style.direction = "rtl";
document.__proto__ = null;
</script>

15
layout/style/crashtests/822877.html Normal file
Просмотреть файл

@ -0,0 +1,15 @@
<!DOCTYPE html>
<html>
<head>
<script>
function boom()
{
document.documentElement.style.transitionDelay = "10s";
document.documentElement.style.borderBottomLeftRadius = "999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999%";
}
</script>
</head>
<body onload="boom();"></body>
</html>

5
layout/style/crashtests/827220.html Normal file
Просмотреть файл

@ -0,0 +1,5 @@
<!DOCTYPE html>
<html style="font-size: 8em; clip: rect(auto, 3em, 0, 0); transition-timing-function: cubic-bezier(1, 1152921504606847000, 1, 1); transition-duration: 1s">
<body onload="document.documentElement.style.fontSize = '';">
</body>
</html>

16
layout/style/crashtests/873260-1.html Normal file
Просмотреть файл

@ -0,0 +1,16 @@
<!DOCTYPE html>
<html>
<head>
<script>
function boom()
{
var r = document.documentElement;
r.style.transitionDelay = "60s";
r.style.borderRadius = "9999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999%";
}
</script>
</head>
<body onload="boom();"></body>
</html>

16
layout/style/crashtests/873260-2.html Normal file
Просмотреть файл

@ -0,0 +1,16 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<script>
function boom()
{
document.documentElement.style.transitionDelay = "1ms";
document.documentElement.style.marginRight = "calc(-999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999*-140737488355327px + 1%)";
}
</script>
</head>
<body onload="boom();"></body>
</html>

7
layout/style/crashtests/crashtests.list
Просмотреть файл

@ -74,13 +74,16 @@ load 605689-1.html
load 611922-1.html load 611922-1.html
load 621596-1.html load 621596-1.html
load 622314-1.xhtml load 622314-1.xhtml
load 635153.html
load 637242.xhtml load 637242.xhtml
load 645142.html load 645142.html
load 652976-1.svg load 652976-1.svg
load 653675.html
load 665209-1.html load 665209-1.html
load 671799-1.html load 671799-1.html
load 671799-2.html load 671799-2.html
load 690990-1.html load 690990-1.html
load 694775.html
load 696188-1.html load 696188-1.html
load 696869-1.html load 696869-1.html
load 700116.html load 700116.html
@ -93,6 +96,8 @@ load 806310-1.html
load 809762.html load 809762.html
load 812824.html load 812824.html
load 822766-1.html load 822766-1.html
load 822877.html
load 827220.html
load 827591-1.html load 827591-1.html
load 829817.html load 829817.html
load 842134.html load 842134.html
@ -100,6 +105,8 @@ load 861489-1.html
load 862113.html load 862113.html
load 867487.html load 867487.html
load 873222.html load 873222.html
load 873260-1.html
load 873260-2.html
load 880862.html load 880862.html
load 894245-1.html load 894245-1.html
load 915440.html load 915440.html

13
media/webrtc/trunk/webrtc/modules/video_coding/rtp_frame_reference_finder.cc
Просмотреть файл

@ -434,8 +434,11 @@ void RtpFrameReferenceFinder::ManageFrameVp9(
LOG(LS_WARNING) << "Received keyframe without scalability structure"; LOG(LS_WARNING) << "Received keyframe without scalability structure";
frame->num_references = 0; frame->num_references = 0;
GofInfo info = gof_info_.find(codec_header.tl0_pic_idx)->second; auto gof_info_it = gof_info_.find(codec_header.tl0_pic_idx);
FrameReceivedVp9(frame->picture_id, &info); if (gof_info_it == gof_info_.end())
return;
FrameReceivedVp9(frame->picture_id, &gof_info_it->second);
CompletedFrameVp9(std::move(frame)); CompletedFrameVp9(std::move(frame));
return; return;
} }
@ -508,6 +511,12 @@ bool RtpFrameReferenceFinder::MissingRequiredFrameVp9(uint16_t picture_id,
size_t gof_idx = diff % info.gof->num_frames_in_gof; size_t gof_idx = diff % info.gof->num_frames_in_gof;
size_t temporal_idx = info.gof->temporal_idx[gof_idx]; size_t temporal_idx = info.gof->temporal_idx[gof_idx];
if (temporal_idx >= kMaxTemporalLayers) {
LOG(LS_WARNING) << "At most " << kMaxTemporalLayers << " temporal "
<< "layers are supported.";
return true;
}
// For every reference this frame has, check if there is a frame missing in // For every reference this frame has, check if there is a frame missing in
// the interval (|ref_pid|, |picture_id|) in any of the lower temporal // the interval (|ref_pid|, |picture_id|) in any of the lower temporal
// layers. If so, we are missing a required frame. // layers. If so, we are missing a required frame.