Simplify linkages to Android framework internals

dm/DMSrcSinkAndroid.cpp

Index: dm/DMSrcSinkAndroid.cpp
diff --git a/dm/DMSrcSinkAndroid.cpp b/dm/DMSrcSinkAndroid.cpp
index 63c9d82848ce8db1eedf29959cf5ee10f6cfe7ed..835a965913efd38e6c2386c896dd34e174167c1f 100644
--- a/dm/DMSrcSinkAndroid.cpp
+++ b/dm/DMSrcSinkAndroid.cpp
@@ -10,24 +10,25 @@
 
 #include "SkAndroidSDKCanvas.h"
 #include "SkCanvas.h"
-#include "SkHwuiRenderer.h"
 #include "SkiaCanvasProxy.h"
 #include "SkStream.h"
+#include <utils/TestWindowContext.h>
 
 /* These functions are only compiled in the Android Framework. */
 
 namespace DM {
 
 Error HWUISink::draw(const Src& src, SkBitmap* dst, SkWStream*, SkString*) const {
-    SkHwuiRenderer renderer;
-    renderer.initialize(src.size());
+    //SkHwuiRenderer renderer;

[djsollen, 2015/10/26 13:28:15]

remove this line.

[tomhudson, 2015/10/26 14:00:55]

Done.

+    android::uirenderer::TestWindowContext renderer;
+    renderer.initialize(src.size().width(), src.size().height());
     SkCanvas* canvas = renderer.prepareToDraw();
     Error err = src.draw(canvas);
     if (!err.isEmpty()) {
         return err;
     }
     renderer.finishDrawing();
-    renderer.proxy->fence();
+    renderer.fence();
     renderer.capturePixels(dst);
     return "";
 }