Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 15:23:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1502152 - Skia m71 Moz2D fixes. r=rhunt

Browse Source
This commit is contained in:
Lee Salzman 2018-10-30 22:17:34 -04:00
parent 978391d1a2
commit dd9933b890
2 changed files with 26 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
gfx/2d/DrawTargetSkia.cpp
View File

@ -12,6 +12,7 @@
#include "mozilla/ArrayUtils.h"
#include "mozilla/CheckedInt.h"
#include "mozilla/Vector.h"
#include "skia/include/core/SkSurface.h"
#include "skia/include/core/SkTypeface.h"
@ -38,7 +39,6 @@
#ifdef MOZ_WIDGET_COCOA
#include "BorrowedContext.h"
#include <ApplicationServices/ApplicationServices.h>
#include "mozilla/Vector.h"
#include "ScaledFontMac.h"
#include "CGTextDrawing.h"
#endif
@ -1441,16 +1441,6 @@ DrawTargetSkia::DrawGlyphs(ScaledFont* aFont,
paint.mPaint.setHinting(SkPaint::kNo_Hinting);
}
break;
case FontType::GDI:
{
if (!shouldLCDRenderText && aaEnabled) {
// If we have non LCD GDI text, render the fonts as cleartype and convert them
// to grayscale. This seems to be what Chrome and IE are doing on Windows 7.
// This also applies if cleartype is disabled system wide.
paint.mPaint.setFlags(paint.mPaint.getFlags() | SkPaint::kGenA8FromLCD_Flag);
}
break;
}
#ifdef XP_WIN
case FontType::DWRITE:
{
@ -1470,29 +1460,20 @@ DrawTargetSkia::DrawGlyphs(ScaledFont* aFont,
paint.mPaint.setSubpixelText(useSubpixelText);
const uint32_t heapSize = 64;
uint16_t indicesOnStack[heapSize];
SkPoint offsetsOnStack[heapSize];
std::vector<uint16_t> indicesOnHeap;
std::vector<SkPoint> offsetsOnHeap;
uint16_t* indices = indicesOnStack;
SkPoint* offsets = offsetsOnStack;
if (aBuffer.mNumGlyphs > heapSize) {
// Heap allocation/ deallocation is slow, use it only if we need a
// bigger(>heapSize) buffer.
indicesOnHeap.resize(aBuffer.mNumGlyphs);
offsetsOnHeap.resize(aBuffer.mNumGlyphs);
indices = (uint16_t*)&indicesOnHeap.front();
offsets = (SkPoint*)&offsetsOnHeap.front();
Vector<uint16_t, 64> indices;
Vector<SkPoint, 64> offsets;
if (!indices.resizeUninitialized(aBuffer.mNumGlyphs) ||
!offsets.resizeUninitialized(aBuffer.mNumGlyphs)) {
gfxDebug() << "Failed allocating Skia text buffers for GlyphBuffer";
return;
}
for (unsigned int i = 0; i < aBuffer.mNumGlyphs; i++) {
for (uint32_t i = 0; i < aBuffer.mNumGlyphs; i++) {
indices[i] = aBuffer.mGlyphs[i].mIndex;
offsets[i].fX = SkFloatToScalar(aBuffer.mGlyphs[i].mPosition.x);
offsets[i].fY = SkFloatToScalar(aBuffer.mGlyphs[i].mPosition.y);
offsets[i] = PointToSkPoint(aBuffer.mGlyphs[i].mPosition);
}
mCanvas->drawPosText(indices, aBuffer.mNumGlyphs*2, offsets, paint.mPaint);
mCanvas->drawPosText(indices.begin(), indices.length() * sizeof(uint16_t), offsets.begin(), paint.mPaint);
}
void
@ -2037,9 +2018,10 @@ DrawTargetSkia::GetNativeSurface(NativeSurfaceType aType)
{
#ifdef USE_SKIA_GPU
if (aType == NativeSurfaceType::OPENGL_TEXTURE && mSurface) {
GrBackendObject handle = mSurface->getTextureHandle(SkSurface::kFlushRead_BackendHandleAccess);
if (handle) {
return (void*)(uintptr_t)reinterpret_cast<GrGLTextureInfo *>(handle)->fID;
GrBackendTexture tex = mSurface->getBackendTexture(SkSurface::kFlushRead_BackendHandleAccess);
GrGLTextureInfo info;
if (tex.getGLTextureInfo(&info)) {
return (void*)(uintptr_t)info.fID;
}
}
#endif

13
gfx/2d/dw-extra.h
View File

@ -62,7 +62,18 @@ struct DWRITE_FONT_AXIS_RANGE {
FLOAT maxValue;
};
struct DWRITE_GLYPH_IMAGE_DATA;
struct DWRITE_GLYPH_IMAGE_DATA
{
const void* imageData;
UINT32 imageDataSize;
UINT32 uniqueDataId;
UINT32 pixelsPerEm;
D2D1_SIZE_U pixelSize;
D2D1_POINT_2L horizontalLeftOrigin;
D2D1_POINT_2L horizontalRightOrigin;
D2D1_POINT_2L verticalTopOrigin;
D2D1_POINT_2L verticalBottomOrigin;
};
interface DWRITE_DECLARE_INTERFACE("27F2A904-4EB8-441D-9678-0563F53E3E2F") IDWriteFontFace4
: public IDWriteFontFace3