Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-15 21:36:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out 3 changesets (bug 1000170, bug 1000370) for landing with the wrong patch author.

Browse Source 
Backed out changeset a3f42079e69c (bug 1000370)
Backed out changeset e4e33370b648 (bug 1000170)
Backed out changeset bca2faf314bf (bug 1000170)
This commit is contained in:
Ryan VanderMeulen 2014-04-23 14:20:54 -07:00
parent fa23812389
commit b1acf34460
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gfx/layers/client/ClientTiledThebesLayer.h
View File

@ -44,9 +44,6 @@ public:
ClientTiledThebesLayer(ClientLayerManager* const aManager);
~ClientTiledThebesLayer();
// Override name to distinguish it from ClientThebesLayer in layer dumps
virtual const char* Name() const { return "TiledThebesLayer"; }
// Thebes Layer
virtual Layer* AsLayer() { return this; }
virtual void InvalidateRegion(const nsIntRegion& aRegion) {

1
gfx/layers/composite/TiledContentHost.h
View File

@ -47,6 +47,7 @@ class Compositor;
class ISurfaceAllocator;
class Layer;
class ThebesBufferData;
class TiledThebesLayerComposite;
struct EffectChain;

5
gfx/thebes/gfxFont.cpp
View File

@ -2031,9 +2031,6 @@ gfxFont::~gfxFont()
gfxFloat
gfxFont::GetGlyphHAdvance(gfxContext *aCtx, uint16_t aGID)
{
if (!SetupCairoFont(aCtx)) {
return 0;
}
if (ProvidesGlyphWidths()) {
return GetGlyphWidth(aCtx, aGID) / 65536.0;
}
@ -2047,7 +2044,7 @@ gfxFont::GetGlyphHAdvance(gfxContext *aCtx, uint16_t aGID)
}
gfxHarfBuzzShaper* shaper =
static_cast<gfxHarfBuzzShaper*>(mHarfBuzzShaper.get());
if (!shaper->Initialize()) {
if (!shaper->Initialize() || !SetupCairoFont(aCtx)) {
return 0;
}
return shaper->GetGlyphHAdvance(aCtx, aGID) / 65536.0;