Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: move gfx::ImageSkia functions to their own util file #19460

Merged
merged 9 commits into from Jul 30, 2019
Merged

refactor: move gfx::ImageSkia functions to their own util file #19460

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9f258f0
initial refactor
erickzhao Jul 25, 2019
ab9e458
fix lint
erickzhao Jul 25, 2019
ff22bce
🚚🚚🚚🚚🚚
erickzhao Jul 25, 2019
1cd648b
change year in copyright?
erickzhao Jul 25, 2019
d60ff8a
lint more
erickzhao Jul 25, 2019
b1790dc
remove bad code
erickzhao Jul 25, 2019
2848d3f
add missing header
erickzhao Jul 25, 2019
ea1a492
fix: add missing ifdef guard
erickzhao Jul 25, 2019
514cf65
fix variable call
erickzhao Jul 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 0 additions & 10 deletions shell/common/api/atom_api_native_image.cc
View file
Open in desktop
Expand Up @@ -94,16 +94,6 @@ base::win::ScopedHICON ReadICOFromPath(int size, const base::FilePath& path) {
static_cast<HICON>(LoadImage(NULL, image_path.value().c_str(), IMAGE_ICON,
size, size, LR_LOADFROMFILE)));
}

bool ReadImageSkiaFromICO(gfx::ImageSkia* image, HICON icon) {
// Convert the icon from the Windows specific HICON to gfx::ImageSkia.
SkBitmap bitmap = IconUtil::CreateSkBitmapFromHICON(icon);
if (bitmap.isNull())
return false;

image->AddRepresentation(gfx::ImageSkiaRep(bitmap, 1.0f));
return true;
}
#endif

void Noop(char*, void*) {}
Expand Down
21 changes: 12 additions & 9 deletions shell/common/skia_util.cc
View file
Open in desktop
Expand Up @@ -8,21 +8,13 @@
#include "base/strings/pattern.h"
#include "base/strings/string_util.h"
#include "base/threading/thread_restrictions.h"
#include "native_mate/dictionary.h"
#include "native_mate/object_template_builder.h"
#include "net/base/data_url.h"
#include "shell/common/asar/asar_util.h"
#include "shell/common/native_mate_converters/file_path_converter.h"
#include "shell/common/native_mate_converters/gfx_converter.h"
#include "shell/common/native_mate_converters/gurl_converter.h"
#include "shell/common/native_mate_converters/value_converter.h"
#include "shell/common/node_includes.h"
#include "shell/common/skia_util.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkImageInfo.h"
#include "third_party/skia/include/core/SkPixelRef.h"
#include "ui/base/layout.h"
#include "ui/base/webui/web_ui_util.h"
#include "ui/gfx/codec/jpeg_codec.h"
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/geometry/size.h"
Expand Down Expand Up @@ -155,6 +147,17 @@ bool PopulateImageSkiaRepsFromPath(gfx::ImageSkia* image,
return succeed;
}

#if defined(OS_WIN)
bool ReadImageSkiaFromICO(gfx::ImageSkia* image, HICON icon) {
// Convert the icon from the Windows specific HICON to gfx::ImageSkia.
SkBitmap bitmap = IconUtil::CreateSkBitmapFromHICON(icon);
if (bitmap.isNull())
return false;

image->AddRepresentation(gfx::ImageSkiaRep(bitmap, 1.0f));
return true;
#endif

} // namespace util

} // namespace electron
} // namespace util
erickzhao marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 4 additions & 0 deletions shell/common/skia_util.h
View file
Open in desktop
Expand Up @@ -33,6 +33,10 @@ bool AddImageSkiaRepFromPNG(gfx::ImageSkia* image,
size_t size,
double scale_factor);

#if defined(OS_WIN)
bool ReadImageSkiaFromICO(gfx::ImageSkia* image, HICON icon);
#endif

} // namespace util

} // namespace electron
Expand Down