Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / core / SkDevice.cpp

diff --git a/src/third_party/skia/src/core/SkDevice.cpp b/src/third_party/skia/src/core/SkDevice.cpp
index c08ae26..364b106 100644 (file)
--- a/src/third_party/skia/src/core/SkDevice.cpp
+++ b/src/third_party/skia/src/core/SkDevice.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
@@ -18,6 +17,7 @@
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
+
 SkBaseDevice::SkBaseDevice()
     : fLeakyProperties(SkDeviceProperties::MakeDefault())
 #ifdef SK_DEBUG
@@ -65,6 +65,12 @@ SkMetaData& SkBaseDevice::getMetaData() {
     return *fMetaData;
 }
 
+// TODO: should make this guy pure-virtual.
+SkImageInfo SkBaseDevice::imageInfo() const {
+    return SkImageInfo::Make(this->width(), this->height(),
+                             kUnknown_SkColorType, kIgnore_SkAlphaType);
+}
+
 const SkBitmap& SkBaseDevice::accessBitmap(bool changePixels) {
     const SkBitmap& bitmap = this->onAccessBitmap();
     if (changePixels) {
@@ -115,3 +121,7 @@ bool SkBaseDevice::readPixels(SkBitmap* bitmap, int x, int y,
     }
     return result;
 }
+
+SkSurface* SkBaseDevice::newSurface(const SkImageInfo&) { return NULL; }
+
+const void* SkBaseDevice::peekPixels(SkImageInfo*, size_t*) { return NULL; }