mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-18 15:55:36 +00:00
01583602a9
The bulk of this commit was generated with a script, executed at the top
level of a typical source code checkout. The only non-machine-generated
part was modifying MFBT's moz.build to reflect the new naming.
CLOSED TREE makes big refactorings like this a piece of cake.
# The main substitution.
find . -name '*.cpp' -o -name '*.cc' -o -name '*.h' -o -name '*.mm' -o -name '*.idl'| \
xargs perl -p -i -e '
s/nsRefPtr\.h/RefPtr\.h/g; # handle includes
s/nsRefPtr ?</RefPtr</g; # handle declarations and variables
'
# Handle a special friend declaration in gfx/layers/AtomicRefCountedWithFinalize.h.
perl -p -i -e 's/::nsRefPtr;/::RefPtr;/' gfx/layers/AtomicRefCountedWithFinalize.h
# Handle nsRefPtr.h itself, a couple places that define constructors
# from nsRefPtr, and code generators specially. We do this here, rather
# than indiscriminantly s/nsRefPtr/RefPtr/, because that would rename
# things like nsRefPtrHashtable.
perl -p -i -e 's/nsRefPtr/RefPtr/g' \
mfbt/nsRefPtr.h \
xpcom/glue/nsCOMPtr.h \
xpcom/base/OwningNonNull.h \
ipc/ipdl/ipdl/lower.py \
ipc/ipdl/ipdl/builtin.py \
dom/bindings/Codegen.py \
python/lldbutils/lldbutils/utils.py
# In our indiscriminate substitution above, we renamed
# nsRefPtrGetterAddRefs, the class behind getter_AddRefs. Fix that up.
find . -name '*.cpp' -o -name '*.h' -o -name '*.idl' | \
xargs perl -p -i -e 's/nsRefPtrGetterAddRefs/RefPtrGetterAddRefs/g'
if [ -d .git ]; then
git mv mfbt/nsRefPtr.h mfbt/RefPtr.h
else
hg mv mfbt/nsRefPtr.h mfbt/RefPtr.h
fi
--HG--
rename : mfbt/nsRefPtr.h => mfbt/RefPtr.h
49 lines
1.5 KiB
C++
49 lines
1.5 KiB
C++
/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
|
* 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 "gfxQtNativeRenderer.h"
|
|
#include "gfxContext.h"
|
|
#include "gfxUtils.h"
|
|
#include "gfxXlibSurface.h"
|
|
|
|
nsresult
|
|
gfxQtNativeRenderer::Draw(gfxContext* ctx, mozilla::gfx::IntSize size,
|
|
uint32_t flags, Screen* screen, Visual* visual)
|
|
{
|
|
Display *dpy = DisplayOfScreen(screen);
|
|
bool isOpaque = (flags & DRAW_IS_OPAQUE) ? true : false;
|
|
int screenNumber = screen - ScreenOfDisplay(dpy, 0);
|
|
|
|
if (!isOpaque) {
|
|
int depth = 32;
|
|
XVisualInfo vinfo;
|
|
int foundVisual = XMatchVisualInfo(dpy, screenNumber,
|
|
depth, TrueColor,
|
|
&vinfo);
|
|
if (!foundVisual)
|
|
return NS_ERROR_FAILURE;
|
|
|
|
visual = vinfo.visual;
|
|
}
|
|
|
|
RefPtr<gfxXlibSurface> xsurf =
|
|
gfxXlibSurface::Create(screen, visual,
|
|
mozilla::gfx::IntSize(size.width, size.height));
|
|
|
|
if (!isOpaque) {
|
|
gfxUtils::ClearThebesSurface(xsurf);
|
|
}
|
|
|
|
nsresult rv = DrawWithXlib(xsurf->CairoSurface(), nsIntPoint(0, 0), nullptr, 0);
|
|
|
|
if (NS_FAILED(rv))
|
|
return rv;
|
|
|
|
ctx->SetSource(xsurf);
|
|
ctx->Paint();
|
|
|
|
return rv;
|
|
}
|