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

Bug 1257742 - Part 3: Support using floating point in sizes descriptor; r=jdm

Browse Source 
MozReview-Commit-ID: ESTk2x2VqnD
This commit is contained in:
Edgar Chen 2016-03-23 18:46:36 +08:00
parent 13c38e804c
commit 25174c3544
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dom/base/ResponsiveImageSelector.cpp
View File

@ -369,7 +369,7 @@ ResponsiveImageSelector::SelectImage(bool aReselect)
// If the list contains computed width candidates, compute the current
// effective image width.
int32_t computedWidth = -1;
double computedWidth = -1;
for (int i = 0; i < numCandidates; i++) {
if (mCandidates[i].IsComputedFromWidth()) {
DebugOnly<bool> computeResult = \
@ -421,7 +421,7 @@ ResponsiveImageSelector::GetSelectedCandidateIndex()
}
bool
ResponsiveImageSelector::ComputeFinalWidthForCurrentViewport(int32_t *aWidth)
ResponsiveImageSelector::ComputeFinalWidthForCurrentViewport(double *aWidth)
{
unsigned int numSizes = mSizeQueries.Length();
nsIDocument* doc = Document();
@ -455,7 +455,7 @@ ResponsiveImageSelector::ComputeFinalWidthForCurrentViewport(int32_t *aWidth)
}
MOZ_ASSERT(effectiveWidth >= 0);
*aWidth = nsPresContext::AppUnitsToIntCSSPixels(std::max(effectiveWidth, 0));
*aWidth = nsPresContext::AppUnitsToDoubleCSSPixels(std::max(effectiveWidth, 0));
return true;
}
@ -731,7 +731,7 @@ double
ResponsiveImageCandidate::Density(ResponsiveImageSelector *aSelector) const
{
if (mType == eCandidateType_ComputedFromWidth) {
int32_t width;
double width;
if (!aSelector->ComputeFinalWidthForCurrentViewport(&width)) {
return 1.0;
}
@ -745,7 +745,7 @@ ResponsiveImageCandidate::Density(ResponsiveImageSelector *aSelector) const
}
double
ResponsiveImageCandidate::Density(int32_t aMatchingWidth) const
ResponsiveImageCandidate::Density(double aMatchingWidth) const
{
if (mType == eCandidateType_Invalid) {
MOZ_ASSERT(false, "Getting density for uninitialized candidate");
@ -763,7 +763,7 @@ ResponsiveImageCandidate::Density(int32_t aMatchingWidth) const
MOZ_ASSERT(false, "Don't expect to have a negative matching width at this point");
return 1.0;
}
double density = double(mValue.mWidth) / double(aMatchingWidth);
double density = double(mValue.mWidth) / aMatchingWidth;
MOZ_ASSERT(density > 0.0);
return density;
}

4
dom/base/ResponsiveImageSelector.h
View File

@ -102,7 +102,7 @@ private:
//
// aContext is the presContext to use for current viewport sizing, null will
// use the associated content's context.
bool ComputeFinalWidthForCurrentViewport(int32_t *aWidth);
bool ComputeFinalWidthForCurrentViewport(double* aWidth);
nsCOMPtr<nsINode> mOwnerNode;
// The cached URL for default candidate.
@ -152,7 +152,7 @@ public:
double Density(ResponsiveImageSelector *aSelector) const;
// If the width is already known. Useful when iterating over candidates to
// avoid having each call re-compute the width.
double Density(int32_t aMatchingWidth) const;
double Density(double aMatchingWidth) const;
// If this selector is computed from the selector's matching width.
bool IsComputedFromWidth() const;

4
layout/base/nsPresContext.h
View File

@ -636,6 +636,10 @@ public:
{ return NSAppUnitsToFloatPixels(aAppUnits,
float(AppUnitsPerCSSPixel())); }
static double AppUnitsToDoubleCSSPixels(nscoord aAppUnits)
{ return NSAppUnitsToDoublePixels(aAppUnits,
double(AppUnitsPerCSSPixel())); }
nscoord DevPixelsToAppUnits(int32_t aPixels) const
{ return NSIntPixelsToAppUnits(aPixels, AppUnitsPerDevPixel()); }