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

Fix memory leak and confirming to style guide

Browse source 
Fixed according to @hokein 's suggestions.
This commit is contained in:
Eran Tiktin 2015-08-20 19:26:20 +03:00
parent 2bc087b5d5
commit f386342a7c
1 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,7 @@
#include "atom/common/native_mate_converters/file_path_converter.h" #include "atom/common/native_mate_converters/file_path_converter.h"
#include "atom/common/native_mate_converters/gfx_converter.h" #include "atom/common/native_mate_converters/gfx_converter.h"
#include "atom/common/native_mate_converters/gurl_converter.h" #include "atom/common/native_mate_converters/gurl_converter.h"
#include "atom/common/node_includes.h"
#include "base/base64.h" #include "base/base64.h"
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
#include "native_mate/dictionary.h" #include "native_mate/dictionary.h"
@ -22,13 +23,13 @@
#include "ui/gfx/geometry/size.h" #include "ui/gfx/geometry/size.h"
#include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia.h"
#include "ui/gfx/image/image_util.h" #include "ui/gfx/image/image_util.h"
#if defined(OS_WIN) #if defined(OS_WIN)
#include "atom/common/asar/archive.h" #include "atom/common/asar/archive.h"
#include "base/win/scoped_gdi_object.h"
#include "ui/gfx/icon_util.h" #include "ui/gfx/icon_util.h"
#endif #endif
#include "atom/common/node_includes.h"
namespace atom { namespace atom {
namespace api { namespace api {
@ -220,41 +221,41 @@ mate::Handle<NativeImage> NativeImage::CreateFromJPEG(
// static // static
mate::Handle<NativeImage> NativeImage::CreateFromPath( mate::Handle<NativeImage> NativeImage::CreateFromPath(
v8::Isolate* isolate, const base::FilePath& file_path) { v8::Isolate* isolate, const base::FilePath& path) {
gfx::ImageSkia image_skia; gfx::ImageSkia image_skia;
base::FilePath path(file_path); base::FilePath image_path(path);
if (path.MatchesExtension(FILE_PATH_LITERAL(".ico"))) { if (image_path.MatchesExtension(FILE_PATH_LITERAL(".ico"))) {
#if defined(OS_WIN) #if defined(OS_WIN)
// If file is in asar archive, we extract it to a temp file so LoadImage can // If file is in asar archive, we extract it to a temp file so LoadImage can
// load it // load it.
base::FilePath asar_path, relative_path; base::FilePath asar_path, relative_path;
if (asar::GetAsarArchivePath(path, &asar_path, &relative_path)) { if (asar::GetAsarArchivePath(image_path, &asar_path, &relative_path)) {
std::shared_ptr<asar::Archive> archive = std::shared_ptr<asar::Archive> archive =
asar::GetOrCreateAsarArchive(asar_path); asar::GetOrCreateAsarArchive(asar_path);
if (archive) { if (archive) {
archive->CopyFileOut(relative_path, &path); archive->CopyFileOut(relative_path, &image_path);
} }
} }
HICON icon = static_cast<HICON>(LoadImage(NULL, // Load the icon from file.
path.value().c_str(), base::win::ScopedHICON icon(
IMAGE_ICON, static_cast<HICON>(
0, LoadImage(NULL, image_path.value().c_str(), IMAGE_ICON, 0, 0,
0, LR_DEFAULTSIZE | LR_LOADFROMFILE)));
LR_DEFAULTSIZE | LR_LOADFROMFILE));
if (icon) { if (icon) {
// Convert the icon from the Windows specific HICON to gfx::ImageSkia.
scoped_ptr<SkBitmap> bitmap(IconUtil::CreateSkBitmapFromHICON(icon)); scoped_ptr<SkBitmap> bitmap(IconUtil::CreateSkBitmapFromHICON(icon));
image_skia = *(new gfx::ImageSkia(gfx::ImageSkiaRep(*bitmap, 1.0f))); image_skia = gfx::ImageSkia(gfx::ImageSkiaRep(*bitmap, 1.0f));
DestroyIcon(icon);
} }
#endif #endif
} else { } else {
PopulateImageSkiaRepsFromPath(&image_skia, path); PopulateImageSkiaRepsFromPath(&image_skia, image_path);
} }
gfx::Image image(image_skia); gfx::Image image(image_skia);
mate::Handle<NativeImage> handle = Create(isolate, image); mate::Handle<NativeImage> handle = Create(isolate, image);
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
if (IsTemplateFilename(path)) if (IsTemplateFilename(image_path))
handle->SetTemplateImage(true); handle->SetTemplateImage(true);
#endif #endif
return handle; return handle;