Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024

skia/ext/skia_utils_base.cc

Index: skia/ext/skia_utils_base.cc
diff --git a/skia/ext/skia_utils_base.cc b/skia/ext/skia_utils_base.cc
deleted file mode 100644
index 6643b499d1bbea41ee554fec82b1c7b75b42b655..0000000000000000000000000000000000000000
--- a/skia/ext/skia_utils_base.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "skia/ext/skia_utils_base.h"
-
-namespace skia {
-
-bool ReadSkString(base::PickleIterator* iter, SkString* str) {
-  int reply_length;
-  const char* reply_text;
-
-  if (!iter->ReadData(&reply_text, &reply_length))
-    return false;
-
-  if (str)
-    str->set(reply_text, reply_length);
-  return true;
-}
-
-bool ReadSkFontIdentity(base::PickleIterator* iter,
-                        SkFontConfigInterface::FontIdentity* identity) {
-  uint32_t reply_id;
-  uint32_t reply_ttcIndex;
-  int reply_length;
-  const char* reply_text;
-
-  if (!iter->ReadUInt32(&reply_id) ||
-      !iter->ReadUInt32(&reply_ttcIndex) ||
-      !iter->ReadData(&reply_text, &reply_length))
-    return false;
-
-  if (identity) {
-    identity->fID = reply_id;
-    identity->fTTCIndex = reply_ttcIndex;
-    identity->fString.set(reply_text, reply_length);
-  }
-  return true;
-}
-
-bool WriteSkString(base::Pickle* pickle, const SkString& str) {
-  return pickle->WriteData(str.c_str(), str.size());
-}
-
-bool WriteSkFontIdentity(base::Pickle* pickle,
-                         const SkFontConfigInterface::FontIdentity& identity) {
-  return pickle->WriteUInt32(identity.fID) &&
-         pickle->WriteUInt32(identity.fTTCIndex) &&
-         WriteSkString(pickle, identity.fString);
-}
-
-}  // namespace skia
-