mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Upgrade to Node v6

Browse source
This commit is contained in:
Cheng Zhao 2016-05-10 11:05:42 +09:00
parent 9c0f298064
commit 73223fe5c3
4 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/common/api/atom_api_native_image.cc
View file

@ -63,7 +63,7 @@ float GetScaleFactorFromPath(const base::FilePath& path) {
// We don't try to convert string to float here because it is very very // We don't try to convert string to float here because it is very very
// expensive. // expensive.
for (unsigned i = 0; i < arraysize(kScaleFactorPairs); ++i) { for (unsigned i = 0; i < node::arraysize(kScaleFactorPairs); ++i) {
if (base::EndsWith(filename, kScaleFactorPairs[i].name, if (base::EndsWith(filename, kScaleFactorPairs[i].name,
base::CompareCase::INSENSITIVE_ASCII)) base::CompareCase::INSENSITIVE_ASCII))
return kScaleFactorPairs[i].scale; return kScaleFactorPairs[i].scale;

1
atom/common/node_includes.h
View file

@ -21,6 +21,7 @@
#undef CHECK_LT #undef CHECK_LT
#undef DISALLOW_COPY_AND_ASSIGN #undef DISALLOW_COPY_AND_ASSIGN
#undef NO_RETURN #undef NO_RETURN
#undef arraysize
#undef debug_string // This is defined in OS X 10.9 SDK in AssertMacros.h. #undef debug_string // This is defined in OS X 10.9 SDK in AssertMacros.h.
#include "vendor/node/src/env.h" #include "vendor/node/src/env.h"
#include "vendor/node/src/env-inl.h" #include "vendor/node/src/env-inl.h"

2
atom/renderer/node_array_buffer_bridge.cc
View file

@ -53,7 +53,7 @@ v8::Local<v8::Uint8Array> BlinkUint8ArrayNew(
ab, mate::ConvertToV8(isolate, offset), mate::ConvertToV8(isolate, size) ab, mate::ConvertToV8(isolate, offset), mate::ConvertToV8(isolate, size)
}; };
return v8::Local<v8::Uint8Array>::Cast(constructor->NewInstance( return v8::Local<v8::Uint8Array>::Cast(constructor->NewInstance(
context, arraysize(args), args).ToLocalChecked()); context, node::arraysize(args), args).ToLocalChecked());
} }
} // namespace } // namespace

2
vendor/node vendored

@ -1 +1 @@
Subproject commit 6bcd8af891a991f8aa196e49e6bf908ebbe24cae Subproject commit 7d119e77b9fe893d6e791c88c9e6122957e088ca