mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out 2 changesets (bug 1387399) for OSX reftests permafailures on attachment-local-positioning-2.html. a=backout 

Backed out changeset b78a225fa8c9 (bug 1387399)
Backed out changeset 4beeacb75bf5 (bug 1387399)
This commit is contained in:
Cosmin Sabou 2018-04-20 06:47:41 +03:00
Родитель dcacfcfc71
Коммит b9a82af44a
6 изменённых файлов: 3 добавлений и 189 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
gfx/2d/2D.h
Просмотреть файл

@ -1553,7 +1553,6 @@ public:
static void ShutDown();
static bool HasSSE2();
static bool HasSSE4();
/**
* Returns false if any of the following are true:

2
gfx/2d/BaseRect.h
Просмотреть файл

@ -124,7 +124,7 @@ struct BaseRect {
result.y = std::max<T>(y, aRect.y);
result.width = std::min<T>(x - result.x + width, aRect.x - result.x + aRect.width);
result.height = std::min<T>(y - result.y + height, aRect.y - result.y + aRect.height);
if (result.width <= 0 || result.height <= 0) {
if (result.width < 0 || result.height < 0) {
result.SizeTo(0, 0);
}
return result;

26
gfx/2d/Factory.cpp
Просмотреть файл

@ -87,8 +87,7 @@ enum CPUIDRegister { eax = 0, ebx = 1, ecx = 2, edx = 3 };
#ifdef HAVE_CPUID_H
#if !(defined(__SSE2__) || defined(_M_X64) || \
(defined(_M_IX86_FP) && _M_IX86_FP >= 2)) || \
!defined(__SSE4__)
(defined(_M_IX86_FP) && _M_IX86_FP >= 2))
// cpuid.h is available on gcc 4.3 and higher on i386 and x86_64
#include <cpuid.h>
@ -283,29 +282,6 @@ Factory::HasSSE2()
#endif
}
bool
Factory::HasSSE4()
{
#if defined(__SSE4__)
// gcc with -msse2 (default on OSX and x86-64)
// cl.exe with -arch:SSE2 (default on x64 compiler)
return true;
#elif defined(HAVE_CPU_DETECTION)
static enum {
UNINITIALIZED,
NO_SSE4,
HAS_SSE4
} sDetectionState = UNINITIALIZED;
if (sDetectionState == UNINITIALIZED) {
sDetectionState = HasCPUIDBit(1u, ecx, (1u << 19)) ? HAS_SSE4 : NO_SSE4;
}
return sDetectionState == HAS_SSE4;
#else
return false;
#endif
}
// If the size is "reasonable", we want gfxCriticalError to assert, so
// this is the option set up for it.
inline int LoggerOptionsBasedOnSize(const IntSize& aSize)

160
gfx/src/nsRect.h
Просмотреть файл

@ -13,16 +13,12 @@
#include <algorithm> // for min/max
#include "mozilla/Likely.h" // for MOZ_UNLIKELY
#include "mozilla/gfx/Rect.h"
#include "mozilla/gfx/2D.h"
#include "nsCoord.h" // for nscoord, etc
#include "nsISupportsImpl.h" // for MOZ_COUNT_CTOR, etc
#include "nsPoint.h" // for nsIntPoint, nsPoint
#include "nsMargin.h" // for nsIntMargin, nsMargin
#include "nsSize.h" // for IntSize, nsSize
#include "nscore.h" // for NS_BUILD_REFCNT_LOGGING
#if !defined(ANDROID) && !defined(MOZ_ASAN) && (defined(__SSE2__) || defined(_M_X64) || (defined(_M_IX86_FP) && _M_IX86_FP >= 2))
#include "smmintrin.h"
#endif
typedef mozilla::gfx::IntRect nsIntRect;
@ -124,79 +120,6 @@ struct nsRect :
{
*this = aRect1.Union(aRect2);
}
#if defined(_MSC_VER) && !defined(__clang__)
// Only MSVC supports inlining intrinsics for archs you're not compiling for.
MOZ_MUST_USE nsRect Intersect(const nsRect& aRect) const
{
nsRect result;
if (mozilla::gfx::Factory::HasSSE4()) {
__m128i rect1 = _mm_loadu_si128((__m128i*)&aRect); // x1, y1, w1, h1
__m128i rect2 = _mm_loadu_si128((__m128i*)this); // x2, y2, w2, h2
__m128i resultRect = _mm_max_epi32(rect1, rect2); // xr, yr, zz, zz
// result.width = std::min<int32_t>(x - result.x + width, aRect.x - result.x + aRect.width);
// result.height = std::min<int32_t>(y - result.y + height, aRect.y - result.y + aRect.height);
__m128i widthheight = _mm_min_epi32(_mm_add_epi32(_mm_sub_epi32(rect1, resultRect), _mm_srli_si128(rect1, 8)),
_mm_add_epi32(_mm_sub_epi32(rect2, resultRect), _mm_srli_si128(rect2, 8))); // w, h, zz, zz
widthheight = _mm_slli_si128(widthheight, 8); // 00, 00, wr, hr
resultRect = _mm_blend_epi16(resultRect, widthheight, 0xF0); // xr, yr, wr, hr
if ((_mm_movemask_ps(_mm_castsi128_ps(_mm_cmpgt_epi32(resultRect, _mm_setzero_si128()))) & 0xC) != 0xC) {
// It's potentially more efficient to store all 0s. But the non SSE4 code leaves x/y intact
// so let's do the same here.
resultRect = _mm_and_si128(resultRect, _mm_set_epi32(0, 0, 0xFFFFFFFF, 0xFFFFFFFF));
}
_mm_storeu_si128((__m128i*)&result, resultRect);
return result;
}
result.x = std::max<int32_t>(x, aRect.x);
result.y = std::max<int32_t>(y, aRect.y);
result.width = std::min<int32_t>(x - result.x + width, aRect.x - result.x + aRect.width);
result.height = std::min<int32_t>(y - result.y + height, aRect.y - result.y + aRect.height);
if (result.width <= 0 || result.height <= 0) {
result.SizeTo(0, 0);
}
return result;
}
bool IntersectRect(const nsRect& aRect1, const nsRect& aRect2)
{
if (mozilla::gfx::Factory::HasSSE4()) {
__m128i rect1 = _mm_loadu_si128((__m128i*)&aRect1); // x1, y1, w1, h1
__m128i rect2 = _mm_loadu_si128((__m128i*)&aRect2); // x2, y2, w2, h2
__m128i resultRect = _mm_max_epi32(rect1, rect2); // xr, yr, zz, zz
// result.width = std::min<int32_t>(x - result.x + width, aRect.x - result.x + aRect.width);
// result.height = std::min<int32_t>(y - result.y + height, aRect.y - result.y + aRect.height);
__m128i widthheight = _mm_min_epi32(_mm_add_epi32(_mm_sub_epi32(rect1, resultRect), _mm_srli_si128(rect1, 8)),
_mm_add_epi32(_mm_sub_epi32(rect2, resultRect), _mm_srli_si128(rect2, 8))); // w, h, zz, zz
widthheight = _mm_slli_si128(widthheight, 8); // 00, 00, wr, hr
resultRect = _mm_blend_epi16(resultRect, widthheight, 0xF0); // xr, yr, wr, hr
if ((_mm_movemask_ps(_mm_castsi128_ps(_mm_cmpgt_epi32(resultRect, _mm_setzero_si128()))) & 0xC) != 0xC) {
// It's potentially more efficient to store all 0s. But the non SSE4 code leaves x/y intact
// so let's do the same here.
resultRect = _mm_and_si128(resultRect, _mm_set_epi32(0, 0, 0xFFFFFFFF, 0xFFFFFFFF));
_mm_storeu_si128((__m128i*)this, resultRect);
return false;
}
_mm_storeu_si128((__m128i*)this, resultRect);
return true;
}
*static_cast<nsRect*>(this) = aRect1.Intersect(aRect2);
return !IsEmpty();
}
#endif
#endif
void SaturatingUnionRect(const nsRect& aRect1, const nsRect& aRect2)
@ -297,44 +220,6 @@ nsRect::ScaleToNearestPixels(float aXScale, float aYScale,
nscoord aAppUnitsPerPixel) const
{
mozilla::gfx::IntRect rect;
// ASAN builds appear not to respect changes to the SSE rounding mode.
// Android x86 builds have bindgen issues.
#if !defined(ANDROID) && !defined(MOZ_ASAN) && (defined(__SSE2__) || defined(_M_X64) || (defined(_M_IX86_FP) && _M_IX86_FP >= 2))
__m128 appUnitsPacked = _mm_set_ps(aAppUnitsPerPixel, aAppUnitsPerPixel, aAppUnitsPerPixel, aAppUnitsPerPixel);
__m128 scalesPacked = _mm_set_ps(aYScale, aXScale, aYScale, aXScale);
__m128 biasesPacked = _mm_set_ps(0.5f, 0.5f, 0.5f, 0.5f);
// See Floor section.
_MM_SET_ROUNDING_MODE(_MM_ROUND_DOWN);
__m128i rectPacked = _mm_loadu_si128((__m128i*)this);
__m128i widthHeight = _mm_slli_si128(rectPacked, 8);
rectPacked = _mm_add_epi32(rectPacked, widthHeight); // X, Y, XMost(), YMost()
__m128 rectFloat = _mm_cvtepi32_ps(rectPacked);
// Scale, i.e. ([ x y xmost ymost ] / aAppUnitsPerPixel) * [ aXScale aYScale aXScale aYScale ]
rectFloat = _mm_div_ps(_mm_mul_ps(rectFloat, scalesPacked), appUnitsPacked);
// Floor
// Executed with bias and roundmode down, since round-nearest rounds 0.5 downward half the time.
rectFloat = _mm_add_ps(rectFloat, biasesPacked);
rectPacked = _mm_cvtps_epi32(rectFloat);
widthHeight = _mm_slli_si128(rectPacked, 8);
rectPacked = _mm_sub_epi32(rectPacked, widthHeight); // X, Y, Width, Height
// Avoid negative width/height due to overflow.
__m128i mask = _mm_or_si128(_mm_cmpgt_epi32(rectPacked, _mm_setzero_si128()),
_mm_set_epi32(0, 0, 0xFFFFFFFF, 0xFFFFFFFF));
// Mask will now contain [ 0xFFFFFFFF 0xFFFFFFFF (width <= 0 ? 0 : 0xFFFFFFFF) (height <= 0 ? 0 : 0xFFFFFFFF) ]
rectPacked = _mm_and_si128(rectPacked, mask);
_mm_storeu_si128((__m128i*)&rect, rectPacked);
_MM_SET_ROUNDING_MODE(_MM_ROUND_NEAREST);
#else
rect.SetNonEmptyBox(NSToIntRoundUp(NSAppUnitsToDoublePixels(x,
aAppUnitsPerPixel) * aXScale),
NSToIntRoundUp(NSAppUnitsToDoublePixels(y,
@ -343,7 +228,6 @@ nsRect::ScaleToNearestPixels(float aXScale, float aYScale,
aAppUnitsPerPixel) * aXScale),
NSToIntRoundUp(NSAppUnitsToDoublePixels(YMost(),
aAppUnitsPerPixel) * aYScale));
#endif
return rect;
}
@ -353,49 +237,6 @@ nsRect::ScaleToOutsidePixels(float aXScale, float aYScale,
nscoord aAppUnitsPerPixel) const
{
mozilla::gfx::IntRect rect;
// ASAN builds appear not to respect changes to the SSE rounding mode.
// Android x86 builds have bindgen issues.
#if !defined(ANDROID) && !defined(MOZ_ASAN) && (defined(__SSE2__) || defined(_M_X64) || (defined(_M_IX86_FP) && _M_IX86_FP >= 2))
__m128 appUnitsPacked = _mm_set_ps(aAppUnitsPerPixel, aAppUnitsPerPixel, aAppUnitsPerPixel, aAppUnitsPerPixel);
__m128 scalesPacked = _mm_set_ps(aYScale, aXScale, aYScale, aXScale);
// This is a bit of a rough approximation, i.e. any value under x + (1 - FLT_EPSILON) will
// be rounded to x instead of x + 1, however this inaccuracy is much smaller than
// 1/256th (which would indicate any significant coverage of the pixel) and reduces
// the amount of cycles considerably.
__m128 biasesPacked = _mm_set_ps(1 - FLT_EPSILON, 1 - FLT_EPSILON, 0, 0);
// See Floor section.
_MM_SET_ROUNDING_MODE(_MM_ROUND_DOWN);
__m128i rectPacked = _mm_loadu_si128((__m128i*)this); // x, y, w, h
__m128i widthHeight = _mm_slli_si128(rectPacked, 8); // 0, 0, x, y
rectPacked = _mm_add_epi32(rectPacked, widthHeight); // X, Y, XMost(), YMost()
__m128 rectFloat = _mm_cvtepi32_ps(rectPacked);
// Scale i.e. ([ x y xmost ymost ] / aAppUnitsPerPixel) * [ aXScale aYScale aXScale aYScale ]
rectFloat = _mm_mul_ps(_mm_div_ps(rectFloat, appUnitsPacked), scalesPacked);
// Floor
// Executed with bias and roundmode down, since round-nearest rounds 0.5 downward half the time.
rectFloat = _mm_add_ps(rectFloat, biasesPacked);
rectPacked = _mm_cvtps_epi32(rectFloat); // r.x, r.y, r.XMost(), r.YMost()
widthHeight = _mm_slli_si128(rectPacked, 8); // 0, 0, r.x, r.y
rectPacked = _mm_sub_epi32(rectPacked, widthHeight); // r.x, r.y, r.w, r.h
// Avoid negative width/height due to overflow.
__m128i mask = _mm_or_si128(_mm_cmpgt_epi32(rectPacked, _mm_setzero_si128()),
_mm_set_epi32(0, 0, 0xFFFFFFFF, 0xFFFFFFFF));
// Mask will now contain [ 0xFFFFFFFF 0xFFFFFFFF (width <= 0 ? 0 : 0xFFFFFFFF) (height <= 0 ? 0 : 0xFFFFFFFF) ]
rectPacked = _mm_and_si128(rectPacked, mask);
_mm_storeu_si128((__m128i*)&rect, rectPacked);
_MM_SET_ROUNDING_MODE(_MM_ROUND_NEAREST);
#else
rect.SetNonEmptyBox(NSToIntFloor(NSAppUnitsToFloatPixels(x,
float(aAppUnitsPerPixel)) * aXScale),
NSToIntFloor(NSAppUnitsToFloatPixels(y,
@ -404,7 +245,6 @@ nsRect::ScaleToOutsidePixels(float aXScale, float aYScale,
float(aAppUnitsPerPixel)) * aXScale),
NSToIntCeil(NSAppUnitsToFloatPixels(YMost(),
float(aAppUnitsPerPixel)) * aYScale));
#endif
return rect;
}

1
gfx/tests/gtest/TestRect.cpp
Просмотреть файл

@ -542,7 +542,6 @@ TestIntersectionLogical(nscoord x1, nscoord y1, nscoord w1, nscoord h1,
TEST(Gfx, Logical)
{
PR_Sleep(PR_SecondsToInterval(30));
TestIntersectionLogical(578, 0, 2650, 1152, 1036, 0, 2312, 1, 1036, 0, 2192, 1, true);
TestIntersectionLogical(0, 0, 1000, 1000, 500, 500, 1000, 1000, 500, 500, 500, 500, true);
TestIntersectionLogical(100, 200, 300, 400, 50, 250, 100, 100, 100, 250, 50, 100, true);

2
layout/generic/WritingModes.h
Просмотреть файл

@ -1930,7 +1930,7 @@ public:
mBSize = 0;
}
MOZ_ASSERT((rectDebug.IsEmpty() && (mISize == 0 || mBSize == 0)) || rectDebug.IsEqualEdges(nsRect(mIStart, mBStart, mISize, mBSize)));
MOZ_ASSERT(rectDebug.IsEqualEdges(nsRect(mIStart, mBStart, mISize, mBSize)));
return mISize > 0 && mBSize > 0;
}