diff options
| author |  kkinnunen <kkinnunen@nvidia.com> | 2016-01-05 00:30:32 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-01-05 00:30:33 -0800 |
| commit | 830e012187f951d49d7e46e196ac8d1e653a25da (patch) | |
| tree | c70e0541370b4b0b04211b2477218d8a2593303c /include/gpu/gl | |
| parent | 8686a5eeef85bbd28404d7cc51b5d02ceff35767 (diff) | |
Make SkGLContext lifetime more well-defined
Remove refcounting from SkGLContext.
SkGLContext is expected to behave like GrContextFactory would own
it, as implied by the GrContextFactory function.
If it is refcounted, this does not hold.
Also other use sites, such as in SkOSWindow_win (command buffer gl
object), confirm the behavior. The object is explicitly owned and
destroyed, not shared.
Also fixes potential crashes from using GL context of an abandoned
context.
Also fixes potential crashes in DM/nanobench, if the GrContext lives
longer than GLContext through internal refing of GrContext.
Moves the non-trivial implementations from GrContextFactory.h to
.cpp, just for consistency sake.
Changes pathops_unittest.gyp. The pathops_unittest uses
GrContextFactory, but did not link to its implementation. The reason
they worked was that the implementation used (constructors, destructors)
happened to be in the .h file.
This works towards being able to use command buffer and NVPR from
the SampleApp.
BUG=skia:2992
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1511773005
Review URL: https://codereview.chromium.org/1511773005
Diffstat (limited to 'include/gpu/gl')
| -rw-r--r-- | include/gpu/gl/SkGLContext.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/gpu/gl/SkGLContext.h b/include/gpu/gl/SkGLContext.h index 3420a47973..7edfa730aa 100644 --- a/include/gpu/gl/SkGLContext.h +++ b/include/gpu/gl/SkGLContext.h @@ -17,9 +17,9 @@ * This class is intended for Skia's testing needs and not for general * use. */ -class SK_API SkGLContext : public SkRefCnt { +class SK_API SkGLContext : public SkNoncopyable { public: - ~SkGLContext() override; + virtual ~SkGLContext(); bool isValid() const { return NULL != gl(); } @@ -106,8 +106,6 @@ private: SkAutoTUnref<const GrGLInterface> fGL; friend class GLFenceSync; // For onPlatformGetProcAddress. - - typedef SkRefCnt INHERITED; }; /** Creates platform-dependent GL context object |