fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2025-12-25 02:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't require that the caller locks the view; do it in cairo code.

Browse source 
Remove the now-unneeded locking
This commit is contained in:
Christian Biesinger 2005-12-26 16:44:41 +00:00
parent 36850c7f32
commit 4fe93bcf92
3 changed files with 65 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2005-12-26 Christian Biesinger <cbiesinger@web.de>
* src/cairo-beos-surface.cpp: Don't require that the caller locks
the view; do it in cairo code.
* test/cairo-test-beos.cpp: Remove the now-unneeded locking
2005-12-21 Carl Worth <cworth@cworth.org>
* src/cairo-ps-surface.c: Remove some unneeded backend functions

52
src/cairo-beos-surface.cpp
View file

@ -72,6 +72,26 @@ struct cairo_beos_surface_t {
};
class AutoLockView {
public:
AutoLockView(BView* view) : mView(view) {
mOK = mView->LockLooper();
}
~AutoLockView() {
if (mOK)
mView->UnlockLooper();
}
operator bool() {
return mOK;
}
private:
BView* mView;
bool mOK;
};
static BRect
_cairo_rect_to_brect (const cairo_rectangle_t* rect)
{
@ -404,6 +424,13 @@ _cairo_beos_surface_acquire_source_image (void *abstract_surfa
fprintf(stderr, "Getting source image\n");
cairo_beos_surface_t *surface = reinterpret_cast<cairo_beos_surface_t*>(
abstract_surface);
AutoLockView locker(surface->view);
if (!locker) {
_cairo_error(CAIRO_STATUS_NO_MEMORY);
return CAIRO_STATUS_NO_MEMORY; /// XXX not exactly right, but what can we do?
}
surface->view->Sync();
if (surface->bitmap) {
@ -457,6 +484,13 @@ _cairo_beos_surface_acquire_dest_image (void *abstract_surface
cairo_beos_surface_t *surface = reinterpret_cast<cairo_beos_surface_t*>(
abstract_surface);
AutoLockView locker(surface->view);
if (!locker) {
*image_out = NULL;
*image_extra = NULL;
return CAIRO_STATUS_SUCCESS;
}
if (surface->bitmap) {
surface->view->Sync();
*image_out = _cairo_beos_bitmap_to_surface(surface->bitmap);
@ -518,8 +552,13 @@ _cairo_beos_surface_release_dest_image (void *abstract_surface,
void *image_extra)
{
fprintf(stderr, "Fallback drawing\n");
cairo_beos_surface_t *surface = reinterpret_cast<cairo_beos_surface_t*>(
abstract_surface);
AutoLockView locker(surface->view);
if (!locker)
return;
BBitmap* bitmap_to_draw = _cairo_image_surface_to_bitmap(image);
@ -558,6 +597,10 @@ _cairo_beos_fill_rectangles (void *abstract_surface,
if (num_rects <= 0)
return CAIRO_INT_STATUS_SUCCESS;
AutoLockView locker(surface->view);
if (!locker)
return CAIRO_INT_STATUS_SUCCESS;
drawing_mode mode;
if (!_cairo_op_to_be_op(op, &mode))
return CAIRO_INT_STATUS_UNSUPPORTED;
@ -570,7 +613,7 @@ _cairo_beos_fill_rectangles (void *abstract_surface,
// For CAIRO_OPERATOR_SOURCE, cairo expects us to use the premultiplied
// color info. This is only relevant when drawing into an rgb24 buffer
// (as for others, we can convert when asked for the image)
if (mode == B_OP_COPY &&
if (mode == B_OP_COPY && be_color.alpha != 0xFF &&
(!surface->bitmap || surface->bitmap->ColorSpace() != B_RGBA32))
{
be_color.red = premultiply(be_color.red, be_color.alpha);
@ -605,6 +648,10 @@ _cairo_beos_surface_set_clip_region (void *abstract_surface,
fprintf(stderr, "Setting clip region\n");
cairo_beos_surface_t *surface = reinterpret_cast<cairo_beos_surface_t*>(
abstract_surface);
AutoLockView locker(surface->view);
if (!locker)
return CAIRO_INT_STATUS_SUCCESS;
if (region == NULL) {
// No clipping
surface->view->ConstrainClippingRegion(NULL);
@ -629,6 +676,9 @@ _cairo_beos_surface_get_extents (void *abstract_surface,
{
cairo_beos_surface_t *surface = reinterpret_cast<cairo_beos_surface_t*>(
abstract_surface);
AutoLockView locker(surface->view);
if (!locker)
return CAIRO_INT_STATUS_UNSUPPORTED;
BRect size = surface->view->Bounds();

19
test/cairo-test-beos.cpp
View file

@ -70,6 +70,13 @@ CairoTestWindow::CairoTestWindow(BRect frame, const char* title)
mView = new BView(frame, "CairoWindowTestView", B_FOLLOW_ALL_SIDES, 0);
AddChild(mView);
Show();
// Make sure the window is actually on screen
Lock();
Sync();
mView->SetViewColor(B_TRANSPARENT_COLOR);
mView->Sync();
Unlock();
}
CairoTestWindow::~CairoTestWindow()
@ -169,10 +176,6 @@ create_beos_surface (cairo_test_t* test, cairo_format_t format, void **closure)
float bottom = test->height ? test->height - 1 : 0;
BRect rect(0.0, 0.0, right, bottom);
CairoTestWindow* wnd = new CairoTestWindow(rect, test->name);
if (!wnd->View()->LockLooper()) {
cairo_test_log("Error locking looper\n");
return NULL;
}
beos_test_closure* bclosure = new beos_test_closure;
bclosure->view = wnd->View();
@ -189,6 +192,7 @@ cleanup_beos (void* closure)
{
beos_test_closure* bclosure = reinterpret_cast<beos_test_closure*>(closure);
bclosure->window->Lock();
bclosure->window->Quit();
delete bclosure;
@ -206,11 +210,6 @@ create_beos_bitmap_surface (cairo_test_t* test, cairo_format_t format,
BView* view = new BView(rect, "Cairo test view", B_FOLLOW_ALL_SIDES, 0);
bmp->AddChild(view);
if (!view->LockLooper()) {
cairo_test_log("Error locking looper\n");
return NULL;
}
beos_test_closure* bclosure = new beos_test_closure;
bclosure->view = view;
bclosure->bitmap = bmp;
@ -225,8 +224,6 @@ cleanup_beos_bitmap (void* closure)
{
beos_test_closure* bclosure = reinterpret_cast<beos_test_closure*>(closure);
bclosure->view->UnlockLooper();
bclosure->bitmap->RemoveChild(bclosure->view);