commit 97be88f58a82b8e6ad7ef60a072cd8407d6423ce
author Herb Derby <herb@google.com> Wed Mar 21 16:23:49 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Mar 26 21:28:04 2018 +0000
tree 89d5c94f0afef2662c870b57af7c9cf12491ac53
parent f9e12df94f7f4eacb1072415909b9c92be293130

Move cache difference code into remote cache files

BUG=skia:7515

Change-Id: I59e75d460b4ed4d0a737c833520b2335808a4ce4
Reviewed-on: https://skia-review.googlesource.com/115706
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Herb Derby <herb@google.com>

src/core/SkTypeface_remote.cpp

diff --git a/src/core/SkTypeface_remote.cpp b/src/core/SkTypeface_remote.cpp
index 504d241..6fc6aa4 100644
--- a/src/core/SkTypeface_remote.cpp
+++ b/src/core/SkTypeface_remote.cpp
@@ -5,33 +5,46 @@
  * found in the LICENSE file.
  */
 
-#include "SkPaint.h"
-
-#include "SkSemaphore.h"
 #include "SkTypeface_remote.h"
-#include <iostream>
+
+#include "SkPaint.h"
+#include "SkRemoteGlyphCache.h"
 
 SkScalerContextProxy::SkScalerContextProxy(
         sk_sp<SkTypeface> tf,
         const SkScalerContextEffects& effects,
         const SkDescriptor* desc,
-        SkRemoteScalerContext* rsc)
+        SkStrikeClient* rsc)
     : SkScalerContext{std::move(tf), effects, desc}
-    , fRemote{rsc} {}
+    , fClient{rsc} {}
+
+unsigned SkScalerContextProxy::generateGlyphCount()  {
+    SK_ABORT("Should never be called.");
+    return 0;
+}
+
+uint16_t SkScalerContextProxy::generateCharToGlyph(SkUnichar) {
+    SK_ABORT("Should never be called.");
+    return 0;
+}
+
+void  SkScalerContextProxy::generateAdvance(SkGlyph* glyph) {
+    this->generateMetrics(glyph);
+}
 
 void SkScalerContextProxy::generateMetrics(SkGlyph* glyph) {
-    fRemote->generateMetricsAndImage(*this->typefaceProxy(), this->getRec(), &fAlloc, glyph);
+    fClient->generateMetricsAndImage(*this->typefaceProxy(), this->getRec(), &fAlloc, glyph);
 }
 
 void SkScalerContextProxy::generateImage(const SkGlyph& glyph) {
 }
 
 void SkScalerContextProxy::generatePath(SkGlyphID glyphID, SkPath* path) {
-    fRemote->generatePath(*this->typefaceProxy(), this->getRec(), glyphID, path);
+    fClient->generatePath(*this->typefaceProxy(), this->getRec(), glyphID, path);
 }
 
 void SkScalerContextProxy::generateFontMetrics(SkPaint::FontMetrics* metrics) {
-    fRemote->generateFontMetrics(*this->typefaceProxy(), this->getRec(), metrics);
+    fClient->generateFontMetrics(*this->typefaceProxy(), this->getRec(), metrics);
 }
 
 SkTypefaceProxy* SkScalerContextProxy::typefaceProxy() {