Commit f5f103a

committed

report correct freed size when resurfacing

A little kludgey to force 2 calls in canvas.cc but 2 calls are necessary when changing size anyways, so it's the more general usage. TODO remove backends anyways Fixes Automattic#2514

1 parent 05a53d8 commit f5f103aCopy full SHA for f5f103a

File tree

3 files changed

-11

lines changed

src
- Canvas.cc
- backend
  - Backend.cc
  - Backend.h

3 files changed

-11

lines changed

`‎src/Canvas.cc`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -907,7 +907,8 @@ Canvas::resurface(Napi::Object This) {`
`907`	`907`	`Napi::Value context;`
`908`	`908`
`909`	`909`	`if (This.Get("context").UnwrapTo(&context) && context.IsObject()) {`
`910`		`- backend()->recreateSurface();`
	`910`	`+ backend()->destroySurface();`
	`911`	`+ backend()->createSurface();`
`911`	`912`	`// Reset context`
`912`	`913`	`Context2d *context2d = Context2d::Unwrap(context.As<Napi::Object>());`
`913`	`914`	`cairo_t *prev = context2d->context();`

`‎src/backend/Backend.cc`

Lines changed: 4 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,13 +22,6 @@ void Backend::setCanvas(Canvas* _canvas)`
`22`	`22`	`}`
`23`	`23`
`24`	`24`
`25`		`-cairo_surface_t* Backend::recreateSurface()`
`26`		`-{`
`27`		`- this->destroySurface();`
`28`		`-`
`29`		`- return this->createSurface();`
`30`		`-}`
`31`		`-`
`32`	`25`	`DLL_PUBLIC cairo_surface_t* Backend::getSurface() {`
`33`	`26`	`if (!surface) createSurface();`
`34`	`27`	`return surface;`
`@@ -55,8 +48,9 @@ int Backend::getWidth()`
`55`	`48`	`}`
`56`	`49`	`void Backend::setWidth(int width_)`
`57`	`50`	`{`
	`51`	`+ this->destroySurface();`
`58`	`52`	`this->width = width_;`
`59`		`- this->recreateSurface();`
	`53`	`+ this->createSurface();`
`60`	`54`	`}`
`61`	`55`
`62`	`56`	`int Backend::getHeight()`
`@@ -65,8 +59,9 @@ int Backend::getHeight()`
`65`	`59`	`}`
`66`	`60`	`void Backend::setHeight(int height_)`
`67`	`61`	`{`
	`62`	`+ this->destroySurface();`
`68`	`63`	`this->height = height_;`
`69`		`- this->recreateSurface();`
	`64`	`+ this->createSurface();`
`70`	`65`	`}`
`71`	`66`
`72`	`67`	`bool Backend::isSurfaceValid(){`

`‎src/backend/Backend.h`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ class Backend`
`30`	`30`	`void setCanvas(Canvas* canvas);`
`31`	`31`
`32`	`32`	`virtual cairo_surface_t* createSurface() = 0;`
`33`		`- virtual cairo_surface_t* recreateSurface();`
`34`	`33`
`35`	`34`	`DLL_PUBLIC cairo_surface_t* getSurface();`
`36`	`35`	`virtual void destroySurface();`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit f5f103a

File tree

3 files changed

3 files changed

`‎src/Canvas.cc`

`‎src/backend/Backend.cc`

`‎src/backend/Backend.h`

0 commit comments