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

MakePathAbsolute -> NormalizePath

Browse source
This commit is contained in:
Kevin Sawicki 2016-03-07 14:21:24 -08:00
parent 97930fcd84
commit 0dba0b9cad
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -120,7 +120,7 @@ bool PopulateImageSkiaRepsFromPath(gfx::ImageSkia* image,
return succeed; return succeed;
} }
base::FilePath MakePathAbsolute(const base::FilePath& path) { base::FilePath NormalizePath(const base::FilePath& path) {
if (!path.ReferencesParent()) { if (!path.ReferencesParent()) {
return path; return path;
} }
@ -269,7 +269,7 @@ mate::Handle<NativeImage> NativeImage::CreateFromJPEG(
mate::Handle<NativeImage> NativeImage::CreateFromPath( mate::Handle<NativeImage> NativeImage::CreateFromPath(
v8::Isolate* isolate, const base::FilePath& path) { v8::Isolate* isolate, const base::FilePath& path) {
gfx::ImageSkia image_skia; gfx::ImageSkia image_skia;
base::FilePath absolute_path = MakePathAbsolute(path); base::FilePath absolute_path = NormalizePath(path);
if (absolute_path.MatchesExtension(FILE_PATH_LITERAL(".ico"))) { if (absolute_path.MatchesExtension(FILE_PATH_LITERAL(".ico"))) {
#if defined(OS_WIN) #if defined(OS_WIN)