support direct writing to top layer

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 1044 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 const_cast<void*>(this->onPeekPixels(info, rowBytes));

[bsalomon, 2014/03/12 14:43:11]

onAccessTopLayerPixels()

[reed1, 2014/03/12 15:31:59]

Done.

+}
+
+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) {
         fInfo = canvas->imageInfo();
         if (kUnknown_SkColorType == fInfo.colorType() ||
             !fBitmap.allocPixels(fInfo))
         {
             return; // failure, fAddr is NULL
         }
         fBitmap.lockPixels();
@@ skipping 653 matching lines @@
 void SkCanvas::internal_private_getTotalClipAsPath(SkPath* path) const {
     path->reset();
 
     const SkRegion& rgn = fMCRec->fRasterClip->forceGetBW();
     if (rgn.isEmpty()) {
         return;
     }
     (void)rgn.getBoundaryPath(path);
 }
 
+GrRenderTarget* SkCanvas::internal_private_accessTopLayerRenderTarget() {
+    SkBaseDevice* dev = this->getTopDevice();
+    return dev ? dev->accessRenderTarget() : NULL;
+}
+
 SkBaseDevice* SkCanvas::createLayerDevice(const SkImageInfo& info) {
     SkBaseDevice* device = this->getTopDevice();
     return device ? device->createCompatibleDeviceForSaveLayer(info) : NULL;
 }
 
 GrContext* SkCanvas::getGrContext() {
 #if SK_SUPPORT_GPU
     SkBaseDevice* device = this->getTopDevice();
     if (NULL != device) {
         GrRenderTarget* renderTarget = device->accessRenderTarget();
@@ skipping 737 matching lines @@
     if (!bitmap.allocPixels(info)) {
         return NULL;
     }
 
     // should this functionality be moved into allocPixels()?
     if (!bitmap.info().isOpaque()) {
         bitmap.eraseColor(0);
     }
     return SkNEW_ARGS(SkCanvas, (bitmap));
 }