mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-18 06:45:33 +00:00
06e901cb9f
AutoTextRun now only needs a DrawTarget instead of an nsRenderingContext, and similar nsRenderingContext/gfxContext-to-DrawTarget replacements can be propagated a long way up the call graph. This patch replaces 93 occurrences of nsRenderingContext and 135 occurrences of gfxContext with DrawTarget; that's 13% of them. The patch is mostly plumbing changes. A couple of not-entirely-plumbing changes: - It adds a comment about the null check in gfxGlyphExtents::GetTightGlyphExtentsAppUnits(). - A couple of functions simply had an unused gfxContext or nsRenderingContext parameter removed, e.g. SetLineBreaks(). --HG-- extra : rebase_source : 8f56994bb4d254a86788b17ab2864ebc758a7e6b
142 lines
4.1 KiB
C++
142 lines
4.1 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "gtest/gtest.h"
|
|
|
|
#include "mozilla/gfx/2D.h"
|
|
#include "mozilla/RefPtr.h"
|
|
#include "nsCOMPtr.h"
|
|
#include "nsTArray.h"
|
|
#include "nsString.h"
|
|
#include "nsDependentString.h"
|
|
|
|
#include "prinrval.h"
|
|
|
|
#include "gfxContext.h"
|
|
#include "gfxFont.h"
|
|
#include "gfxPlatform.h"
|
|
|
|
#include "gfxFontTest.h"
|
|
#include "mozilla/Attributes.h"
|
|
|
|
using namespace mozilla;
|
|
using namespace mozilla::gfx;
|
|
|
|
class FrameTextRunCache;
|
|
|
|
static FrameTextRunCache *gTextRuns = nullptr;
|
|
|
|
/*
|
|
* Cache textruns and expire them after 3*10 seconds of no use.
|
|
*/
|
|
class FrameTextRunCache final : public nsExpirationTracker<gfxTextRun,3> {
|
|
public:
|
|
enum { TIMEOUT_SECONDS = 10 };
|
|
FrameTextRunCache()
|
|
: nsExpirationTracker<gfxTextRun,3>(TIMEOUT_SECONDS * 1000,
|
|
"FrameTextRunCache")
|
|
{}
|
|
~FrameTextRunCache() {
|
|
AgeAllGenerations();
|
|
}
|
|
|
|
void RemoveFromCache(gfxTextRun* aTextRun) {
|
|
if (aTextRun->GetExpirationState()->IsTracked()) {
|
|
RemoveObject(aTextRun);
|
|
}
|
|
}
|
|
|
|
// This gets called when the timeout has expired on a gfxTextRun
|
|
virtual void NotifyExpired(gfxTextRun* aTextRun) {
|
|
RemoveFromCache(aTextRun);
|
|
delete aTextRun;
|
|
}
|
|
};
|
|
|
|
static gfxTextRun *
|
|
MakeTextRun(const char16_t *aText, uint32_t aLength, gfxFontGroup *aFontGroup,
|
|
const gfxFontGroup::Parameters* aParams, uint32_t aFlags)
|
|
{
|
|
nsAutoPtr<gfxTextRun> textRun;
|
|
if (aLength == 0) {
|
|
abort();
|
|
//textRun = aFontGroup->MakeEmptyTextRun(aParams, aFlags);
|
|
} else if (aLength == 1 && aText[0] == ' ') {
|
|
abort();
|
|
//textRun = aFontGroup->MakeSpaceTextRun(aParams, aFlags);
|
|
} else {
|
|
textRun = aFontGroup->MakeTextRun(aText, aLength, aParams, aFlags);
|
|
}
|
|
if (!textRun) {
|
|
return nullptr;
|
|
}
|
|
nsresult rv = gTextRuns->AddObject(textRun);
|
|
if (NS_FAILED(rv)) {
|
|
gTextRuns->RemoveFromCache(textRun);
|
|
return nullptr;
|
|
}
|
|
return textRun.forget();
|
|
}
|
|
|
|
static already_AddRefed<DrawTarget>
|
|
MakeDrawTarget()
|
|
{
|
|
const int size = 200;
|
|
|
|
RefPtr<DrawTarget> drawTarget = gfxPlatform::GetPlatform()->
|
|
CreateOffscreenContentDrawTarget(IntSize(size, size),
|
|
SurfaceFormat::B8G8R8X8);
|
|
return drawTarget.forget();
|
|
}
|
|
|
|
TEST(Gfx, WordCache) {
|
|
gTextRuns = new FrameTextRunCache();
|
|
|
|
RefPtr<DrawTarget> dt = MakeDrawTarget();
|
|
{
|
|
gfxFontStyle style(mozilla::gfx::FontStyle::NORMAL,
|
|
139,
|
|
10.0,
|
|
0,
|
|
NS_NewPermanentAtom(NS_LITERAL_STRING("en")),
|
|
0.0,
|
|
false, false,
|
|
NS_LITERAL_STRING(""));
|
|
|
|
RefPtr<gfxFontGroup> fontGroup =
|
|
gfxPlatform::GetPlatform()->CreateFontGroup(
|
|
NS_LITERAL_STRING("Geneva, MS Sans Serif, Helvetica,serif"), &style,
|
|
nullptr, nullptr, 1.0);
|
|
|
|
gfxTextRunFactory::Parameters params = {
|
|
dt, nullptr, nullptr, nullptr, 0, 60
|
|
};
|
|
|
|
uint32_t flags = gfxTextRunFactory::TEXT_IS_PERSISTENT;
|
|
|
|
// First load an Arabic word into the cache
|
|
const char cString[] = "\xd8\xaa\xd9\x85";
|
|
nsDependentCString cStr(cString);
|
|
NS_ConvertUTF8toUTF16 str(cStr);
|
|
gfxTextRun *tr =
|
|
MakeTextRun(str.get(), str.Length(), fontGroup, ¶ms, flags);
|
|
tr->GetAdvanceWidth(0, str.Length(), nullptr);
|
|
|
|
// Now try to trigger an assertion with a word cache bug. The first
|
|
// word is in the cache so it gets added to the new textrun directly.
|
|
// The second word is not in the cache.
|
|
const char cString2[] = "\xd8\xaa\xd9\x85\n\xd8\xaa\xd8\x85 ";
|
|
nsDependentCString cStr2(cString2);
|
|
NS_ConvertUTF8toUTF16 str2(cStr2);
|
|
gfxTextRun *tr2 =
|
|
MakeTextRun(str2.get(), str2.Length(), fontGroup, ¶ms, flags);
|
|
tr2->GetAdvanceWidth(0, str2.Length(), nullptr);
|
|
}
|
|
|
|
delete gTextRuns;
|
|
gTextRuns = nullptr;
|
|
}
|