Bug 1348481 Part 4: Servo-side remove the Servo_StyleSet_{Append|Prepend|InsertBefore|Remove} functions. draft
authorBrad Werth <bwerth@mozilla.com>
Tue, 25 Apr 2017 15:05:23 -0700
changeset 568279 1ed0f961aae3304f994bda50363d7fd269cad6f5
parent 568278 7e35f0523e8841de16641355cc4db6c0d611d34d
child 568280 e7e647e91012fed9c9541043d35c38b6b983b8e7
push id55811
push userbwerth@mozilla.com
push dateTue, 25 Apr 2017 22:15:27 +0000
bugs1348481
milestone55.0a1
Bug 1348481 Part 4: Servo-side remove the Servo_StyleSet_{Append|Prepend|InsertBefore|Remove} functions. MozReview-Commit-ID: I0nJ5VXHp5t
servo/ports/geckolib/glue.rs
--- a/servo/ports/geckolib/glue.rs
+++ b/servo/ports/geckolib/glue.rs
@@ -583,74 +583,16 @@ pub extern "C" fn Servo_StyleSheet_Clear
     };
 
     let sheet = Stylesheet::as_arc(&stylesheet);
     Stylesheet::update_from_str(&sheet, input, url_data,
                                 loader, &RustLogReporter);
 }
 
 #[no_mangle]
-pub extern "C" fn Servo_StyleSet_AppendStyleSheet(raw_data: RawServoStyleSetBorrowed,
-                                                  raw_sheet: RawServoStyleSheetBorrowed,
-                                                  flush: bool) {
-    let global_style_data = &*GLOBAL_STYLE_DATA;
-    let guard = global_style_data.shared_lock.read();
-    let mut data = PerDocumentStyleData::from_ffi(raw_data).borrow_mut();
-    let sheet = HasArcFFI::as_arc(&raw_sheet);
-    data.stylesheets.append_stylesheet(sheet);
-    if flush {
-        data.flush_stylesheets(&guard);
-    }
-}
-
-#[no_mangle]
-pub extern "C" fn Servo_StyleSet_PrependStyleSheet(raw_data: RawServoStyleSetBorrowed,
-                                                   raw_sheet: RawServoStyleSheetBorrowed,
-                                                   flush: bool) {
-    let global_style_data = &*GLOBAL_STYLE_DATA;
-    let guard = global_style_data.shared_lock.read();
-    let mut data = PerDocumentStyleData::from_ffi(raw_data).borrow_mut();
-    let sheet = HasArcFFI::as_arc(&raw_sheet);
-    data.stylesheets.prepend_stylesheet(sheet);
-    if flush {
-        data.flush_stylesheets(&guard);
-    }
-}
-
-#[no_mangle]
-pub extern "C" fn Servo_StyleSet_InsertStyleSheetBefore(raw_data: RawServoStyleSetBorrowed,
-                                                        raw_sheet: RawServoStyleSheetBorrowed,
-                                                        raw_reference: RawServoStyleSheetBorrowed,
-                                                        flush: bool) {
-    let global_style_data = &*GLOBAL_STYLE_DATA;
-    let guard = global_style_data.shared_lock.read();
-    let mut data = PerDocumentStyleData::from_ffi(raw_data).borrow_mut();
-    let sheet = HasArcFFI::as_arc(&raw_sheet);
-    let reference = HasArcFFI::as_arc(&raw_reference);
-    data.stylesheets.insert_stylesheet_before(sheet, reference);
-    if flush {
-        data.flush_stylesheets(&guard);
-    }
-}
-
-#[no_mangle]
-pub extern "C" fn Servo_StyleSet_RemoveStyleSheet(raw_data: RawServoStyleSetBorrowed,
-                                                  raw_sheet: RawServoStyleSheetBorrowed,
-                                                  flush: bool) {
-    let global_style_data = &*GLOBAL_STYLE_DATA;
-    let guard = global_style_data.shared_lock.read();
-    let mut data = PerDocumentStyleData::from_ffi(raw_data).borrow_mut();
-    let sheet = HasArcFFI::as_arc(&raw_sheet);
-    data.stylesheets.remove_stylesheet(sheet);
-    if flush {
-        data.flush_stylesheets(&guard);
-    }
-}
-
-#[no_mangle]
 pub extern "C" fn Servo_StyleSet_Regenerate(raw_data: RawServoStyleSetBorrowed,
                                             raw_sheets: RawGeckoServoStyleSheetListBorrowed) {
     let global_style_data = &*GLOBAL_STYLE_DATA;
     let guard = global_style_data.shared_lock.read();
     let mut data = PerDocumentStyleData::from_ffi(raw_data).borrow_mut();
 
     // Clear the stylesheets, then regenerate them from raw_sheets.
     data.stylesheets.clear();