Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 00:35:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge mozilla-central to autoland. a=merge CLOSED TREE

Browse Source
This commit is contained in:
Gurzau Raul 2019-07-09 12:57:07 +03:00
commit 1e8901d20d
10 changed files with 41 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gfx/layers/wr/WebRenderBridgeParent.cpp
View File

@ -85,15 +85,9 @@ bool gecko_profiler_thread_is_being_profiled() {
#endif
}
bool is_glcontext_egl(void* glcontext_ptr) {
MOZ_ASSERT(glcontext_ptr);
mozilla::gl::GLContext* glcontext =
reinterpret_cast<mozilla::gl::GLContext*>(glcontext_ptr);
if (!glcontext) {
return false;
}
return glcontext->GetContextType() == mozilla::gl::GLContextType::EGL;
bool is_glcontext_gles(void* const glcontext_ptr) {
MOZ_RELEASE_ASSERT(glcontext_ptr);
return reinterpret_cast<mozilla::gl::GLContext*>(glcontext_ptr)->IsGLES();
}
bool is_glcontext_angle(void* glcontext_ptr) {

10
gfx/tests/mochitest/test_font_whitelist.html
View File

@ -20,8 +20,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1121643
/** Test for Bug 1121643 **/
SimpleTest.requestFlakyTimeout("This test is flaky.");
const InspectorUtils = SpecialPowers.InspectorUtils;
// Given an element id, returns the first font face name encountered.
@ -38,6 +36,8 @@ const fonts = { mono: fontUsed("mono"),
sans: fontUsed("sans"),
serif: fontUsed("serif") };
let hack = 0;
// Set the font whitelist to contain none, some, or all of the
// default mono, sans, and serif fonts. Check that the rendering
// of our three test elements uses only fonts present in the
@ -55,7 +55,11 @@ let testFontWhitelist = async function(useMono, useSans, useSerif) {
}
await SpecialPowers.pushPrefEnv({"set": [["font.system.whitelist",
whitelist.join(", ")]]});
await new Promise(resolve => setTimeout(resolve, 2000));
await new Promise(SimpleTest.executeSoon);
await SpecialPowers.setIntPref("font.fixme.hack", hack++);
await new Promise(SimpleTest.executeSoon);
// If whitelist is empty, then whitelisting is considered disabled
// and all fonts are allowed.
info("font whitelist: " + JSON.stringify(whitelist));

6
gfx/webrender_bindings/src/bindings.rs
View File

@ -535,7 +535,7 @@ extern "C" {
fn is_in_compositor_thread() -> bool;
fn is_in_render_thread() -> bool;
fn is_in_main_thread() -> bool;
fn is_glcontext_egl(glcontext_ptr: *mut c_void) -> bool;
fn is_glcontext_gles(glcontext_ptr: *mut c_void) -> bool;
fn is_glcontext_angle(glcontext_ptr: *mut c_void) -> bool;
// Enables binary recording that can be used with `wrench replay`
// Outputs a wr-record-*.bin file for each window that is shown
@ -1106,7 +1106,7 @@ fn wr_device_new(gl_context: *mut c_void, pc: Option<&mut WrProgramCache>)
assert!(unsafe { is_in_render_thread() });
let gl;
if unsafe { is_glcontext_egl(gl_context) } {
if unsafe { is_glcontext_gles(gl_context) } {
gl = unsafe { gl::GlesFns::load_with(|symbol| get_proc_address(gl_context, symbol)) };
} else {
gl = unsafe { gl::GlFns::load_with(|symbol| get_proc_address(gl_context, symbol)) };
@ -1171,7 +1171,7 @@ pub extern "C" fn wr_window_new(window_id: WrWindowId,
};
let gl;
if unsafe { is_glcontext_egl(gl_context) } {
if unsafe { is_glcontext_gles(gl_context) } {
gl = unsafe { gl::GlesFns::load_with(|symbol| get_proc_address(gl_context, symbol)) };
} else {
gl = unsafe { gl::GlFns::load_with(|symbol| get_proc_address(gl_context, symbol)) };

2
gfx/webrender_bindings/webrender_ffi.h
View File

@ -19,7 +19,7 @@ extern "C" {
bool is_in_compositor_thread();
bool is_in_main_thread();
bool is_in_render_thread();
bool is_glcontext_egl(void* glcontext_ptr);
bool is_glcontext_gles(void* glcontext_ptr);
bool is_glcontext_angle(void* glcontext_ptr);
bool gfx_use_wrench();
const char* gfx_wr_resource_path_override();

5
testing/web-platform/meta/service-workers/service-worker/claim-shared-worker-fetch.https.html.ini Normal file
View File

@ -0,0 +1,5 @@
[claim-shared-worker-fetch.https.html]
[fetch() in SharedWorker should be intercepted after the client is claimed.]
disabled:
if (os == "android"): Frequently failing on geckoview (Bug 1554991)

5
testing/web-platform/meta/service-workers/service-worker/clients-matchall-client-types.https.html.ini
View File

@ -1,5 +1,4 @@
[clients-matchall-client-types.https.html]
[Verify matchAll() with {window, sharedworker, worker} client types]
expected:
if (os == "android") and e10s: FAIL
disabled:
if (os == "android"): Frequently failing on geckoview (Bug 1550895, Bug 1352247)

15
testing/web-platform/meta/service-workers/service-worker/clients-matchall-order.https.html.ini
View File

@ -1,16 +1,19 @@
[clients-matchall-order.https.html]
[Clients.matchAll() returns uncontrolled windows in focus order. Case 1.]
disabled:
if (os == "android") and not debug: Frequently failing on geckoview (Bug 1518237)
expected:
if (os == "android") and e10s: FAIL
if (os == "android") and not e10s: FAIL
if (os == "android"): FAIL
[Clients.matchAll() returns controlled windows in focus order. Case 1.]
disabled:
if (os == "android") and not debug: Frequently failing on geckoview (Bug 1344484)
expected:
if (os == "android") and e10s: FAIL
if (os == "android") and not e10s: FAIL
if (os == "android"): FAIL
[Clients.matchAll() returns controlled windows and frames in focus order.]
disabled:
if (os == "android") and not debug: Frequently failing on geckoview (Bug 1562728)
expected:
if (os == "android") and e10s: FAIL
if (os == "android") and not e10s: FAIL
if (os == "android"): FAIL

8
testing/web-platform/meta/service-workers/service-worker/navigation-timing.https.html.ini
View File

@ -3,10 +3,10 @@
if (os == "android") and not debug: https://bugzilla.mozilla.org/show_bug.cgi?id=1560324
if (os == "android") and not e10s: https://bugzilla.mozilla.org/show_bug.cgi?id=1499972
[Service worker controlled navigation timing network fallback]
expected:
if (os == "android") and not debug: PASS
disabled:
if (os == "android"): Frequently failing on geckoview (Bug 1481427)
[Service worker controlled navigation timing redirect]
expected:
if (os == "android") and not debug: FAIL
disabled:
if (os == "android"): Frequently failing on geckoview (Bug 1560324, Bug 1481553)

4
testing/web-platform/meta/service-workers/service-worker/unregister-then-register.https.html.ini
View File

@ -7,3 +7,7 @@
[Unregister then register does not resolve to the original value even if the registration is in use.]
expected: FAIL
[Unregister then register resolves to a new value]
disabled:
if (os == "android") and debug: Frequently failing on geckoview (Bug 1523205)

3
testing/web-platform/meta/service-workers/service-worker/unregister.https.html.ini
View File

@ -1,4 +1,7 @@
[unregister.https.html]
disabled:
if (os == "android") and not e10s: https://bugzilla.mozilla.org/show_bug.cgi?id=1499972
[Unregister twice]
disabled:
if (os == "android"): Frequently failing on geckoview (Bug 1299032)