Revert "pass surface to device-manager"

This reverts commit 7b215bcad3034aca262ca4eeebe31b5e8868638b.

Reason for revert: SampleApp on Linux doesn't ever draw anything.

Original change's description:
> pass surface to device-manager
> 
> Bug: skia:3216
> Change-Id: I8e00e9eca3763593a4071c16a3ab04c46bf83a3e
> Reviewed-on: https://skia-review.googlesource.com/26020
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Mike Reed <reed@google.com>

TBR=bsalomon@google.com,reed@google.com

Change-Id: I55f1292ab772bfe8fb1efb74f591b05bbe24d054
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:3216
Reviewed-on: https://skia-review.googlesource.com/26161
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>

1 files changed, 6 insertions, 11 deletions

diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index 102c67a90b..1676fc3b13 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -332,8 +332,8 @@ public:
         return nullptr;
     }
 
-    void publishCanvas(SampleWindow::DeviceType dType, SkSurface* surface,
-                       SampleWindow* win) override {
+    void publishCanvas(SampleWindow::DeviceType dType,
+                       SkCanvas* renderingCanvas, SampleWindow* win) override {
 #if SK_SUPPORT_GPU
         if (!IsGpuDeviceType(dType) ||
             kRGBA_F16_SkColorType == win->info().colorType() ||
@@ -345,7 +345,7 @@ public:
             auto data = SkData::MakeUninitialized(size);
             SkASSERT(data);
 
-            if (!surface->readPixels(info, data->writable_data(), rowBytes, 0, 0)) {
+            if (!renderingCanvas->readPixels(info, data->writable_data(), rowBytes, 0, 0)) {
                 SkDEBUGFAIL("Failed to read canvas pixels");
                 return;
             }
@@ -1091,14 +1091,6 @@ static void drawText(SkCanvas* canvas, SkString str, SkScalar left, SkScalar top
 #include "SkDeferredCanvas.h"
 #include "SkDumpCanvas.h"
 
-void SampleWindow::drawIntoSurface() {
-    auto surf = this->makeSurface();
-
-    this->draw(surf->getCanvas());
-
-    fDevManager->publishCanvas(fDeviceType, surf.get(), this);
-}
-
 void SampleWindow::draw(SkCanvas* canvas) {
     std::unique_ptr<SkThreadedBMPDevice> tDev;
     std::unique_ptr<SkCanvas> tCanvas;
@@ -1172,6 +1164,9 @@ void SampleWindow::draw(SkCanvas* canvas) {
     }
 
     canvas->flush();
+
+    // do this last
+    fDevManager->publishCanvas(fDeviceType, canvas, this);
 }
 
 static float clipW = 200;