Revert of Add OpenGL context to Viewer.

tools/viewer/sk_app/Window.cpp

 /*
 * Copyright 2016 Google Inc.
 *
 * Use of this source code is governed by a BSD-style license that can be
 * found in the LICENSE file.
 */
 
 #include "Window.h"
 
 #include "SkSurface.h"
@@ skipping 35 matching lines @@
 
 bool Window::onKey(Key key, InputState state, uint32_t modifiers) {
     return fKeyFunc(key, state, modifiers, fKeyUserData);
 }
 
 bool Window::onMouse(int x, int y, InputState state, uint32_t modifiers) {
     return fMouseFunc(x, y, state, modifiers, fMouseUserData);
 }
 
 void Window::onPaint() {
-    sk_sp<SkSurface> backbuffer = fWindowContext->getBackbufferSurface();
+    SkSurface* backbuffer = fWindowContext->getBackbufferSurface();
     if (backbuffer) {
         // draw into the canvas of this surface
         SkCanvas* canvas = backbuffer->getCanvas();
 
         fPaintFunc(canvas, fPaintUserData);
 
         canvas->flush();
 
         fWindowContext->swapBuffers();
     } else {
         // try recreating testcontext
     }
+
 }
 
 void Window::onResize(uint32_t w, uint32_t h) {
     fWidth = w;
     fHeight = h;
     fWindowContext->resize(w, h);
 }
 
 const DisplayParams& Window::getDisplayParams() {
     return fWindowContext->getDisplayParams();
 }
 
 void Window::setDisplayParams(const DisplayParams& params) {
     fWindowContext->setDisplayParams(params);
 }
 
 }   // namespace sk_app