Chrome-side of tests for Pepper Device2D. This includes some bugfixes and min...

webkit/glue/plugins/pepper_image_data.cc

 // Copyright (c) 2010 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 "webkit/glue/plugins/pepper_image_data.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/logging.h"
@@ skipping 118 matching lines @@
 }
 
 void ImageData::Describe(PP_ImageDataDesc* desc) const {
   desc->format = PP_IMAGEDATAFORMAT_BGRA_PREMUL;
   desc->width = width_;
   desc->height = height_;
   desc->stride = width_ * 4;
 }
 
 void* ImageData::Map() {
-  if (!is_valid())
-    return NULL;
-
   if (!mapped_canvas_.get()) {
     mapped_canvas_.reset(platform_image_->Map());
     if (!mapped_canvas_.get())
       return NULL;
   }
   const SkBitmap& bitmap =
       mapped_canvas_->getTopPlatformDevice().accessBitmap(true);
 
   // Our platform bitmaps are set to opaque by default, which we don't want.
   const_cast<SkBitmap&>(bitmap).setIsOpaque(false);
 
   bitmap.lockPixels();
   return bitmap.getAddr32(0, 0);
 }
 
 void ImageData::Unmap() {
   // This is currently unimplemented, which is OK. The data will just always
   // be around once it's mapped. Chrome's TransportDIB isn't currently
   // unmappable without freeing it, but this may be something we want to support
   // in the future to save some memory.
 }
 
-const SkBitmap& ImageData::GetMappedBitmap() const {
-  DCHECK(is_valid());
-  return mapped_canvas_->getTopPlatformDevice().accessBitmap(false);
+const SkBitmap* ImageData::GetMappedBitmap() const {
+  if (!mapped_canvas_.get())
+    return NULL;
+  return &mapped_canvas_->getTopPlatformDevice().accessBitmap(false);
 }
 
 void ImageData::Swap(ImageData* other) {
   swap(other->platform_image_, platform_image_);
   swap(other->mapped_canvas_, mapped_canvas_);
   std::swap(other->width_, width_);
   std::swap(other->height_, height_);
 }
 
 }  // namespace pepper