WTF: Remove WTF::PrintStream.

It is only used to printf to a FILE*, which <cstdio> already does.

Change-Id: I05965cafca27d918858716ed624358a506119b96
Reviewed-on: https://chromium-review.googlesource.com/965383Reviewed-by: Yuta Kitamura <yutak@chromium.org>
Commit-Queue: Jeremy Roman <jbroman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543694}

third_party/WebKit/Source/platform/wtf/BUILD.gn

@@ -73,8 +73,6 @@ jumbo_component("wtf") {
     "DoublyLinkedList.h",
     "DynamicAnnotations.cpp",
     "DynamicAnnotations.h",
-    "FilePrintStream.cpp",
-    "FilePrintStream.h",
     "Forward.h",
     "Functional.h",
     "GetPtr.h",
@@ -96,8 +94,6 @@ jumbo_component("wtf") {
     "Noncopyable.h",
     "NotFound.h",
     "Optional.h",
-    "PrintStream.cpp",
-    "PrintStream.h",
     "ProcessMetrics.h",
     "RefCounted.h",
     "RefVector.h",

third_party/WebKit/Source/platform/wtf/BitVector.cpp

@@ -26,7 +26,6 @@
 #include "platform/wtf/BitVector.h"
 
 #include "platform/wtf/LeakAnnotations.h"
-#include "platform/wtf/PrintStream.h"
 #include "platform/wtf/allocator/Partitions.h"
 #include <algorithm>
 #include <string.h>
@@ -112,13 +111,4 @@ void BitVector::ResizeOutOfLine(size_t num_bits) {
   bits_or_pointer_ = BitwiseCast<uintptr_t>(new_out_of_line_bits) >> 1;
 }
 
-void BitVector::Dump(PrintStream& out) {
-  for (size_t i = 0; i < size(); ++i) {
-    if (Get(i))
-      out.Printf("1");
-    else
-      out.Printf("-");
-  }
-}
-
 }  // namespace WTF

third_party/WebKit/Source/platform/wtf/BitVector.h

@@ -33,8 +33,6 @@
 
 namespace WTF {
 
-class PrintStream;
-
 // This is a space-efficient, resizeable bitvector class. In the common case it
 // occupies one word, but if necessary, it will inflate this one word to point
 // to a single chunk of out-of-line allocated storage to store an arbitrary
@@ -156,8 +154,6 @@ class WTF_EXPORT BitVector {
       Clear(bit);
   }
 
-  void Dump(PrintStream& out);
-
  private:
   static unsigned BitsInPointer() { return sizeof(void*) << 3; }
 

third_party/WebKit/Source/platform/wtf/DataLog.cpp

@@ -25,13 +25,11 @@
 
 #include "platform/wtf/DataLog.h"
 
+#include <cstdarg>
+#include <cstdio>
+#include <cstdlib>
 #include "build/build_config.h"
 
-#if defined(OS_POSIX)
-#include <pthread.h>
-#include <unistd.h>
-#endif
-
 #define DATA_LOG_TO_FILE 0
 
 // Uncomment to force logging to the given file regardless of what the
@@ -44,61 +42,42 @@
 
 namespace WTF {
 
-#if defined(OS_POSIX)
-static pthread_once_t g_initialize_log_file_once_key = PTHREAD_ONCE_INIT;
-#endif
-
-static FilePrintStream* g_file;
-
-static void InitializeLogFileOnce() {
+static FILE* OpenLogFile() {
+  FILE* file = nullptr;
 #if DATA_LOG_TO_FILE
 #ifdef DATA_LOG_FILENAME
   const char* filename = DATA_LOG_FILENAME;
 #else
   const char* filename = getenv("WTF_DATA_LOG_FILENAME");
 #endif
-  char actualFilename[1024];
+  char actual_filename[1024];
 
-  snprintf(actualFilename, sizeof(actualFilename), "%s.%d.txt", filename,
+  snprintf(actual_filename, sizeof(actual_filename), "%s.%d.txt", filename,
            getpid());
 
   if (filename) {
-    file = FilePrintStream::open(actualFilename, "w").release();
-    if (!file)
+    file = fopen(actual_filename, "w");
+    if (!file) {
       fprintf(stderr, "Warning: Could not open log file %s for writing.\n",
-              actualFilename);
+              actual_filename);
+    }
   }
 #endif  // DATA_LOG_TO_FILE
-  if (!g_file)
-    g_file = new FilePrintStream(stderr, FilePrintStream::kBorrow);
+  if (!file)
+    file = stderr;
 
   // Prefer unbuffered output, so that we get a full log upon crash or
   // deadlock.
-  setvbuf(g_file->File(), nullptr, _IONBF, 0);
-}
-
-static void InitializeLogFile() {
-#if defined(OS_POSIX)
-  pthread_once(&g_initialize_log_file_once_key, InitializeLogFileOnce);
-#else
-  if (!g_file)
-    InitializeLogFileOnce();
-#endif
-}
-
-FilePrintStream& DataFile() {
-  InitializeLogFile();
-  return *g_file;
-}
+  setvbuf(file, nullptr, _IONBF, 0);
 
-void DataLogFV(const char* format, va_list arg_list) {
-  DataFile().Vprintf(format, arg_list);
+  return file;
 }
 
 void DataLogF(const char* format, ...) {
+  static FILE* file = OpenLogFile();
   va_list arg_list;
   va_start(arg_list, format);
-  DataLogFV(format, arg_list);
+  vfprintf(file, format, arg_list);
   va_end(arg_list);
 }
 

third_party/WebKit/Source/platform/wtf/DataLog.h

@@ -26,29 +26,15 @@
 #ifndef DataLog_h
 #define DataLog_h
 
-#include "platform/wtf/Assertions.h"
-#include "platform/wtf/Compiler.h"
-#include "platform/wtf/FilePrintStream.h"
+#include "base/compiler_specific.h"
 #include "platform/wtf/WTFExport.h"
 
-#include <stdarg.h>
-#include <stdio.h>
-
 namespace WTF {
 
-FilePrintStream& DataFile();
-
-WTF_EXPORT PRINTF_FORMAT(1, 0) void DataLogFV(const char* format, va_list);
 WTF_EXPORT PRINTF_FORMAT(1, 2) void DataLogF(const char* format, ...);
 
-template <typename... T>
-void DataLog(const T&... values) {
-  DataFile().Print(values...);
-}
-
 }  // namespace WTF
 
-using WTF::DataLog;
 using WTF::DataLogF;
 
 #endif  // DataLog_h

third_party/WebKit/Source/platform/wtf/FilePrintStream.cpp

-/*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "platform/wtf/FilePrintStream.h"
-
-#include <memory>
-
-namespace WTF {
-
-FilePrintStream::FilePrintStream(FILE* file, AdoptionMode adoption_mode)
-    : file_(file), adoption_mode_(adoption_mode) {}
-
-FilePrintStream::~FilePrintStream() {
-  if (adoption_mode_ == kBorrow)
-    return;
-  fclose(file_);
-}
-
-std::unique_ptr<FilePrintStream> FilePrintStream::Open(const char* filename,
-                                                       const char* mode) {
-  FILE* file = fopen(filename, mode);
-  if (!file)
-    return std::unique_ptr<FilePrintStream>();
-
-  return std::make_unique<FilePrintStream>(file);
-}
-
-void FilePrintStream::Vprintf(const char* format, va_list arg_list) {
-  vfprintf(file_, format, arg_list);
-}
-
-void FilePrintStream::Flush() {
-  fflush(file_);
-}
-
-}  // namespace WTF

third_party/WebKit/Source/platform/wtf/FilePrintStream.h

-/*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef FilePrintStream_h
-#define FilePrintStream_h
-
-#include "platform/wtf/Compiler.h"
-#include "platform/wtf/PrintStream.h"
-#include <memory>
-#include <stdio.h>
-
-namespace WTF {
-
-class WTF_EXPORT FilePrintStream final : public PrintStream {
- public:
-  enum AdoptionMode { kAdopt, kBorrow };
-
-  FilePrintStream(FILE*, AdoptionMode = kAdopt);
-  ~FilePrintStream() override;
-
-  static std::unique_ptr<FilePrintStream> Open(const char* filename,
-                                               const char* mode);
-
-  FILE* File() { return file_; }
-
-  PRINTF_FORMAT(2, 0) void Vprintf(const char* format, va_list) override;
-  void Flush() override;
-
- private:
-  FILE* file_;
-  AdoptionMode adoption_mode_;
-};
-
-}  // namespace WTF
-
-using WTF::FilePrintStream;
-
-#endif  // FilePrintStream_h

third_party/WebKit/Source/platform/wtf/PrintStream.cpp

-/*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "platform/wtf/PrintStream.h"
-
-#include "platform/wtf/text/CString.h"
-#include "platform/wtf/text/WTFString.h"
-#include <stdio.h>
-
-namespace WTF {
-
-PrintStream::PrintStream() = default;
-PrintStream::~PrintStream() = default;  // Force the vtable to be in this module
-
-void PrintStream::Printf(const char* format, ...) {
-  va_list arg_list;
-  va_start(arg_list, format);
-  Vprintf(format, arg_list);
-  va_end(arg_list);
-}
-
-void PrintStream::Flush() {}
-
-void PrintInternal(PrintStream& out, const char* string) {
-  out.Printf("%s", string);
-}
-
-void PrintInternal(PrintStream& out, const CString& string) {
-  out.Print(string.data());
-}
-
-void PrintInternal(PrintStream& out, const String& string) {
-  out.Print(string.Utf8());
-}
-
-void PrintInternal(PrintStream& out, bool value) {
-  if (value)
-    out.Print("true");
-  else
-    out.Print("false");
-}
-
-void PrintInternal(PrintStream& out, int value) {
-  out.Printf("%d", value);
-}
-
-void PrintInternal(PrintStream& out, unsigned value) {
-  out.Printf("%u", value);
-}
-
-void PrintInternal(PrintStream& out, long value) {
-  out.Printf("%ld", value);
-}
-
-void PrintInternal(PrintStream& out, unsigned long value) {
-  out.Printf("%lu", value);
-}
-
-void PrintInternal(PrintStream& out, long long value) {
-  out.Printf("%lld", value);
-}
-
-void PrintInternal(PrintStream& out, unsigned long long value) {
-  out.Printf("%llu", value);
-}
-
-void PrintInternal(PrintStream& out, float value) {
-  out.Print(static_cast<double>(value));
-}
-
-void PrintInternal(PrintStream& out, double value) {
-  out.Printf("%lf", value);
-}
-
-void DumpCharacter(PrintStream& out, char value) {
-  out.Printf("%c", value);
-}
-
-}  // namespace WTF

third_party/WebKit/Source/platform/wtf/PrintStream.h

-/*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef PrintStream_h
-#define PrintStream_h
-
-#include <stdarg.h>
-#include "base/macros.h"
-#include "platform/wtf/Allocator.h"
-#include "platform/wtf/Compiler.h"
-#include "platform/wtf/StdLibExtras.h"
-#include "platform/wtf/WTFExport.h"
-
-namespace WTF {
-
-class CString;
-class String;
-
-class WTF_EXPORT PrintStream {
-  USING_FAST_MALLOC(PrintStream);
-
- public:
-  PrintStream();
-  virtual ~PrintStream();
-
-  PRINTF_FORMAT(2, 3) void Printf(const char* format, ...);
-  PRINTF_FORMAT(2, 0) virtual void Vprintf(const char* format, va_list) = 0;
-
-  // Typically a no-op for many subclasses of PrintStream, this is a hint that
-  // the implementation should flush its buffers if it had not done so already.
-  virtual void Flush();
-
-  template <typename T>
-  void Print(const T& value) {
-    PrintInternal(*this, value);
-  }
-
-  template <typename T1, typename... RemainingTypes>
-  void Print(const T1& value1, const RemainingTypes&... values) {
-    Print(value1);
-    Print(values...);
-  }
-
-  DISALLOW_COPY_AND_ASSIGN(PrintStream);
-};
-
-WTF_EXPORT void PrintInternal(PrintStream&, const char*);
-WTF_EXPORT void PrintInternal(PrintStream&, const CString&);
-WTF_EXPORT void PrintInternal(PrintStream&, const String&);
-inline void PrintInternal(PrintStream& out, char* value) {
-  PrintInternal(out, static_cast<const char*>(value));
-}
-inline void PrintInternal(PrintStream& out, CString& value) {
-  PrintInternal(out, static_cast<const CString&>(value));
-}
-inline void PrintInternal(PrintStream& out, String& value) {
-  PrintInternal(out, static_cast<const String&>(value));
-}
-WTF_EXPORT void PrintInternal(PrintStream&, bool);
-WTF_EXPORT void PrintInternal(PrintStream&, int);
-WTF_EXPORT void PrintInternal(PrintStream&, unsigned);
-WTF_EXPORT void PrintInternal(PrintStream&, long);
-WTF_EXPORT void PrintInternal(PrintStream&, unsigned long);
-WTF_EXPORT void PrintInternal(PrintStream&, long long);
-WTF_EXPORT void PrintInternal(PrintStream&, unsigned long long);
-WTF_EXPORT void PrintInternal(PrintStream&, float);
-WTF_EXPORT void PrintInternal(PrintStream&, double);
-
-template <typename T>
-void PrintInternal(PrintStream& out, const T& value) {
-  value.Dump(out);
-}
-
-}  // namespace WTF
-
-using WTF::PrintStream;
-
-#endif  // PrintStream_h