autoland: changeset 370636:0616e8c5f57ef1cbbe3c365dee2d7f768c272272

author	Emilio Cobos Álvarez <emilio@crisal.io>
	Mon, 24 Jul 2017 10:11:40 +0200
changeset 370636	0616e8c5f57ef1cbbe3c365dee2d7f768c272272
parent 370635	080aa07d32df3d0697f0a44ed72121f384fa6417
child 370637	6765c694080c0d2dea8eb11d7ea22b1175a29fdd
push id	47121
push user	ecoal95@gmail.com
push date	Mon, 24 Jul 2017 23:56:57 +0000
treeherder	autoland@6765c694080c [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	xidorn
bugs	1383634
milestone	56.0a1
first release with	nightly linux32 07484bfdb96b / 56.0a1 / 20170725144053 / files nightly linux64 07484bfdb96b / 56.0a1 / 20170725144053 / files nightly mac 07484bfdb96b / 56.0a1 / 20170725144001 / files nightly win32 e8400551c2e3 / 56.0a1 / 20170726030207 / files nightly win64 e8400551c2e3 / 56.0a1 / 20170726030207 / files
last release without	nightly linux32 5928d905c0bc / 56.0a1 / 20170724100304 / files nightly linux64 5928d905c0bc / 56.0a1 / 20170724100304 / files nightly mac 5928d905c0bc / 56.0a1 / 20170724100311 / files nightly win32 5928d905c0bc / 56.0a1 / 20170724030204 / files nightly win64 5928d905c0bc / 56.0a1 / 20170724030204 / files

--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -8649,17 +8649,17 @@ nsRuleNode::ComputePositionData(void* aS
            parentPos->mJustifyContent,
            NS_STYLE_JUSTIFY_NORMAL);
 
   // justify-items: enum, inherit, initial
   const auto& justifyItemsValue = *aRuleData->ValueForJustifyItems();
   if (MOZ_UNLIKELY(justifyItemsValue.GetUnit() == eCSSUnit_Inherit)) {
     if (MOZ_LIKELY(parentContext)) {
       pos->mJustifyItems =
-        parentPos->ComputedJustifyItems(parentContext->GetParentAllowServo());
+        parentPos->ComputedJustifyItems(parentContext->GetParent());
     } else {
       pos->mJustifyItems = NS_STYLE_JUSTIFY_NORMAL;
     }
     conditions.SetUncacheable();
   } else {
     SetValue(justifyItemsValue,
              pos->mJustifyItems, conditions,
              SETVAL_ENUMERATED | SETVAL_UNSET_INITIAL,