| Index: ui/surface/transport_dib_android.cc
|
| ===================================================================
|
| --- ui/surface/transport_dib_android.cc (revision 167659)
|
| +++ ui/surface/transport_dib_android.cc (working copy)
|
| @@ -65,13 +65,9 @@
|
| skia::PlatformCanvas* TransportDIB::GetPlatformCanvas(int w, int h) {
|
| if (!memory() && !Map())
|
| return NULL;
|
| - scoped_ptr<skia::PlatformCanvas> canvas(new skia::PlatformCanvas);
|
| - if (!canvas->initialize(w, h, true, reinterpret_cast<uint8_t*>(memory()))) {
|
| - // TODO(husky): Remove when http://b/issue?id=4233182 is definitely fixed.
|
| - LOG(ERROR) << "Failed to initialize canvas of size " << w << "x" << h;
|
| - return NULL;
|
| - }
|
| - return canvas.release();
|
| + return skia::CreatePlatformCanvas(w, h, true,
|
| + reinterpret_cast<uint8_t*>(memory()),
|
| + skia::RETURN_NULL_ON_FAILURE);
|
| }
|
|
|
| bool TransportDIB::Map() {
|
|
|