Index: src/gpu/GrLayerAtlas.cpp |
diff --git a/src/gpu/GrLayerAtlas.cpp b/src/gpu/GrLayerAtlas.cpp |
index df8215a6071661112d666f3012ab15d7e6de79a1..c1f8732b351f8dcf6ef62fa9accc8e864e8e867f 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) { |