remove MPD for now, to simplify things

samplecode/SampleApp.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SampleApp.h"
 
 #include "OverView.h"
@@ skipping 822 matching lines @@
     fDeviceType = kGPU_DeviceType;
 #endif
 #if SK_ANGLE && DEFAULT_TO_ANGLE
     fDeviceType = kANGLE_DeviceType;
 #endif
 #if SK_COMMAND_BUFFER && DEFAULT_TO_COMMAND_BUFFER
     fDeviceType = kCommandBuffer_DeviceType;
 #endif
 
     fUseClip = false;
-    fUseMPD = false;
+    fUsePicture = false;
     fAnimating = false;
     fRotate = false;
     fPerspAnim = false;
     fRequestGrabImage = false;
     fTilingMode = kNo_Tiling;
     fMeasureFPS = false;
     fLCDState = SkOSMenu::kMixedState;
     fAAState = SkOSMenu::kMixedState;
     fSubpixelState = SkOSMenu::kMixedState;
     fHintingState = 0;
@@ skipping 447 matching lines @@
             name.set("unknown_sample");
         }
         name.append(".pdf");
 #ifdef SK_BUILD_FOR_ANDROID
         name.prepend("/sdcard/");
 #endif
         fPDFDocument.reset(SkDocument::CreatePDF(name.c_str()));
         canvas = fPDFDocument->beginPage(this->width(), this->height());
     } else if (fSaveToSKP) {
         canvas = fRecorder.beginRecording(9999, 9999, nullptr, 0);
-    } else if (fUseMPD) {
+    } else if (fUsePicture) {
         canvas = fRecorder.beginRecording(9999, 9999, nullptr, 0);
     } else {
         canvas = this->INHERITED::beforeChildren(canvas);
     }
 
     if (fUseClip) {
         canvas->drawColor(0xFFFF88FF);
         canvas->clipPath(fClipPath, SkRegion::kIntersect_Op, true);
     }
 
@@ skipping 41 matching lines @@
 
     if (fSaveToSKP) {
         SkAutoTUnref<const SkPicture> picture(fRecorder.endRecording());
         SkFILEWStream stream("sample_app.skp");
         picture->serialize(&stream);
         fSaveToSKP = false;
         this->inval(nullptr);
         return;
     }
 
-    if (fUseMPD) {
+    if (fUsePicture) {
         SkAutoTUnref<const SkPicture> picture(fRecorder.endRecording());
 
+        // serialize/deserialize?
         if (false) {
             SkDynamicMemoryWStream wstream;
             picture->serialize(&wstream);
 
             SkAutoTDelete<SkStream> rstream(wstream.detachAsStream());
             picture.reset(SkPicture::CreateFromStream(rstream));
         }
-
-        if (true) {
-            if (true) {
-                SkImageInfo info;
-                size_t rowBytes;
-                void* addr = orig->accessTopLayerPixels(&info, &rowBytes);
-                if (addr) {
-                    SkSurface* surfs[4];
-                    SkMultiPictureDraw md;
-
-                    SkImageInfo n = SkImageInfo::Make(info.width()/2, info.height()/2,
-                                                      info.colorType(), info.alphaType());
-                    int index = 0;
-                    for (int y = 0; y < 2; ++y) {
-                        for (int x = 0; x < 2; ++x) {
-                            char* p = (char*)addr;
-                            p += y * n.height() * rowBytes;
-                            p += x * n.width() * sizeof(SkPMColor);
-                            surfs[index] = SkSurface::NewRasterDirect(n, p, rowBytes);
-                            SkCanvas* c = surfs[index]->getCanvas();
-                            c->translate(SkIntToScalar(-x * n.width()),
-                                         SkIntToScalar(-y * n.height()));
-                            c->concat(orig->getTotalMatrix());
-                            md.add(c, picture, nullptr, nullptr);
-                            index++;
-                        }
-                    }
-                    md.draw();
-                    for (int i = 0; i < 4; ++i) {
-                        surfs[i]->unref();
-                    }
-                }
-            } else {
-                orig->drawPicture(picture);
-            }
-        } else if (true) {
-            SkDynamicMemoryWStream ostream;
-            picture->serialize(&ostream);
-
-            SkAutoDataUnref data(ostream.copyToData());
-            SkMemoryStream istream(data->data(), data->size());
-            SkAutoTUnref<SkPicture> pict(SkPicture::CreateFromStream(&istream));
-            if (pict.get() != nullptr) {
-                orig->drawPicture(pict.get());
-            }
-        } else {
-            picture->playback(orig);
-        }
+        orig->drawPicture(picture);
     }
 
     // Do this after presentGL and other finishing, rather than in afterChild
     if (fMeasureFPS) {
         orig->flush();
         fTimer.end();
         fMeasureFPS_Time += fTimer.fWall;
     }
 }
 
@@ skipping 324 matching lines @@
         case 'k':
             fPerspAnim = !fPerspAnim;
             this->inval(nullptr);
             this->updateTitle();
             return true;
         case 'K':
             fSaveToSKP = true;
             this->inval(nullptr);
             return true;
         case 'M':
-            fUseMPD = !fUseMPD;
+            fUsePicture = !fUsePicture;
             this->inval(nullptr);
             this->updateTitle();
             return true;
 #if SK_SUPPORT_GPU
         case 'p':
             {
                 GrContext* grContext = this->getGrContext();
                 if (grContext) {
                     size_t cacheBytes;
                     grContext->getResourceCacheUsage(nullptr, &cacheBytes);
@@ skipping 250 matching lines @@
     }
     if (fRotate) {
         title.prepend("<R> ");
     }
     if (fPerspAnim) {
         title.prepend("<K> ");
     }
     if (this->getSurfaceProps().flags() & SkSurfaceProps::kUseDeviceIndependentFonts_Flag) {
         title.prepend("<DIF> ");
     }
-    if (fUseMPD) {
-        title.prepend("<MPD> ");
+    if (fUsePicture) {
+        title.prepend("<P> ");
     }
 
     title.prepend(trystate_str(fLCDState, "LCD ", "lcd "));
     title.prepend(trystate_str(fAAState, "AA ", "aa "));
     title.prepend(gFilterQualityStates[fFilterQualityIndex].fLabel);
     title.prepend(trystate_str(fSubpixelState, "S ", "s "));
     title.prepend(fFlipAxis & kFlipAxis_X ? "X " : nullptr);
     title.prepend(fFlipAxis & kFlipAxis_Y ? "Y " : nullptr);
     title.prepend(gHintingStates[fHintingState].label);
 
@@ skipping 250 matching lines @@
 #ifdef SK_BUILD_FOR_MAC
     setenv("ANDROID_ROOT", "/android/device/data", 0);
 #endif
     SkGraphics::Init();
     SkEvent::Init();
 }
 
 void application_term() {
     SkEvent::Term();
 }