summaryrefslogtreecommitdiff
path: root/chromium/v8/samples
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-05-03 13:42:47 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-05-15 10:27:51 +0000
commit8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec (patch)
treed29d987c4d7b173cf853279b79a51598f104b403 /chromium/v8/samples
parent830c9e163d31a9180fadca926b3e1d7dfffb5021 (diff)
downloadqtwebengine-chromium-8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec.tar.gz
BASELINE: Update Chromium to 66.0.3359.156
Change-Id: I0c9831ad39911a086b6377b16f995ad75a51e441 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/v8/samples')
-rw-r--r--chromium/v8/samples/process.cc9
-rw-r--r--chromium/v8/samples/samples.gyp84
2 files changed, 4 insertions, 89 deletions
diff --git a/chromium/v8/samples/process.cc b/chromium/v8/samples/process.cc
index f22407a837d..9af1c0b23b7 100644
--- a/chromium/v8/samples/process.cc
+++ b/chromium/v8/samples/process.cc
@@ -650,10 +650,10 @@ MaybeLocal<String> ReadFile(Isolate* isolate, const string& name) {
size_t size = ftell(file);
rewind(file);
- char* chars = new char[size + 1];
- chars[size] = '\0';
+ std::unique_ptr<char> chars(new char[size + 1]);
+ chars.get()[size] = '\0';
for (size_t i = 0; i < size;) {
- i += fread(&chars[i], 1, size - i, file);
+ i += fread(&chars.get()[i], 1, size - i, file);
if (ferror(file)) {
fclose(file);
return MaybeLocal<String>();
@@ -661,8 +661,7 @@ MaybeLocal<String> ReadFile(Isolate* isolate, const string& name) {
}
fclose(file);
MaybeLocal<String> result = String::NewFromUtf8(
- isolate, chars, NewStringType::kNormal, static_cast<int>(size));
- delete[] chars;
+ isolate, chars.get(), NewStringType::kNormal, static_cast<int>(size));
return result;
}
diff --git a/chromium/v8/samples/samples.gyp b/chromium/v8/samples/samples.gyp
deleted file mode 100644
index e7c26cf2629..00000000000
--- a/chromium/v8/samples/samples.gyp
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 2012 the V8 project authors. All rights reserved.
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * 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.
-# * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "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 THE COPYRIGHT
-# OWNER 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.
-
-{
- 'variables': {
- 'v8_code': 1,
- 'v8_enable_i18n_support%': 1,
- 'v8_toolset_for_shell%': 'target',
- },
- 'includes': ['../gypfiles/toolchain.gypi', '../gypfiles/features.gypi'],
- 'target_defaults': {
- 'type': 'executable',
- 'dependencies': [
- '../src/v8.gyp:v8',
- '../src/v8.gyp:v8_libbase',
- '../src/v8.gyp:v8_libplatform',
- ],
- 'include_dirs': [
- '..',
- ],
- 'conditions': [
- ['v8_enable_i18n_support==1', {
- 'dependencies': [
- '<(icu_gyp_path):icui18n',
- '<(icu_gyp_path):icuuc',
- ],
- }],
- ['OS=="win" and v8_enable_i18n_support==1', {
- 'dependencies': [
- '<(icu_gyp_path):icudata',
- ],
- }],
- ],
- },
- 'targets': [
- {
- 'target_name': 'v8_shell',
- 'sources': [
- 'shell.cc',
- ],
- 'conditions': [
- [ 'want_separate_host_toolset==1', {
- 'toolsets': [ '<(v8_toolset_for_shell)', ],
- }],
- ],
- },
- {
- 'target_name': 'hello-world',
- 'sources': [
- 'hello-world.cc',
- ],
- },
- {
- 'target_name': 'process',
- 'sources': [
- 'process.cc',
- ],
- },
- ],
-}