Tell V8 about the extra memory being held by FileReader objects.

BUG=114548

Review-Url: https://codereview.chromium.org/2837873007
Cr-Commit-Position: refs/heads/master@{#468550}

third_party/WebKit/Source/core/fileapi/FileReaderLoader.cpp

@@ -50,25 +50,17 @@
 #include "platform/wtf/text/Base64.h"
 #include "platform/wtf/text/StringBuilder.h"
 #include "public/platform/WebURLRequest.h"
+#include "v8/include/v8.h"
 
 namespace blink {
 
 FileReaderLoader::FileReaderLoader(ReadType read_type,
                                    FileReaderLoaderClient* client)
-    : read_type_(read_type),
-      client_(client),
-      is_raw_data_converted_(false),
-      string_result_(""),
-      finished_loading_(false),
-      bytes_loaded_(0),
-      total_bytes_(-1),
-      has_range_(false),
-      range_start_(0),
-      range_end_(0),
-      error_code_(FileError::kOK) {}
+    : read_type_(read_type), client_(client) {}
 
 FileReaderLoader::~FileReaderLoader() {
   Cleanup();
+  UnadjustReportedMemoryUsageToV8();
   if (!url_for_reading_.IsEmpty()) {
     BlobRegistry::RevokePublicBlobURL(url_for_reading_);
   }
@@ -143,9 +135,27 @@ void FileReaderLoader::Cleanup() {
     string_result_ = "";
     is_raw_data_converted_ = true;
     decoder_.reset();
+    array_buffer_result_ = nullptr;
+    UnadjustReportedMemoryUsageToV8();
   }
 }
 
+void FileReaderLoader::AdjustReportedMemoryUsageToV8(int64_t usage) {
+  if (!usage)
+    return;
+  memory_usage_reported_to_v8_ += usage;
+  v8::Isolate::GetCurrent()->AdjustAmountOfExternalAllocatedMemory(usage);
+  DCHECK_GE(memory_usage_reported_to_v8_, 0);
+}
+
+void FileReaderLoader::UnadjustReportedMemoryUsageToV8() {
+  if (!memory_usage_reported_to_v8_)
+    return;
+  v8::Isolate::GetCurrent()->AdjustAmountOfExternalAllocatedMemory(
+      -memory_usage_reported_to_v8_);
+  memory_usage_reported_to_v8_ = 0;
+}
+
 void FileReaderLoader::DidReceiveResponse(
     unsigned long,
     const ResourceResponse& response,
@@ -230,6 +240,7 @@ void FileReaderLoader::DidReceiveData(const char* data, unsigned data_length) {
   }
   bytes_loaded_ += bytes_appended;
   is_raw_data_converted_ = false;
+  AdjustReportedMemoryUsageToV8(bytes_appended);
 
   if (client_)
     client_->DidReceiveData();
@@ -285,17 +296,18 @@ FileError::ErrorCode FileReaderLoader::HttpStatusCodeToErrorCode(
 
 DOMArrayBuffer* FileReaderLoader::ArrayBufferResult() {
   DCHECK_EQ(read_type_, kReadAsArrayBuffer);
+  if (array_buffer_result_)
+    return array_buffer_result_;
 
   // If the loading is not started or an error occurs, return an empty result.
   if (!raw_data_ || error_code_)
     return nullptr;
 
-  if (array_buffer_result_)
-    return array_buffer_result_;
-
   DOMArrayBuffer* result = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer());
   if (finished_loading_) {
     array_buffer_result_ = result;
+    AdjustReportedMemoryUsageToV8(-1 * raw_data_->ByteLength());
+    raw_data_.reset();
   }
   return result;
 }
@@ -304,44 +316,46 @@ String FileReaderLoader::StringResult() {
   DCHECK_NE(read_type_, kReadAsArrayBuffer);
   DCHECK_NE(read_type_, kReadByClient);
 
-  // If the loading is not started or an error occurs, return an empty result.
-  if (!raw_data_ || error_code_)
-    return string_result_;
-
-  // If already converted from the raw data, return the result now.
-  if (is_raw_data_converted_)
+  if (!raw_data_ || error_code_ || is_raw_data_converted_)
     return string_result_;
 
   switch (read_type_) {
     case kReadAsArrayBuffer:
       // No conversion is needed.
-      break;
+      return string_result_;
     case kReadAsBinaryString:
-      string_result_ = raw_data_->ToString();
-      is_raw_data_converted_ = true;
+      SetStringResult(raw_data_->ToString());
       break;
     case kReadAsText:
-      ConvertToText();
+      SetStringResult(ConvertToText());
       break;
     case kReadAsDataURL:
       // Partial data is not supported when reading as data URL.
       if (finished_loading_)
-        ConvertToDataURL();
+        SetStringResult(ConvertToDataURL());
       break;
     default:
       NOTREACHED();
   }
 
+  if (finished_loading_) {
+    DCHECK(is_raw_data_converted_);
+    AdjustReportedMemoryUsageToV8(-1 * raw_data_->ByteLength());
+    raw_data_.reset();
+  }
   return string_result_;
 }
 
-void FileReaderLoader::ConvertToText() {
+void FileReaderLoader::SetStringResult(const String& result) {
+  AdjustReportedMemoryUsageToV8(-1 * string_result_.CharactersSizeInBytes());
   is_raw_data_converted_ = true;
+  string_result_ = result;
+  AdjustReportedMemoryUsageToV8(string_result_.CharactersSizeInBytes());
+}
 
-  if (!bytes_loaded_) {
-    string_result_ = "";
-    return;
-  }
+String FileReaderLoader::ConvertToText() {
+  if (!bytes_loaded_)
+    return "";
 
   // Decode the data.
   // The File API spec says that we should use the supplied encoding if it is
@@ -359,19 +373,15 @@ void FileReaderLoader::ConvertToText() {
   if (finished_loading_)
     builder.Append(decoder_->Flush());
 
-  string_result_ = builder.ToString();
+  return builder.ToString();
 }
 
-void FileReaderLoader::ConvertToDataURL() {
-  is_raw_data_converted_ = true;
-
+String FileReaderLoader::ConvertToDataURL() {
   StringBuilder builder;
   builder.Append("data:");
 
-  if (!bytes_loaded_) {
-    string_result_ = builder.ToString();
-    return;
-  }
+  if (!bytes_loaded_)
+    return builder.ToString();
 
   builder.Append(data_type_);
   builder.Append(";base64,");
@@ -382,7 +392,7 @@ void FileReaderLoader::ConvertToDataURL() {
   out.push_back('\0');
   builder.Append(out.data());
 
-  string_result_ = builder.ToString();
+  return builder.ToString();
 }
 
 void FileReaderLoader::SetEncoding(const String& encoding) {

third_party/WebKit/Source/core/fileapi/FileReaderLoader.h

@@ -112,10 +112,13 @@ class CORE_EXPORT FileReaderLoader final : public ThreadableLoaderClient {
   FileReaderLoader(ReadType, FileReaderLoaderClient*);
 
   void Cleanup();
+  void AdjustReportedMemoryUsageToV8(int64_t usage);
+  void UnadjustReportedMemoryUsageToV8();
 
   void Failed(FileError::ErrorCode);
-  void ConvertToText();
-  void ConvertToDataURL();
+  String ConvertToText();
+  String ConvertToDataURL();
+  void SetStringResult(const String&);
 
   static FileError::ErrorCode HttpStatusCodeToErrorCode(int);
 
@@ -128,7 +131,7 @@ class CORE_EXPORT FileReaderLoader final : public ThreadableLoaderClient {
   Persistent<ThreadableLoader> loader_;
 
   std::unique_ptr<ArrayBufferBuilder> raw_data_;
-  bool is_raw_data_converted_;
+  bool is_raw_data_converted_ = false;
 
   Persistent<DOMArrayBuffer> array_buffer_result_;
   String string_result_;
@@ -136,20 +139,20 @@ class CORE_EXPORT FileReaderLoader final : public ThreadableLoaderClient {
   // The decoder used to decode the text data.
   std::unique_ptr<TextResourceDecoder> decoder_;
 
-  bool finished_loading_;
-  long long bytes_loaded_;
+  bool finished_loading_ = false;
+  long long bytes_loaded_ = 0;
   // If the total size of the resource is unknown, m_totalBytes is set to -1
   // until completion of loading, and the buffer for receiving data is set to
   // dynamically grow. Otherwise, m_totalBytes is set to the total size and
   // the buffer for receiving data of m_totalBytes is allocated and never grow
   // even when extra data is appeneded.
-  long long total_bytes_;
+  long long total_bytes_ = -1;
+  int64_t memory_usage_reported_to_v8_ = 0;
+  bool has_range_ = false;
+  unsigned range_start_ = 0;
+  unsigned range_end_ = 0;
 
-  bool has_range_;
-  unsigned range_start_;
-  unsigned range_end_;
-
-  FileError::ErrorCode error_code_;
+  FileError::ErrorCode error_code_ = FileError::kOK;
 };
 
 }  // namespace blink