From 1a2a18b66cdbc68e1af70b6818abd71fb586be53 Mon Sep 17 00:00:00 2001 From: yangguo Date: Mon, 24 Nov 2014 08:14:26 -0800 Subject: [PATCH] Remove v8::StartupData::compressed_size. R=jochen@chromium.org Review URL: https://codereview.chromium.org/739253006 Cr-Commit-Position: refs/heads/master@{#25487} --- include/v8.h | 1 - src/d8.cc | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/include/v8.h b/include/v8.h index 21911b4..ef01a5f 100644 --- a/include/v8.h +++ b/include/v8.h @@ -5161,7 +5161,6 @@ class V8_EXPORT Isolate { class V8_EXPORT StartupData { public: const char* data; - int compressed_size; // TODO(yangguo): remove this. int raw_size; }; diff --git a/src/d8.cc b/src/d8.cc index bf1a74b..e18f2da 100644 --- a/src/d8.cc +++ b/src/d8.cc @@ -1570,7 +1570,6 @@ class StartupDataHandler { v8::StartupData* startup_data, void (*setter_fn)(v8::StartupData*)) { startup_data->data = NULL; - startup_data->compressed_size = 0; startup_data->raw_size = 0; if (!blob_file) @@ -1585,13 +1584,12 @@ class StartupDataHandler { rewind(file); startup_data->data = new char[startup_data->raw_size]; - startup_data->compressed_size = + int read_size = static_cast(fread(const_cast(startup_data->data), 1, startup_data->raw_size, file)); fclose(file); - if (startup_data->raw_size == startup_data->compressed_size) - (*setter_fn)(startup_data); + if (startup_data->raw_size == read_size) (*setter_fn)(startup_data); } v8::StartupData natives_; -- 2.7.4