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

Merge autoland to mozilla-central a=merge

Browse Source
This commit is contained in:
imoraru 2021-04-20 12:49:23 +03:00
commit 9b430bb1a1
14 changed files with 10 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.hgtags
View File

@ -207,3 +207,5 @@ c27aac8c84b70e3611b04fc56927719419aefc64 FIREFOX_BETA_87_BASE
396d6048aec7d8118bf31637be4a3f5aa06d74ee FIREFOX_NIGHTLY_87_END
57704923d311a051831c7155363913d5473f2a73 FIREFOX_BETA_88_BASE
729eaf579f2827239182db122d59e42730ea540f FIREFOX_NIGHTLY_88_END
8e850fd29a957f505e0355c1326279e06e9040bb FIREFOX_BETA_89_BASE
a69c07c7da3a386e3baf4b7d604312d3fa974273 FIREFOX_NIGHTLY_89_END

3
CLOBBER
View File

@ -22,5 +22,4 @@
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
# don't change CLOBBER for WebIDL changes any more.
Merge day clobber
Bug 1682030 - OSX builds complain about TestPlugin after that product is removed from tree
Merge day clobber

2
browser/config/version.txt
View File

@ -1 +1 @@
89.0a1
90.0a1

2
browser/config/version_display.txt
View File

@ -1 +1 @@
89.0a1
90.0a1

2
config/milestone.txt
View File

@ -10,4 +10,4 @@
# hardcoded milestones in the tree from these two files.
#--------------------------------------------------------
89.0a1
90.0a1

1
gfx/wr/swgl/src/composite.h
View File

@ -406,7 +406,6 @@ void* GetResourceBuffer(LockedTexture* resource, int32_t* width,
return resource->buf;
}
// Extension for optimized compositing of textures or framebuffers that may be
// safely used across threads. The source and destination must be locked to
// ensure that they can be safely accessed while the SWGL context might be used

16
gfx/wr/webrender/src/scene_building.rs
View File

