aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/gpu/gl
diff options
context:
space:
mode:
authorGravatar jcgregorio <jcgregorio@google.com>2016-01-05 04:15:23 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-01-05 04:15:23 -0800
commit54e2ca5a2338b6700fd4c147ad2f934c70ecac90 (patch)
tree775efcc4d587a3630476cd73b7604083f3cf70e5 /include/gpu/gl
parentbc7d235c8b0ddbe7080c6e9eba5b617fddc16135 (diff)
Revert of Make SkGLContext lifetime more well-defined (patchset #7 id:120001 of https://codereview.chromium.org/1511773005/ )
Reason for revert: Broke tests on Android, iOS, Mac and Windows. Original issue's description: > 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 > > Committed: https://skia.googlesource.com/skia/+/830e012187f951d49d7e46e196ac8d1e653a25da TBR=bsalomon@google.com,kkinnunen@nvidia.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:2992 Review URL: https://codereview.chromium.org/1555053003
Diffstat (limited to 'include/gpu/gl')
-rw-r--r--include/gpu/gl/SkGLContext.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/gpu/gl/SkGLContext.h b/include/gpu/gl/SkGLContext.h
index 7edfa730aa..3420a47973 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 SkNoncopyable {
+class SK_API SkGLContext : public SkRefCnt {
public:
- virtual ~SkGLContext();
+ ~SkGLContext() override;
bool isValid() const { return NULL != gl(); }
@@ -106,6 +106,8 @@ private:
SkAutoTUnref<const GrGLInterface> fGL;
friend class GLFenceSync; // For onPlatformGetProcAddress.
+
+ typedef SkRefCnt INHERITED;
};
/** Creates platform-dependent GL context object