Navigation Menu

Skip to content

Commit

Permalink
Bug 1328787 - Part 6: Update build_gecko.rs and bindings. r=heycam
Browse files Browse the repository at this point in the history
'RawServoDeclarationBlock' in structs_types in build_gecko.rs and the change in
conversion.rs are needed for using set_arc_leaky() for
PropertyValuePair.mServoDeclarationBlock. Without this change,
mServoDeclarationBlock.set_arc_leaky() is called against RawServoDeclarationBlockVoid.

MozReview-Commit-ID: FZkZ0OclXcP
  • Loading branch information
Hiroyuki Ikezoe committed Jan 29, 2017
1 parent 092440b commit a4cafe7
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
8 changes: 8 additions & 0 deletions components/style/build_gecko.rs
Expand Up @@ -232,6 +232,7 @@ mod bindings {
.include(add_include("gfxFontConstants.h"))
.include(add_include("nsThemeConstants.h"))
.include(add_include("mozilla/dom/AnimationEffectReadOnlyBinding.h"))
.include(add_include("mozilla/Keyframe.h"))
.include(add_include("mozilla/ServoElementSnapshot.h"))
.include(add_include("mozilla/dom/Element.h"))
.include(add_include("mozilla/ServoBindings.h"))
Expand Down Expand Up @@ -288,6 +289,7 @@ mod bindings {
"HalfCorner",
"Image",
"ImageURL",
"Keyframe",
"nsAttrName",
"nsAttrValue",
"nsBorderColors",
Expand Down Expand Up @@ -362,6 +364,7 @@ mod bindings {
"nsTArray",
"nsTArrayHeader",
"Position",
"PropertyValuePair",
"Runnable",
"ServoAttrSnapshot",
"ServoElementSnapshot",
Expand Down Expand Up @@ -489,9 +492,11 @@ mod bindings {
let structs_types = [
"RawGeckoDocument",
"RawGeckoElement",
"RawGeckoKeyframeList",
"RawGeckoNode",
"RawGeckoAnimationValueList",
"RawServoAnimationValue",
"RawServoDeclarationBlock",
"RawGeckoPresContext",
"RawGeckoPresContextOwned",
"ThreadSafeURIHolder",
Expand All @@ -500,6 +505,7 @@ mod bindings {
"TraversalRootBehavior",
"FontFamilyList",
"FontFamilyType",
"Keyframe",
"ServoElementSnapshot",
"SheetParsingMode",
"StyleBasicShape",
Expand Down Expand Up @@ -554,6 +560,7 @@ mod bindings {
"nsStyleVariables",
"nsStyleVisibility",
"nsStyleXUL",
"nsTimingFunction",
"nscoord",
"nsresult",
"Loader",
Expand Down Expand Up @@ -596,6 +603,7 @@ mod bindings {
let servo_borrow_types = [
"nsCSSValue",
"RawGeckoAnimationValueList",
"RawGeckoKeyframeList",
];
for &ty in structs_types.iter() {
builder = builder.hide_type(ty)
Expand Down
3 changes: 2 additions & 1 deletion components/style/gecko/conversions.rs
Expand Up @@ -11,9 +11,10 @@
use app_units::Au;
use gecko::values::convert_rgba_to_nscolor;
use gecko_bindings::bindings::{Gecko_CreateGradient, Gecko_SetGradientImageValue, Gecko_SetUrlImageValue};
use gecko_bindings::bindings::{RawServoStyleSheet, RawServoDeclarationBlock, RawServoStyleRule, RawServoImportRule};
use gecko_bindings::bindings::{RawServoStyleSheet, RawServoStyleRule, RawServoImportRule};
use gecko_bindings::bindings::{ServoComputedValues, ServoCssRules};
use gecko_bindings::structs::{nsStyleCoord_CalcValue, nsStyleImage};
use gecko_bindings::structs::RawServoDeclarationBlock;
use gecko_bindings::structs::nsresult;
use gecko_bindings::sugar::ns_style_coord::{CoordDataValue, CoordDataMut};
use gecko_bindings::sugar::ownership::{HasArcFFI, HasFFI};
Expand Down

0 comments on commit a4cafe7

Please sign in to comment.