Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 12:25:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1384656 - Use GeckoStyleContext in nsStyleTransformMatrix::ProcessTranslatePart. r=emilio

Browse Source 
The unit of nsCSSValue is always number/pixel/percent or eCSSUnit_Calc,
so we don't need the style context for Servo backend.
Besides, ReadTransform is a public API used in many places, so we keep
its argument type as nsStyleContext.

MozReview-Commit-ID: KLdrJ5BJXg8

--HG--
extra : rebase_source : 778ca38b06e2a13d3db0465b9e74bd0c33c62a88
This commit is contained in:
Boris Chiou 2017-07-31 17:31:27 +08:00
parent 3a310dee99
commit 8e1fff1e15
3 changed files with 65 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
layout/painting/nsDisplayList.cpp
View File

@ -180,6 +180,10 @@ static void AddTransformFunctions(const nsCSSValueList* aList,
return;
}
GeckoStyleContext* contextIfGecko = aContext
? aContext->GetAsGecko()
: nullptr;
for (const nsCSSValueList* curr = aList; curr; curr = curr->mNext) {
const nsCSSValue& currElem = curr->mValue;
NS_ASSERTION(currElem.GetUnit() == eCSSUnit_Function,
@ -257,7 +261,7 @@ static void AddTransformFunctions(const nsCSSValueList* aList,
case eCSSKeyword_translatex:
{
double x = nsStyleTransformMatrix::ProcessTranslatePart(
array->Item(1), aContext, aPresContext, conditions,
array->Item(1), contextIfGecko, aPresContext, conditions,
&aRefBox, &TransformReferenceBox::Width);
aFunctions.AppendElement(Translation(x, 0, 0));
break;
@ -265,7 +269,7 @@ static void AddTransformFunctions(const nsCSSValueList* aList,
case eCSSKeyword_translatey:
{
double y = nsStyleTransformMatrix::ProcessTranslatePart(
array->Item(1), aContext, aPresContext, conditions,
array->Item(1), contextIfGecko, aPresContext, conditions,
&aRefBox, &TransformReferenceBox::Height);
aFunctions.AppendElement(Translation(0, y, 0));
break;
@ -273,7 +277,7 @@ static void AddTransformFunctions(const nsCSSValueList* aList,
case eCSSKeyword_translatez:
{
double z = nsStyleTransformMatrix::ProcessTranslatePart(
array->Item(1), aContext, aPresContext, conditions,
array->Item(1), contextIfGecko, aPresContext, conditions,
nullptr);
aFunctions.AppendElement(Translation(0, 0, z));
break;
@ -281,13 +285,13 @@ static void AddTransformFunctions(const nsCSSValueList* aList,
case eCSSKeyword_translate:
{
double x = nsStyleTransformMatrix::ProcessTranslatePart(
array->Item(1), aContext, aPresContext, conditions,
array->Item(1), contextIfGecko, aPresContext, conditions,
&aRefBox, &TransformReferenceBox::Width);
// translate(x) is shorthand for translate(x, 0)
double y = 0;
if (array->Count() == 3) {
y = nsStyleTransformMatrix::ProcessTranslatePart(
array->Item(2), aContext, aPresContext, conditions,
array->Item(2), contextIfGecko, aPresContext, conditions,
&aRefBox, &TransformReferenceBox::Height);
}
aFunctions.AppendElement(Translation(x, y, 0));
@ -296,13 +300,13 @@ static void AddTransformFunctions(const nsCSSValueList* aList,
case eCSSKeyword_translate3d:
{
double x = nsStyleTransformMatrix::ProcessTranslatePart(
array->Item(1), aContext, aPresContext, conditions,
array->Item(1), contextIfGecko, aPresContext, conditions,
&aRefBox, &TransformReferenceBox::Width);
double y = nsStyleTransformMatrix::ProcessTranslatePart(
array->Item(2), aContext, aPresContext, conditions,
array->Item(2), contextIfGecko, aPresContext, conditions,
&aRefBox, &TransformReferenceBox::Height);
double z = nsStyleTransformMatrix::ProcessTranslatePart(
array->Item(3), aContext, aPresContext, conditions,
array->Item(3), contextIfGecko, aPresContext, conditions,
nullptr);
aFunctions.AppendElement(Translation(x, y, z));
@ -380,7 +384,7 @@ static void AddTransformFunctions(const nsCSSValueList* aList,
bool dummy;
Matrix4x4 matrix;
nsStyleTransformMatrix::ProcessInterpolateMatrix(matrix, array,
aContext,
contextIfGecko,
aPresContext,
conditions,
aRefBox,
@ -393,7 +397,7 @@ static void AddTransformFunctions(const nsCSSValueList* aList,
bool dummy;
Matrix4x4 matrix;
nsStyleTransformMatrix::ProcessAccumulateMatrix(matrix, array,
aContext,
contextIfGecko,
aPresContext,
conditions,
aRefBox,

73
layout/style/nsStyleTransformMatrix.cpp
View File

@ -136,7 +136,7 @@ TransformReferenceBox::Init(const nsSize& aDimensions)
float
ProcessTranslatePart(const nsCSSValue& aValue,
nsStyleContext* aContext,
GeckoStyleContext* aContext,
nsPresContext* aPresContext,
RuleNodeCacheConditions& aConditions,
TransformReferenceBox* aRefBox,
@ -160,24 +160,40 @@ ProcessTranslatePart(const nsCSSValue& aValue,
// Don't convert to aValue to AppUnits here to avoid precision issues.
return aValue.GetFloatValue();
} else if (aValue.IsCalcUnit()) {
nsRuleNode::ComputedCalc result =
nsRuleNode::SpecifiedCalcToComputedCalc(aValue, aContext, aPresContext,
aConditions);
percent = result.mPercent;
offset = result.mLength;
if (aContext) {
// Gecko backend
nsRuleNode::ComputedCalc result =
nsRuleNode::SpecifiedCalcToComputedCalc(aValue, aContext, aPresContext,
aConditions);
percent = result.mPercent;
offset = result.mLength;
} else {
// Servo backend. We can retrieve the Calc value directly because it has
// been computed from Servo side and set by nsCSSValue::SetCalcValue().
// We don't use nsRuleNode::SpecifiedCalcToComputedCalc() because it
// asserts for null context and we always pass null context for Servo
// backend.
nsStyleCoord::CalcValue calc = aValue.GetCalcValue();
percent = calc.mPercent;
offset = calc.mLength;
}
} else {
// Note: The unit of nsCSSValue passed from Servo side would be number,
// pixel, percent, or eCSSUnit_Calc, so it is impossible to go into
// this branch.
MOZ_ASSERT(aContext, "We need a valid context to compute the length");
offset = nsRuleNode::CalcLength(aValue, aContext, aPresContext,
aConditions);
}
float translation = NSAppUnitsToFloatPixels(offset,
nsPresContext::AppUnitsPerCSSPixel());
float translation =
NSAppUnitsToFloatPixels(offset, nsPresContext::AppUnitsPerCSSPixel());
// We want to avoid calling aDimensionGetter if there's no percentage to be
// resolved (for performance reasons - see TransformReferenceBox).
if (percent != 0.0f && aRefBox && !aRefBox->IsEmpty()) {
translation += percent *
NSAppUnitsToFloatPixels((aRefBox->*aDimensionGetter)(),
nsPresContext::AppUnitsPerCSSPixel());
translation +=
percent * NSAppUnitsToFloatPixels((aRefBox->*aDimensionGetter)(),
nsPresContext::AppUnitsPerCSSPixel());
}
return translation;
}
@ -192,7 +208,7 @@ ProcessTranslatePart(const nsCSSValue& aValue,
static void
ProcessMatrix(Matrix4x4& aMatrix,
const nsCSSValue::Array* aData,
nsStyleContext* aContext,
GeckoStyleContext* aContext,
nsPresContext* aPresContext,
RuleNodeCacheConditions& aConditions,
TransformReferenceBox& aRefBox)
@ -225,7 +241,7 @@ ProcessMatrix(Matrix4x4& aMatrix,
static void
ProcessMatrix3D(Matrix4x4& aMatrix,
const nsCSSValue::Array* aData,
nsStyleContext* aContext,
GeckoStyleContext* aContext,
nsPresContext* aPresContext,
RuleNodeCacheConditions& aConditions,
TransformReferenceBox& aRefBox)
@ -468,7 +484,7 @@ template <typename Operator>
static void
ProcessMatrixOperator(Matrix4x4& aMatrix,
const nsCSSValue::Array* aData,
nsStyleContext* aContext,
GeckoStyleContext* aContext,
nsPresContext* aPresContext,
RuleNodeCacheConditions& aConditions,
TransformReferenceBox& aRefBox,
@ -514,7 +530,10 @@ ProcessMatrixOperator(Matrix4x4& aMatrix,
Matrix4x4 matrix2 = readTransform(aData->Item(2));
double progress = aData->Item(3).GetPercentValue();
if (aContext && aContext->IsServo()) {
// We cannot use GeckoStyleContext to check if we use Servo backend because
// it could be null in Gecko. Instead, use the unit of the nsCSSValue because
// we use eCSSUnit_SharedList for Servo backend.
if (aData->Item(1).GetUnit() == eCSSUnit_SharedList) {
aMatrix =
OperateTransformMatrixByServo<Operator>(matrix1, matrix2, progress)
* aMatrix;
@ -529,7 +548,7 @@ ProcessMatrixOperator(Matrix4x4& aMatrix,
void
ProcessInterpolateMatrix(Matrix4x4& aMatrix,
const nsCSSValue::Array* aData,
nsStyleContext* aContext,
GeckoStyleContext* aContext,
nsPresContext* aPresContext,
RuleNodeCacheConditions& aConditions,
TransformReferenceBox& aRefBox,
@ -543,7 +562,7 @@ ProcessInterpolateMatrix(Matrix4x4& aMatrix,
void
ProcessAccumulateMatrix(Matrix4x4& aMatrix,
const nsCSSValue::Array* aData,
nsStyleContext* aContext,
GeckoStyleContext* aContext,
nsPresContext* aPresContext,
RuleNodeCacheConditions& aConditions,
TransformReferenceBox& aRefBox,
@ -558,7 +577,7 @@ ProcessAccumulateMatrix(Matrix4x4& aMatrix,
static void
ProcessTranslateX(Matrix4x4& aMatrix,
const nsCSSValue::Array* aData,
nsStyleContext* aContext,
GeckoStyleContext* aContext,
nsPresContext* aPresContext,
RuleNodeCacheConditions& aConditions,
TransformReferenceBox& aRefBox)
@ -577,7 +596,7 @@ ProcessTranslateX(Matrix4x4& aMatrix,
static void
ProcessTranslateY(Matrix4x4& aMatrix,
const nsCSSValue::Array* aData,
nsStyleContext* aContext,
GeckoStyleContext* aContext,
nsPresContext* aPresContext,
RuleNodeCacheConditions& aConditions,
TransformReferenceBox& aRefBox)
@ -595,7 +614,7 @@ ProcessTranslateY(Matrix4x4& aMatrix,
static void
ProcessTranslateZ(Matrix4x4& aMatrix,
const nsCSSValue::Array* aData,
nsStyleContext* aContext,
GeckoStyleContext* aContext,
nsPresContext* aPresContext,
RuleNodeCacheConditions& aConditions)
{
@ -613,7 +632,7 @@ ProcessTranslateZ(Matrix4x4& aMatrix,
static void
ProcessTranslate(Matrix4x4& aMatrix,
const nsCSSValue::Array* aData,
nsStyleContext* aContext,
GeckoStyleContext* aContext,
nsPresContext* aPresContext,
RuleNodeCacheConditions& aConditions,
TransformReferenceBox& aRefBox)
@ -638,7 +657,7 @@ ProcessTranslate(Matrix4x4& aMatrix,
static void
ProcessTranslate3D(Matrix4x4& aMatrix,
const nsCSSValue::Array* aData,
nsStyleContext* aContext,
GeckoStyleContext* aContext,
nsPresContext* aPresContext,
RuleNodeCacheConditions& aConditions,
TransformReferenceBox& aRefBox)
@ -805,7 +824,7 @@ ProcessRotate3D(Matrix4x4& aMatrix, const nsCSSValue::Array* aData)
static void
ProcessPerspective(Matrix4x4& aMatrix,
const nsCSSValue::Array* aData,
nsStyleContext *aContext,
GeckoStyleContext *aContext,
nsPresContext *aPresContext,
RuleNodeCacheConditions& aConditions)
{
@ -824,7 +843,7 @@ ProcessPerspective(Matrix4x4& aMatrix,
static void
MatrixForTransformFunction(Matrix4x4& aMatrix,
const nsCSSValue::Array * aData,
nsStyleContext* aContext,
GeckoStyleContext* aContext,
nsPresContext* aPresContext,
RuleNodeCacheConditions& aConditions,
TransformReferenceBox& aRefBox,
@ -836,7 +855,6 @@ MatrixForTransformFunction(Matrix4x4& aMatrix,
// knows that all length units have been converted to pixels (as
// StyleAnimationValue does).
/* Get the keyword for the transform. */
switch (TransformFunctionOf(aData)) {
case eCSSKeyword_translatex:
@ -981,6 +999,9 @@ ReadTransforms(const nsCSSValueList* aList,
bool* aContains3dTransform)
{
Matrix4x4 result;
GeckoStyleContext* contextIfGecko = aContext
? aContext->GetAsGecko()
: nullptr;
for (const nsCSSValueList* curr = aList; curr != nullptr; curr = curr->mNext) {
const nsCSSValue &currElem = curr->mValue;
@ -995,7 +1016,7 @@ ReadTransforms(const nsCSSValueList* aList,
"Incoming function is too short!");
/* Read in a single transform matrix. */
MatrixForTransformFunction(result, currElem.GetArrayValue(), aContext,
MatrixForTransformFunction(result, currElem.GetArrayValue(), contextIfGecko,
aPresContext, aConditions, aRefBox,
aContains3dTransform);
}

7
layout/style/nsStyleTransformMatrix.h
View File

@ -24,6 +24,7 @@ class nsPresContext;
struct gfxQuaternion;
struct nsRect;
namespace mozilla {
class GeckoStyleContext;
class RuleNodeCacheConditions;
} // namespace mozilla
@ -157,7 +158,7 @@ namespace nsStyleTransformMatrix {
void SetIdentityMatrix(nsCSSValue::Array* aMatrix);
float ProcessTranslatePart(const nsCSSValue& aValue,
nsStyleContext* aContext,
mozilla::GeckoStyleContext* aContext,
nsPresContext* aPresContext,
mozilla::RuleNodeCacheConditions& aConditions,
TransformReferenceBox* aRefBox,
@ -166,7 +167,7 @@ namespace nsStyleTransformMatrix {
void
ProcessInterpolateMatrix(mozilla::gfx::Matrix4x4& aMatrix,
const nsCSSValue::Array* aData,
nsStyleContext* aContext,
mozilla::GeckoStyleContext* aContext,
nsPresContext* aPresContext,
mozilla::RuleNodeCacheConditions& aConditions,
TransformReferenceBox& aBounds,
@ -175,7 +176,7 @@ namespace nsStyleTransformMatrix {
void
ProcessAccumulateMatrix(mozilla::gfx::Matrix4x4& aMatrix,
const nsCSSValue::Array* aData,
nsStyleContext* aContext,
mozilla::GeckoStyleContext* aContext,
nsPresContext* aPresContext,
mozilla::RuleNodeCacheConditions& aConditions,
TransformReferenceBox& aBounds,