830e012187
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
53 lines
1.2 KiB
Python
53 lines
1.2 KiB
Python
# Copyright 2015 Google Inc.
|
|
#
|
|
# Use of this source code is governed by a BSD-style license that can be
|
|
# found in the LICENSE file.
|
|
# GYP file to build pathops unit tests.
|
|
{
|
|
'includes': [
|
|
'apptype_console.gypi',
|
|
],
|
|
'targets': [
|
|
{
|
|
'target_name': 'pathops_unittest',
|
|
'type': 'executable',
|
|
'includes': [
|
|
'pathops_unittest.gypi',
|
|
],
|
|
'dependencies': [
|
|
'flags.gyp:flags_common',
|
|
'tools.gyp:crash_handler',
|
|
],
|
|
'sources': [
|
|
'../tests/PathOpsAngleIdeas.cpp',
|
|
'../tests/PathOpsBattles.cpp',
|
|
'../tests/PathOpsCubicLineIntersectionIdeas.cpp',
|
|
'../tests/PathOpsDebug.cpp',
|
|
'../tests/PathOpsOpLoopThreadedTest.cpp',
|
|
'../tests/PathOpsTSectDebug.h',
|
|
'../tests/skia_test.cpp',
|
|
],
|
|
'conditions': [
|
|
[ 'skia_android_framework == 1', {
|
|
'libraries': [
|
|
'-lskia',
|
|
],
|
|
'libraries!': [
|
|
'-lz',
|
|
'-llog',
|
|
],
|
|
}],
|
|
[ 'skia_gpu == 1', {
|
|
'include_dirs': [
|
|
'../src/gpu',
|
|
],
|
|
'sources': [
|
|
'../src/gpu/GrContextFactory.cpp',
|
|
'../src/gpu/GrContextFactory.h',
|
|
]
|
|
}],
|
|
],
|
|
},
|
|
],
|
|
}
|