Skip to content

Context2d: keep fillStyle/strokeStyle strong, fix resetState and ~Context2d teardown #2598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
iurisilvio wants to merge 1 commit into from
+10 −5
Closed

Context2d: keep fillStyle/strokeStyle strong, fix resetState and ~Context2d teardown #2598

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/CanvasRenderingContext2d.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,10 @@ Context2d::Context2d(const Napi::CallbackInfo& info) : Napi::ObjectWrap<Context2
*/

Context2d::~Context2d() {
// Destroy states before _context so each canvas_state_t is torn down while
// the context is still valid.
while (!states.empty()) states.pop();
state = nullptr;
if (_layout) g_object_unref(_layout);
if (_context) cairo_destroy(_context);
_resetPersistentHandles();
Expand All @@ -252,8 +256,9 @@ Context2d::~Context2d() {
*/

void Context2d::resetState() {
states.pop();
while (!states.empty()) states.pop();
states.emplace();
state = &states.top();
pango_layout_set_font_description(_layout, state->fontDescription);
_resetPersistentHandles();
}
Expand Down Expand Up @@ -1966,11 +1971,11 @@ Context2d::SetFillStyle(const Napi::CallbackInfo& info, const Napi::Value& value
InstanceData *data = env.GetInstanceData<InstanceData>();
Napi::Object obj = value.As<Napi::Object>();
if (obj.InstanceOf(data->CanvasGradientCtor.Value()).UnwrapOr(false)) {
_fillStyle.Reset(obj);
_fillStyle.Reset(obj, 1);
Gradient *grad = Gradient::Unwrap(obj);
state->fillGradient = grad->pattern();
} else if (obj.InstanceOf(data->CanvasPatternCtor.Value()).UnwrapOr(false)) {
_fillStyle.Reset(obj);
_fillStyle.Reset(obj, 1);
Pattern *pattern = Pattern::Unwrap(obj);
state->fillPattern = pattern->pattern();
}
Expand Down Expand Up @@ -2006,11 +2011,11 @@ Context2d::SetStrokeStyle(const Napi::CallbackInfo& info, const Napi::Value& val
InstanceData *data = env.GetInstanceData<InstanceData>();
Napi::Object obj = value.As<Napi::Object>();
if (obj.InstanceOf(data->CanvasGradientCtor.Value()).UnwrapOr(false)) {
_strokeStyle.Reset(obj);
_strokeStyle.Reset(obj, 1);
Gradient *grad = Gradient::Unwrap(obj);
state->strokeGradient = grad->pattern();
} else if (obj.InstanceOf(data->CanvasPatternCtor.Value()).UnwrapOr(false)) {
_strokeStyle.Reset(value);
_strokeStyle.Reset(value, 1);
Pattern *pattern = Pattern::Unwrap(obj);
state->strokePattern = pattern->pattern();
}
Expand Down
Loading