Skip to content

Commit

Permalink
Auto merge of #18391 - emilio:cascade-stoph, r=heycam
Browse files Browse the repository at this point in the history 
style: Stop the cascade when only reset structs change

From https://bugzilla.mozilla.org/show_bug.cgi?id=1395227

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18391)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Sep 6, 2017
2 parents f5e23a3 + ac2be54 commit 9802214
Show file tree
Hide file tree
Showing 11 changed files with 969 additions and 589 deletions.
40 changes: 40 additions & 0 deletions components/style/gecko/generated/atom_macro.rs
View file
Expand Up @@ -4058,6 +4058,16 @@ cfg_if! {
pub static nsGkAtoms_moz_extension: *mut nsIAtom;
#[link_name = "_ZN9nsGkAtoms18all_urlsPermissionE"]
pub static nsGkAtoms_all_urlsPermission: *mut nsIAtom;
#[link_name = "_ZN9nsGkAtoms13clipboardReadE"]
pub static nsGkAtoms_clipboardRead: *mut nsIAtom;
#[link_name = "_ZN9nsGkAtoms14clipboardWriteE"]
pub static nsGkAtoms_clipboardWrite: *mut nsIAtom;
#[link_name = "_ZN9nsGkAtoms8debuggerE"]
pub static nsGkAtoms_debugger: *mut nsIAtom;
#[link_name = "_ZN9nsGkAtoms4tabsE"]
pub static nsGkAtoms_tabs: *mut nsIAtom;
#[link_name = "_ZN9nsGkAtoms18webRequestBlockingE"]
pub static nsGkAtoms_webRequestBlocking: *mut nsIAtom;
#[link_name = "_ZN9nsGkAtoms4httpE"]
pub static nsGkAtoms_http: *mut nsIAtom;
#[link_name = "_ZN9nsGkAtoms5httpsE"]
Expand Down Expand Up @@ -9211,6 +9221,16 @@ cfg_if! {
pub static nsGkAtoms_moz_extension: *mut nsIAtom;
#[link_name = "?all_urlsPermission@nsGkAtoms@@2PEAVnsIAtom@@EA"]
pub static nsGkAtoms_all_urlsPermission: *mut nsIAtom;
#[link_name = "?clipboardRead@nsGkAtoms@@2PEAVnsIAtom@@EA"]
pub static nsGkAtoms_clipboardRead: *mut nsIAtom;
#[link_name = "?clipboardWrite@nsGkAtoms@@2PEAVnsIAtom@@EA"]
pub static nsGkAtoms_clipboardWrite: *mut nsIAtom;
#[link_name = "?debugger@nsGkAtoms@@2PEAVnsIAtom@@EA"]
pub static nsGkAtoms_debugger: *mut nsIAtom;
#[link_name = "?tabs@nsGkAtoms@@2PEAVnsIAtom@@EA"]
pub static nsGkAtoms_tabs: *mut nsIAtom;
#[link_name = "?webRequestBlocking@nsGkAtoms@@2PEAVnsIAtom@@EA"]
pub static nsGkAtoms_webRequestBlocking: *mut nsIAtom;
#[link_name = "?http@nsGkAtoms@@2PEAVnsIAtom@@EA"]
pub static nsGkAtoms_http: *mut nsIAtom;
#[link_name = "?https@nsGkAtoms@@2PEAVnsIAtom@@EA"]
Expand Down Expand Up @@ -14364,6 +14384,16 @@ cfg_if! {
pub static nsGkAtoms_moz_extension: *mut nsIAtom;
#[link_name = "\x01?all_urlsPermission@nsGkAtoms@@2PAVnsIAtom@@A"]
pub static nsGkAtoms_all_urlsPermission: *mut nsIAtom;
#[link_name = "\x01?clipboardRead@nsGkAtoms@@2PAVnsIAtom@@A"]
pub static nsGkAtoms_clipboardRead: *mut nsIAtom;
#[link_name = "\x01?clipboardWrite@nsGkAtoms@@2PAVnsIAtom@@A"]
pub static nsGkAtoms_clipboardWrite: *mut nsIAtom;
#[link_name = "\x01?debugger@nsGkAtoms@@2PAVnsIAtom@@A"]
pub static nsGkAtoms_debugger: *mut nsIAtom;
#[link_name = "\x01?tabs@nsGkAtoms@@2PAVnsIAtom@@A"]
pub static nsGkAtoms_tabs: *mut nsIAtom;
#[link_name = "\x01?webRequestBlocking@nsGkAtoms@@2PAVnsIAtom@@A"]
pub static nsGkAtoms_webRequestBlocking: *mut nsIAtom;
#[link_name = "\x01?http@nsGkAtoms@@2PAVnsIAtom@@A"]
pub static nsGkAtoms_http: *mut nsIAtom;
#[link_name = "\x01?https@nsGkAtoms@@2PAVnsIAtom@@A"]
Expand Down Expand Up @@ -19520,6 +19550,16 @@ macro_rules! atom {
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_moz_extension as *mut _) } };
("<all_urls>") =>
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_all_urlsPermission as *mut _) } };
("clipboardRead") =>
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_clipboardRead as *mut _) } };
("clipboardWrite") =>
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_clipboardWrite as *mut _) } };
("debugger") =>
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_debugger as *mut _) } };
("tabs") =>
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_tabs as *mut _) } };
("webRequestBlocking") =>
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_webRequestBlocking as *mut _) } };
("http") =>
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_http as *mut _) } };
("https") =>
Expand Down
9 changes: 7 additions & 2 deletions components/style/gecko/generated/bindings.rs
View file
Expand Up @@ -1087,8 +1087,8 @@ extern "C" {
extern "C" {
pub fn Gecko_CalcStyleDifference(old_style: ServoStyleContextBorrowed,
new_style: ServoStyleContextBorrowed,
old_style_bits: u64,
any_style_changed: *mut bool) -> u32;
any_style_changed: *mut bool,
reset_only_changed: *mut bool) -> u32;
}
extern "C" {
pub fn Gecko_GetElementSnapshot(table: *const ServoElementSnapshotTable,
Expand Down Expand Up @@ -1969,6 +1969,11 @@ extern "C" {
RawServoStyleSheetContentsBorrowed)
-> usize;
}
extern "C" {
pub fn Servo_StyleSheet_GetSourceMapURL(sheet:
RawServoStyleSheetContentsBorrowed,
result: *mut nsAString);
}
extern "C" {
pub fn Servo_StyleSheet_GetOrigin(sheet:
RawServoStyleSheetContentsBorrowed)
Expand Down

0 comments on commit 9802214

Please sign in to comment.