aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-08-15 19:29:45 -0500
committerGitHub <noreply@github.com>2017-08-15 19:29:45 -0500
commiteba896157edf3ba4f0d65b68eb63dd9cd40cdce4 (patch)
tree58fca249a13f042aa16e9435ca0b0197ff81303f
parent1c4076a75993001eba1f467b1fe0576f62238c36 (diff)
parent6b6ab991fda89b5dcd66c5f7814b4e33545f4d0d (diff)
downloadservo-eba896157edf3ba4f0d65b68eb63dd9cd40cdce4.tar.gz
servo-eba896157edf3ba4f0d65b68eb63dd9cd40cdce4.zip
Auto merge of #18095 - emilio:unused, r=bholley
stylo: Remove some unused FFI functions. Bug: 1390650 Reviewed-by: bholley MozReview-Commit-ID: K9fXGRmgkr4 <!-- 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/18095) <!-- Reviewable:end -->
-rw-r--r--components/style/gecko/generated/bindings.rs23
-rw-r--r--components/style/gecko/restyle_damage.rs9
-rw-r--r--components/style/servo/restyle_damage.rs5
3 files changed, 0 insertions, 37 deletions
diff --git a/components/style/gecko/generated/bindings.rs b/components/style/gecko/generated/bindings.rs
index 368623c3dd5..bd7d263e159 100644
--- a/components/style/gecko/generated/bindings.rs
+++ b/components/style/gecko/generated/bindings.rs
@@ -512,12 +512,6 @@ extern "C" {
pub fn Servo_StyleSet_Drop(ptr: RawServoStyleSetOwned);
}
extern "C" {
- pub fn Gecko_ChildrenCount(node: RawGeckoNodeBorrowed) -> u32;
-}
-extern "C" {
- pub fn Gecko_NodeIsElement(node: RawGeckoNodeBorrowed) -> bool;
-}
-extern "C" {
pub fn Gecko_IsInDocument(node: RawGeckoNodeBorrowed) -> bool;
}
extern "C" {
@@ -596,9 +590,6 @@ extern "C" {
pub fn Gecko_DocumentState(aDocument: *const nsIDocument) -> u64;
}
extern "C" {
- pub fn Gecko_IsTextNode(node: RawGeckoNodeBorrowed) -> bool;
-}
-extern "C" {
pub fn Gecko_IsRootElement(element: RawGeckoElementBorrowed) -> bool;
}
extern "C" {
@@ -606,16 +597,9 @@ extern "C" {
element: RawGeckoElementBorrowed) -> bool;
}
extern "C" {
- pub fn Gecko_LocalName(element: RawGeckoElementBorrowed) -> *mut nsIAtom;
-}
-extern "C" {
pub fn Gecko_Namespace(element: RawGeckoElementBorrowed) -> *mut nsIAtom;
}
extern "C" {
- pub fn Gecko_GetElementId(element: RawGeckoElementBorrowed)
- -> *mut nsIAtom;
-}
-extern "C" {
pub fn Gecko_MatchLang(element: RawGeckoElementBorrowed,
override_lang: *mut nsIAtom,
has_override_lang: bool, value: *const u16)
@@ -1074,9 +1058,6 @@ extern "C" {
-> *mut nsStyleContentData_CounterFunction;
}
extern "C" {
- pub fn Gecko_GetNodeFlags(node: RawGeckoNodeBorrowed) -> u32;
-}
-extern "C" {
pub fn Gecko_SetNodeFlags(node: RawGeckoNodeBorrowed, flags: u32);
}
extern "C" {
@@ -1106,10 +1087,6 @@ extern "C" {
-> nsChangeHint;
}
extern "C" {
- pub fn Gecko_HintsHandledForDescendants(aHint: nsChangeHint)
- -> nsChangeHint;
-}
-extern "C" {
pub fn Gecko_GetElementSnapshot(table: *const ServoElementSnapshotTable,
element: RawGeckoElementBorrowed)
-> *const ServoElementSnapshot;
diff --git a/components/style/gecko/restyle_damage.rs b/components/style/gecko/restyle_damage.rs
index b0f60663067..c5b10737d8e 100644
--- a/components/style/gecko/restyle_damage.rs
+++ b/components/style/gecko/restyle_damage.rs
@@ -100,15 +100,6 @@ impl GeckoRestyleDamage {
pub fn reconstruct() -> Self {
GeckoRestyleDamage(structs::nsChangeHint_nsChangeHint_ReconstructFrame)
}
-
- /// Assuming |self| is applied to an element, returns the set of damage that
- /// would be superfluous to apply for descendants.
- pub fn handled_for_descendants(self) -> Self {
- let hint = unsafe {
- bindings::Gecko_HintsHandledForDescendants(self.0)
- };
- GeckoRestyleDamage(hint)
- }
}
impl Default for GeckoRestyleDamage {
diff --git a/components/style/servo/restyle_damage.rs b/components/style/servo/restyle_damage.rs
index 0be480a2424..1b7e4636e13 100644
--- a/components/style/servo/restyle_damage.rs
+++ b/components/style/servo/restyle_damage.rs
@@ -135,11 +135,6 @@ impl ServoRestyleDamage {
}
}
}
-
- /// Servo doesn't implement this optimization.
- pub fn handled_for_descendants(self) -> Self {
- Self::empty()
- }
}
impl Default for ServoRestyleDamage {