servo: Merge #20150 - Remove text-is-significant param from Gecko_IsSignificantChild (from upsuper:text-is-significant); r=emilio
authorXidorn Quan <me@upsuper.org>
Thu, 01 Mar 2018 18:52:07 -0500
changeset 461238 ff248c23dba88de3d4e77f601ef2cfd71a530d0c
parent 461237 efeda1e338d314edf86c92510d1901dcf3ac0668
child 461239 1fcc8099f2d9716a2d1704613aed9364ebaf331b
push id1683
push usersfraser@mozilla.com
push dateThu, 26 Apr 2018 16:43:40 +0000
treeherdermozilla-release@5af6cb21869d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersemilio
bugs1441729
milestone60.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
servo: Merge #20150 - Remove text-is-significant param from Gecko_IsSignificantChild (from upsuper:text-is-significant); r=emilio This is Servo side change of [bug 1441729](https://bugzilla.mozilla.org/show_bug.cgi?id=1441729). Source-Repo: https://github.com/servo/servo Source-Revision: 90b8410b05e8aab35e3885820a37c6239252cca1
servo/components/style/gecko/generated/bindings.rs
servo/components/style/gecko/wrapper.rs
--- a/servo/components/style/gecko/generated/bindings.rs
+++ b/servo/components/style/gecko/generated/bindings.rs
@@ -603,17 +603,16 @@ extern "C" {
     pub fn Servo_SelectorList_Drop(ptr: RawServoSelectorListOwned);
 }
 extern "C" {
     pub fn Servo_SourceSizeList_Drop(ptr: RawServoSourceSizeListOwned);
 }
 extern "C" {
     pub fn Gecko_IsSignificantChild(
         node: RawGeckoNodeBorrowed,
-        text_is_significant: bool,
         whitespace_is_significant: bool,
     ) -> bool;
 }
 extern "C" {
     pub fn Gecko_GetLastChild(node: RawGeckoNodeBorrowed) -> RawGeckoNodeBorrowedOrNull;
 }
 extern "C" {
     pub fn Gecko_GetFlattenedTreeParentNode(
--- a/servo/components/style/gecko/wrapper.rs
+++ b/servo/components/style/gecko/wrapper.rs
@@ -251,17 +251,17 @@ impl<'ln> GeckoNode<'ln> {
 
         // NOTE(emilio): If this call is too expensive, we could manually
         // inline more aggressively.
         unsafe { bindings::Gecko_GetFlattenedTreeParentNode(self.0).map(GeckoNode) }
     }
 
     #[inline]
     fn contains_non_whitespace_content(&self) -> bool {
-        unsafe { Gecko_IsSignificantChild(self.0, true, false) }
+        unsafe { Gecko_IsSignificantChild(self.0, false) }
     }
 }
 
 impl<'ln> NodeInfo for GeckoNode<'ln> {
     #[inline]
     fn is_element(&self) -> bool {
         self.get_bool_flag(nsINode_BooleanFlag::NodeIsElement)
     }
@@ -1928,17 +1928,17 @@ impl<'le> ::selectors::Element for Gecko
 
         unsafe {
             Gecko_IsRootElement(self.0)
         }
     }
 
     fn is_empty(&self) -> bool {
         !self.as_node().dom_children().any(|child| unsafe {
-            Gecko_IsSignificantChild(child.0, true, true)
+            Gecko_IsSignificantChild(child.0, true)
         })
     }
 
     #[inline]
     fn local_name(&self) -> &WeakAtom {
         unsafe {
             WeakAtom::new(self.as_node().node_info().mInner.mName)
         }