SkPDF: SkWStream::write -> SkWStream::writeText

Follow on to https://skia.googlesource.com/skia/+/cbc060a

No change in output.

Change-Id: I3c43cb0207e1e9311a13162f22f7a58d82d239d7
Reviewed-on: https://skia-review.googlesource.com/18075
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@skia.org>

3 files changed, 11 insertions, 17 deletions

diff --git a/src/pdf/SkPDFBitmap.cpp b/src/pdf/SkPDFBitmap.cpp
index 2360953a2a..ca4257adb2 100644
--- a/src/pdf/SkPDFBitmap.cpp
+++ b/src/pdf/SkPDFBitmap.cpp
@@ -30,15 +30,9 @@ bool image_compute_is_opaque(const SkImage* image) {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-static void pdf_stream_begin(SkWStream* stream) {
-    static const char streamBegin[] = " stream\n";
-    stream->write(streamBegin, strlen(streamBegin));
-}
+static const char kStreamBegin[] = " stream\n";
 
-static void pdf_stream_end(SkWStream* stream) {
-    static const char streamEnd[] = "\nendstream";
-    stream->write(streamEnd, strlen(streamEnd));
-}
+static const char kStreamEnd[] = "\nendstream";
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -321,9 +315,9 @@ static void emit_image_xobject(SkWStream* stream,
     pdfDict.insertInt("Length", buffer.bytesWritten());
     pdfDict.emitObject(stream, objNumMap);
 
-    pdf_stream_begin(stream);
+    stream->writeText(kStreamBegin);
     buffer.writeToAndReset(stream);
-    pdf_stream_end(stream);
+    stream->writeText(kStreamEnd);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -405,9 +399,9 @@ void PDFJpegBitmap::emitObject(SkWStream* stream,
     pdfDict.insertInt("ColorTransform", 0);
     pdfDict.insertInt("Length", SkToInt(fData->size()));
     pdfDict.emitObject(stream, objNumMap);
-    pdf_stream_begin(stream);
+    stream->writeText(kStreamBegin);
     stream->write(fData->data(), fData->size());
-    pdf_stream_end(stream);
+    stream->writeText(kStreamEnd);
 }
 }  // namespace
 
diff --git a/src/pdf/SkPDFDocument.cpp b/src/pdf/SkPDFDocument.cpp
index 9ed335678b..9cac080b76 100644
--- a/src/pdf/SkPDFDocument.cpp
+++ b/src/pdf/SkPDFDocument.cpp
@@ -39,7 +39,7 @@ void SkPDFObjectSerializer::serializeHeader(SkWStream* wStream,
                                             const SkDocument::PDFMetadata& md) {
     fBaseOffset = wStream->bytesWritten();
     static const char kHeader[] = "%PDF-1.4\n%" SKPDF_MAGIC "\n";
-    wStream->write(kHeader, strlen(kHeader));
+    wStream->writeText(kHeader);
     // The PDF spec recommends including a comment with four
     // bytes, all with their high bits set.  "\xD3\xEB\xE9\xE1" is
     // "Skia" with the high bits set.
diff --git a/src/pdf/SkPDFMetadata.cpp b/src/pdf/SkPDFMetadata.cpp
index edef8515de..cbdec777c4 100644
--- a/src/pdf/SkPDFMetadata.cpp
+++ b/src/pdf/SkPDFMetadata.cpp
@@ -76,7 +76,7 @@ SkPDFMetadata::UUID SkPDFMetadata::CreateUUID(
     // format of the data that will be hashed is not important.
     SkMD5 md5;
     const char uuidNamespace[] = "org.skia.pdf\n";
-    md5.write(uuidNamespace, strlen(uuidNamespace));
+    md5.writeText(uuidNamespace);
     double msec = SkTime::GetMSecs();
     md5.write(&msec, sizeof(msec));
     SkTime::DateTime dateTime;
@@ -92,7 +92,7 @@ SkPDFMetadata::UUID SkPDFMetadata::CreateUUID(
     }
 
     for (const auto keyValuePtr : gMetadataKeys) {
-        md5.write(keyValuePtr.key, strlen(keyValuePtr.key));
+        md5.writeText(keyValuePtr.key);
         md5.write("\037", 1);
         const SkString& value = metadata.*(keyValuePtr.valuePtr);
         md5.write(value.c_str(), value.size());
@@ -164,13 +164,13 @@ public:
         dict.insertInt("Length", fXML.size());
         dict.emitObject(stream, omap);
         static const char streamBegin[] = " stream\n";
-        stream->write(streamBegin, strlen(streamBegin));
+        stream->writeText(streamBegin);
         // Do not compress this.  The standard requires that a
         // program that does not understand PDF can grep for
         // "<?xpacket" and extract the entire XML.
         stream->write(fXML.c_str(), fXML.size());
         static const char streamEnd[] = "\nendstream";
-        stream->write(streamEnd, strlen(streamEnd));
+        stream->writeText(streamEnd);
     }
 
 private: