Optionally clear PlatformCanvas instances.

skia/ext/vector_platform_device_skia.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "skia/ext/vector_platform_device_skia.h"
 
 #include "skia/ext/bitmap_platform_device.h"
 #include "third_party/skia/include/core/SkClipStack.h"
 #include "third_party/skia/include/core/SkDraw.h"
 #include "third_party/skia/include/core/SkRect.h"
@@ skipping 35 matching lines @@
                                                  height(),
                                                  false, /* not opaque */
                                                  NULL);
 #elif defined(OS_POSIX) && !defined(OS_MACOSX)
   raster_surface_ = BitmapPlatformDevice::Create(width(),
                                                  height(),
                                                  false /* not opaque */);
 #endif
   raster_surface_->unref();  // SkRefPtr and create both took a reference.
 
+#if defined(OS_WIN) || defined(OS_MACOSX)
+  // BitmapPlatformDevice instances are initialized to 0 by Cairo on Linux, but
+  // uninitialized on Win and Mac.
   SkCanvas canvas(raster_surface_.get());
+  canvas.clear(SkColorSetARGB(0, 0, 0, 0));

[Alexei Svitkine (slow), 2012/03/15 22:49:11]

This whole function is kind of nasty.

Could you add a BitmapPlatformDevice::CreateAndClear(int width, int height, bool
opaque); function that will do the right thing on each platform?

[Jeff Timanus, 2012/03/16 03:10:31]

Done.

+#endif
   return raster_surface_->BeginPlatformPaint();
 }
 
 void VectorPlatformDeviceSkia::EndPlatformPaint() {
   DCHECK(raster_surface_ != NULL);
   SkPaint paint;
   // SkPDFDevice checks the passed SkDraw for an empty clip (only).  Fake
   // it out by setting a non-empty clip.
   SkDraw draw;
   SkRegion clip(SkIRect::MakeWH(width(), height()));
@@ skipping 23 matching lines @@
 }
 #elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_OPENBSD)
 void VectorPlatformDeviceSkia::DrawToNativeContext(
     PlatformSurface surface, int x, int y, const PlatformRect* src_rect) {
   // Should never be called on Linux.
   SkASSERT(false);
 }
 #endif
 
 }  // namespace skia