add optional origin parameter to accessTopLayerPixels

src/core/SkCanvas.cpp

 
 /*
  * Copyright 2008 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkCanvas.h"
@@ skipping 1088 matching lines @@
 
 const void* SkCanvas::peekPixels(SkImageInfo* info, size_t* rowBytes) {
     return this->onPeekPixels(info, rowBytes);
 }
 
 const void* SkCanvas::onPeekPixels(SkImageInfo* info, size_t* rowBytes) {
     SkBaseDevice* dev = this->getDevice();
     return dev ? dev->peekPixels(info, rowBytes) : NULL;
 }
 
-void* SkCanvas::accessTopLayerPixels(SkImageInfo* info, size_t* rowBytes) {
-    return this->onAccessTopLayerPixels(info, rowBytes);
+void* SkCanvas::accessTopLayerPixels(SkImageInfo* info, size_t* rowBytes, SkIPoint* origin) {
+    void* pixels = this->onAccessTopLayerPixels(info, rowBytes);
+    if (pixels && origin) {
+        *origin = this->getTopDevice(false)->getOrigin();
+    }
+    return pixels;
 }
 
 void* SkCanvas::onAccessTopLayerPixels(SkImageInfo* info, size_t* rowBytes) {
     SkBaseDevice* dev = this->getTopDevice();
     return dev ? dev->accessPixels(info, rowBytes) : NULL;
 }
 
 SkAutoROCanvasPixels::SkAutoROCanvasPixels(SkCanvas* canvas) {
     fAddr = canvas->peekPixels(&fInfo, &fRowBytes);
     if (NULL == fAddr) {
@@ skipping 1547 matching lines @@
     if (!bitmap.installPixels(info, pixels, rowBytes)) {
         return NULL;
     }
 
     // should this functionality be moved into allocPixels()?
     if (!bitmap.info().isOpaque()) {
         bitmap.eraseColor(0);
     }
     return SkNEW_ARGS(SkCanvas, (bitmap));
 }