diff options
| author |  mtklein <mtklein@chromium.org> | 2016-03-16 10:28:35 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-16 10:28:35 -0700 |
| commit | 5f939ab658a228dce34a3b14a545638407150b92 (patch) | |
| tree | 3eff56fe1aad736cb0e8e07735c06690c5d7d0a4 /src/gpu | |
| parent | af1e21e7ebb155d2505da0eb974c672953dfefef (diff) | |
Use std::unique_ptr.
TBR=reed@google.com
Committed: https://skia.googlesource.com/skia/+/20c1e3abfc681771f73eb19fde7284196e028940
Committed: https://skia.googlesource.com/skia/+/3dd9ed37c24611af86f0fe374bd3698b63f09450
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1780933003
Committed: https://skia.googlesource.com/skia/+/2691d76a06e1af6282f8b3a3140cc93361be10c4
Review URL: https://codereview.chromium.org/1780933003
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/GrLayerAtlas.cpp | 6 | ||||
| -rw-r--r-- | src/gpu/text/GrStencilAndCoverTextContext.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/GrLayerAtlas.cpp b/src/gpu/GrLayerAtlas.cpp index df8215a607..c1f8732b35 100644 --- a/src/gpu/GrLayerAtlas.cpp +++ b/src/gpu/GrLayerAtlas.cpp @@ -12,7 +12,7 @@ #include "GrTextureProvider.h" /////////////////////////////////////////////////////////////////////////////// -GrLayerAtlas::Plot::Plot() +GrLayerAtlas::Plot::Plot() : fID(-1) , fRects(nullptr) { fOffset.set(0, 0); @@ -54,7 +54,7 @@ bool GrLayerAtlas::reattachBackingTexture() { SkASSERT(!fTexture); fTexture.reset(fTexProvider->findAndRefTextureByUniqueKey(get_layer_atlas_key())); - return SkToBool(fTexture); + return fTexture != nullptr; } void GrLayerAtlas::createBackingTexture() { @@ -71,7 +71,7 @@ void GrLayerAtlas::createBackingTexture() { fTexture->resourcePriv().setUniqueKey(get_layer_atlas_key()); } -GrLayerAtlas::GrLayerAtlas(GrTextureProvider* texProvider, GrPixelConfig config, +GrLayerAtlas::GrLayerAtlas(GrTextureProvider* texProvider, GrPixelConfig config, GrSurfaceFlags flags, const SkISize& backingTextureSize, int numPlotsX, int numPlotsY) { diff --git a/src/gpu/text/GrStencilAndCoverTextContext.cpp b/src/gpu/text/GrStencilAndCoverTextContext.cpp index ab9025d316..661f22512d 100644 --- a/src/gpu/text/GrStencilAndCoverTextContext.cpp +++ b/src/gpu/text/GrStencilAndCoverTextContext.cpp @@ -329,7 +329,7 @@ class GrStencilAndCoverTextContext::FallbackBlobBuilder { public: FallbackBlobBuilder() : fBuffIdx(0), fCount(0) {} - bool isInitialized() const { return SkToBool(fBuilder); } + bool isInitialized() const { return fBuilder != nullptr; } void init(const SkPaint& font, SkScalar textRatio); |