@ -490,9 +490,6 @@ pub struct SceneBuilder<'a> {
/// caching slices to only the top-level content frame.
iframe_size: Vec<LayoutSize>,
/// A stack of clip-chain IDs (one for each iframe currently pushed).
iframe_clips: Vec<ClipChainId>,
/// The current quality / performance settings for this scene.
quality_settings: QualitySettings,
@ -551,7 +548,6 @@ impl<'a> SceneBuilder<'a> {
rf_mapper: ReferenceFrameMapper::new(),
external_scroll_mapper: ScrollOffsetMapper::new(),
iframe_size: Vec::new(),
iframe_clips: Vec::new(),
quality_settings: view.quality_settings,
tile_cache_builder: TileCacheBuilder::new(),
snap_to_device,
@ -775,17 +771,8 @@ impl<'a> SceneBuilder<'a> {
self.add_tile_cache_barrier_if_needed(SliceFlags::empty());
}
// Get a clip-chain id for the root clip for this pipeline. We will
// add that as an unconditional clip to any tile cache created within
// this iframe. This ensures these clips are handled by the tile cache
// compositing code, which is more efficient and accurate than applying
// these clips individually to each primitive.
let clip_id = ClipId::root(info.pipeline_id);
let clip_chain_id = self.get_clip_chain(clip_id);
self.rf_mapper.push_scope();
self.iframe_size.push(size);
self.iframe_clips.push(clip_chain_id);
let new_context = BuildContext {
pipeline_id: info.pipeline_id,
@ -814,7 +801,6 @@ impl<'a> SceneBuilder<'a> {
}
ContextKind::Iframe { parent_traversal } => {
self.iframe_size.pop();
self.iframe_clips.pop();
self.rf_mapper.pop_scope();
self.clip_store.pop_clip_root();
@ -1672,7 +1658,6 @@ impl<'a> SceneBuilder<'a> {
self.interners,
&self.config,
&self.quality_settings,
&self.iframe_clips,
);
}
}
@ -2022,7 +2007,6 @@ impl<'a> SceneBuilder<'a> {
&self.clip_store,
self.interners,
&self.config,
&self.iframe_clips,
);
return;

37
gfx/wr/webrender/src/tile_cache.rs
View File

@ -36,8 +36,6 @@ pub struct PendingTileCache {
pub prim_list: PrimitiveList,
/// Parameters that define the tile cache (such as background color, shared clips, reference spatial node)
pub params: TileCacheParams,
/// A list of additional clip chains that get applied to the shared clips unconditionally for this tile cache
pub extra_clips: Vec<ClipChainId>,
}
/// Used during scene building to construct the list of pending tile caches.
@ -119,7 +117,6 @@ impl TileCacheBuilder {
clip_store: &ClipStore,
interners: &Interners,
config: &FrameBuilderConfig,
extra_clips: &[ClipChainId],
) {
assert!(self.can_add_container_tile_cache());
@ -253,7 +250,6 @@ impl TileCacheBuilder {
self.pending_tile_caches.push(PendingTileCache {
prim_list,
params,
extra_clips: extra_clips.to_vec(),
});
// Add a tile cache barrier so that the next prim definitely gets added to a
@ -273,7 +269,6 @@ impl TileCacheBuilder {
interners: &Interners,
config: &FrameBuilderConfig,
quality_settings: &QualitySettings,
extra_tile_cache_clips: &[ClipChainId],
) {
// Check if we want to create a new slice based on the current / next scroll root
let scroll_root = self.find_scroll_root(spatial_node_index, spatial_tree);
@ -424,7 +419,6 @@ impl TileCacheBuilder {
self.pending_tile_caches.push(PendingTileCache {
prim_list: PrimitiveList::empty(),
params,
extra_clips: extra_tile_cache_clips.to_vec(),
});
self.force_new_tile_cache = None;
@ -466,7 +460,6 @@ impl TileCacheBuilder {
&mut result.picture_cache_spatial_nodes,
config,
&mut result.tile_caches,
&pending_tile_cache.extra_clips,
);
tile_cache_pictures.push(pic_index);
@ -521,23 +514,6 @@ fn add_clips(
}
}
// Walk a clip-chain, and accumulate all clip instances into supplied `prim_clips` array.
fn add_all_clips(
clip_chain_id: ClipChainId,
prim_clips: &mut Vec<ClipInstance>,
clip_store: &ClipStore,
) {
let mut current_clip_chain_id = clip_chain_id;
while current_clip_chain_id != ClipChainId::NONE {
let clip_chain_node = &clip_store
.clip_chain_nodes[current_clip_chain_id.0 as usize];
prim_clips.push(ClipInstance::new(clip_chain_node.handle, clip_chain_node.spatial_node_index));
current_clip_chain_id = clip_chain_node.parent_clip_chain_id;
}
}
/// Given a PrimitiveList and scroll root, construct a tile cache primitive instance
/// that wraps the primitive list.
fn create_tile_cache(
@ -546,13 +522,12 @@ fn create_tile_cache(
scroll_root: SpatialNodeIndex,
prim_list: PrimitiveList,
background_color: Option<ColorF>,
mut shared_clips: Vec<ClipInstance>,
shared_clips: Vec<ClipInstance>,
prim_store: &mut PrimitiveStore,
clip_store: &mut ClipStore,
picture_cache_spatial_nodes: &mut FastHashSet<SpatialNodeIndex>,
frame_builder_config: &FrameBuilderConfig,
tile_caches: &mut FastHashMap<SliceId, TileCacheParams>,
extra_clips: &[ClipChainId],
) -> PictureIndex {
// Add this spatial node to the list to check for complex transforms
// at the start of a frame build.
@ -565,16 +540,6 @@ fn create_tile_cache(
// also work with any complex clips, such as rounded rects and image masks, by
// producing a clip mask that is applied to the picture cache tiles.
// Accumulate any clip instances from the extra_clips array into the shared clips
// that will be applied by this tile cache during compositing.
for clip_chain_id in extra_clips {
add_all_clips(
*clip_chain_id,
&mut shared_clips,
clip_store,
);
}
let mut parent_clip_chain_id = ClipChainId::NONE;
for clip_instance in &shared_clips {
// Add this spatial node to the list to check for complex transforms

2
services/sync/modules/constants.js
View File

@ -7,7 +7,7 @@ var EXPORTED_SYMBOLS = [];
for (let [key, val] of Object.entries({
// Don't manually modify this line, as it is automatically replaced on merge day
// by the gecko_migration.py script.
WEAVE_VERSION: "1.91.0",
WEAVE_VERSION: "1.92.0",
// Sync Server API version that the client supports.
SYNC_API_VERSION: "1.5",

15
toolkit/components/telemetry/Scalars.yaml
View File

@ -3160,21 +3160,6 @@ telemetry:
record_in_processes:
- all
sync_shutdown_ping_sent:
bug_numbers:
- 1673795
description: >
Whether a sync shutdown ping has been sent in this session.
expires: "90"
kind: boolean
notification_emails:
- sync-team@mozilla.com
products:
- 'firefox'
release_channel_collection: opt-out
record_in_processes:
- main
state_file_save_errors:
bug_numbers:
- 1689438

6
toolkit/components/telemetry/app/TelemetryControllerParent.jsm
View File

@ -629,12 +629,6 @@ var Impl = {
return Promise.reject(new Error("Invalid payload type submitted."));
}
// We're trying to track down missing sync pings (bug 1663573), so record
// a temporary cross-checking counter.
if (aType == "sync" && aPayload.why == "shutdown") {
Telemetry.scalarSet("telemetry.sync_shutdown_ping_sent", true);
}
let promise = this._submitPingLogic(aType, aPayload, aOptions);
this._trackPendingPingTask(promise);
return promise;

7
toolkit/components/telemetry/tests/unit/test_SyncPingIntegration.js
View File

@ -46,13 +46,6 @@ add_task(async function test_shutdown_handler_submits() {
await TelemetryController.testShutdown();
Assert.ok(handlerCalled);
// and check we recorded telemetry about it.
let snapshot = Telemetry.getSnapshotForScalars("main", true).parent || {};
Assert.equal(
snapshot["telemetry.sync_shutdown_ping_sent"],
true,
"recorded that we sent a ping."
);
await TelemetryController.testReset();
});

2
toolkit/modules/tests/xpcshell/xpcshell.ini
View File

@ -63,6 +63,6 @@ reason = LOCALE is not defined without MOZ_UPDATER
[test_EventEmitter.js]
[test_ProfileAge.js]
[test_firstStartup.js]
skip-if = toolkit == 'android'
skip-if = true || toolkit == 'android' # Bug 1700836 - telemetry probe expired
[test_AllowedAppSources.js]
skip-if = os != 'win' # Test of a Windows-specific feature

2
xpcom/components/Module.h
View File

@ -21,7 +21,7 @@ namespace mozilla {
* via a module loader.
*/
struct Module {
static const unsigned int kVersion = 89;
static const unsigned int kVersion = 90;
struct CIDEntry;