SkRemote: more refactoring

    - move Client / Server definitions to .cpp
    - rename Client / Server to Canvas / Decoder

No diffs:
https://gold.skia.org/search2?issue=1409113005&unt=true&query=source_type%3Dgm&master=false&include=true

BUG=skia:

Review URL: https://codereview.chromium.org/1409113005

1 files changed, 6 insertions, 7 deletions

diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index 83b89f4d6a..98ab086cd3 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -1162,13 +1162,12 @@ Error ViaPipe::draw(const Src& src, SkBitmap* bitmap, SkWStream* stream, SkStrin
 }
 
 Error ViaRemote::draw(const Src& src, SkBitmap* bitmap, SkWStream* stream, SkString* log) const {
-    return draw_to_canvas(fSink, bitmap, stream, log, src.size(), [&](SkCanvas* canvas) {
-        SkRemote::Server server(canvas);
-        SkAutoTDelete<SkRemote::Encoder> cache(fCache
-            ? SkRemote::Encoder::CreateCachingEncoder(&server)
-            : nullptr);
-        SkRemote::Client client(cache.get() ? cache.get() : &server);
-        return src.draw(&client);
+    return draw_to_canvas(fSink, bitmap, stream, log, src.size(), [&](SkCanvas* target) {
+        SkAutoTDelete<SkRemote::Encoder> decoder(SkRemote::NewDecoder(target));
+        SkAutoTDelete<SkRemote::Encoder>   cache(fCache ? SkRemote::NewCachingEncoder(decoder)
+                                                        : nullptr);
+        SkAutoTDelete<SkCanvas> canvas(SkRemote::NewCanvas(cache ? cache : decoder));
+        return src.draw(canvas);
     });
 }