| Index: Source/platform/graphics/Canvas2DLayerBridge.cpp
|
| diff --git a/Source/platform/graphics/Canvas2DLayerBridge.cpp b/Source/platform/graphics/Canvas2DLayerBridge.cpp
|
| index 08c115ffdc030a16d8d200afe9d035b56d19a946..e54518de3c4a8183ec47ce3359cb36f703f083da 100644
|
| --- a/Source/platform/graphics/Canvas2DLayerBridge.cpp
|
| +++ b/Source/platform/graphics/Canvas2DLayerBridge.cpp
|
| @@ -55,7 +55,7 @@ namespace WebCore {
|
| static PassRefPtr<SkSurface> createSkSurface(GrContext* gr, const IntSize& size, int msaaSampleCount = 0)
|
| {
|
| if (!gr)
|
| - return 0;
|
| + return nullptr;
|
| gr->resetContext();
|
| SkImageInfo info;
|
| info.fWidth = size.width();
|
| @@ -70,10 +70,10 @@ PassRefPtr<Canvas2DLayerBridge> Canvas2DLayerBridge::create(const IntSize& size,
|
| TRACE_EVENT_INSTANT0("test_gpu", "Canvas2DLayerBridgeCreation");
|
| OwnPtr<blink::WebGraphicsContext3DProvider> contextProvider = adoptPtr(blink::Platform::current()->createSharedOffscreenGraphicsContext3DProvider());
|
| if (!contextProvider)
|
| - return 0;
|
| + return nullptr;
|
| RefPtr<SkSurface> surface(createSkSurface(contextProvider->grContext(), size, msaaSampleCount));
|
| if (!surface)
|
| - return 0;
|
| + return nullptr;
|
| RefPtr<Canvas2DLayerBridge> layerBridge;
|
| OwnPtr<SkDeferredCanvas> canvas = adoptPtr(SkDeferredCanvas::Create(surface.get()));
|
| layerBridge = adoptRef(new Canvas2DLayerBridge(contextProvider.release(), canvas.release(), msaaSampleCount, opacityMode));
|
|
|