diff options
| author |  mtklein <mtklein@google.com> | 2016-03-11 06:10:30 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-11 06:10:30 -0800 |
| commit | 218c846ac0509f70d6da3eb3a439fa89b589f7b5 (patch) | |
| tree | ce30ddb73a716cdc25ac2cc8c7f159d3168a8792 /include/gpu/gl | |
| parent | 3dd9ed37c24611af86f0fe374bd3698b63f09450 (diff) | |
Revert of Use std::unique_ptr. (patchset #8 id:130001 of https://codereview.chromium.org/1780933003/ )
Reason for revert:
Another Android ambiguity due to implicit bool...
frameworks/base/core/jni/android/graphics/Utils.cpp:110:35: error: call of overloaded 'SkMemoryStream(SkAutoTUnref<SkData>&)' is ambiguous
return new SkMemoryStream(data);
Original issue's description:
> Use std::unique_ptr.
>
> TBR=reed@google.com
>
> Committed: https://skia.googlesource.com/skia/+/20c1e3abfc681771f73eb19fde7284196e028940
>
> Committed: https://skia.googlesource.com/skia/+/3dd9ed37c24611af86f0fe374bd3698b63f09450
TBR=bungeman@google.com,mtklein@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1785353002
Diffstat (limited to 'include/gpu/gl')
| -rw-r--r-- | include/gpu/gl/SkGLContext.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/gpu/gl/SkGLContext.h b/include/gpu/gl/SkGLContext.h index fe41a606ef..ddf5dc080a 100644 --- a/include/gpu/gl/SkGLContext.h +++ b/include/gpu/gl/SkGLContext.h @@ -25,7 +25,7 @@ public: const GrGLInterface* gl() const { return fGL.get(); } - bool fenceSyncSupport() const { return fFenceSync != nullptr; } + bool fenceSyncSupport() const { return SkToBool(fFenceSync); } bool getMaxGpuFrameLag(int* maxFrameLag) const { if (!fFenceSync) { |