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

Small code cleanup

Browse source
This commit is contained in:
Cheng Zhao 2015-10-29 10:53:48 +08:00
parent 0f89f67a84
commit 917b33dbe7
4 changed files with 24 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

24
atom/browser/api/atom_api_window.cc
View file

@ -60,6 +60,16 @@ void OnCapturePageDone(
callback.Run(gfx::Image::CreateFrom1xBitmap(bitmap)); callback.Run(gfx::Image::CreateFrom1xBitmap(bitmap));
} }
#if defined(OS_WIN)
v8::Local<v8::Value> ToBuffer(v8::Isolate* isolate, void* val, int size) {
auto buffer = node::Buffer::New(isolate, static_cast<char*>(val), size);
if (buffer.IsEmpty())
return v8::Null(isolate);
else
return buffer.ToLocalChecked();
}
#endif
} // namespace } // namespace
@ -190,21 +200,11 @@ void Window::OnExecuteWindowsCommand(const std::string& command_name) {
} }
#if defined(OS_WIN) #if defined(OS_WIN)
v8::Local<v8::Value> Window::ToBuffer(void* val, int size) {
auto buffer = node::Buffer::New(isolate(), static_cast<char*>(val), size);
if (buffer.IsEmpty()) {
return v8::Null(isolate());
} else {
return buffer.ToLocalChecked();
}
}
void Window::OnWindowMessage(UINT message, WPARAM w_param, LPARAM l_param) { void Window::OnWindowMessage(UINT message, WPARAM w_param, LPARAM l_param) {
if (IsWindowMessageHooked(message)) { if (IsWindowMessageHooked(message)) {
messages_callback_map_[message].Run( messages_callback_map_[message].Run(
ToBuffer(static_cast<void*>(&w_param), sizeof(WPARAM)), ToBuffer(isolate(), static_cast<void*>(&w_param), sizeof(WPARAM)),
ToBuffer(static_cast<void*>(&l_param), sizeof(LPARAM))); ToBuffer(isolate(), static_cast<void*>(&l_param), sizeof(LPARAM)));
} }
} }
#endif #endif

15
atom/browser/api/atom_api_window.h
View file

@ -77,8 +77,7 @@ class Window : public mate::TrackableObject<Window>,
void OnExecuteWindowsCommand(const std::string& command_name) override; void OnExecuteWindowsCommand(const std::string& command_name) override;
#if defined(OS_WIN) #if defined(OS_WIN)
void OnWindowMessage(UINT message, WPARAM w_param, void OnWindowMessage(UINT message, WPARAM w_param, LPARAM l_param) override;
LPARAM l_param) override;
#endif #endif
// mate::Wrappable: // mate::Wrappable:
@ -150,15 +149,10 @@ class Window : public mate::TrackableObject<Window>,
void SetAspectRatio(double aspect_ratio, mate::Arguments* args); void SetAspectRatio(double aspect_ratio, mate::Arguments* args);
#if defined(OS_WIN) #if defined(OS_WIN)
v8::Local<v8::Value> ToBuffer(void* val, int size);
typedef base::Callback<void(v8::Local<v8::Value>, typedef base::Callback<void(v8::Local<v8::Value>,
v8::Local<v8::Value>)> MessageCallback; v8::Local<v8::Value>)> MessageCallback;
typedef std::map<UINT, MessageCallback> MessageCallbackMap;
MessageCallbackMap messages_callback_map_;
bool HookWindowMessage(UINT message, bool HookWindowMessage(UINT message, const MessageCallback& callback);
const MessageCallback& callback);
bool IsWindowMessageHooked(UINT message); bool IsWindowMessageHooked(UINT message);
void UnhookWindowMessage(UINT message); void UnhookWindowMessage(UINT message);
void UnhookAllWindowMessages(); void UnhookAllWindowMessages();
@ -174,6 +168,11 @@ class Window : public mate::TrackableObject<Window>,
int32_t ID() const; int32_t ID() const;
v8::Local<v8::Value> WebContents(v8::Isolate* isolate); v8::Local<v8::Value> WebContents(v8::Isolate* isolate);
#if defined(OS_WIN)
typedef std::map<UINT, MessageCallback> MessageCallbackMap;
MessageCallbackMap messages_callback_map_;
#endif
v8::Global<v8::Value> web_contents_; v8::Global<v8::Value> web_contents_;
v8::Global<v8::Value> menu_; v8::Global<v8::Value> menu_;

10
atom/browser/native_window.cc
View file

@ -465,12 +465,10 @@ void NativeWindow::NotifyWindowExecuteWindowsCommand(
} }
#if defined(OS_WIN) #if defined(OS_WIN)
void NativeWindow::NotifyWindowMessage(UINT message, WPARAM w_param, void NativeWindow::NotifyWindowMessage(
LPARAM l_param) { UINT message, WPARAM w_param, LPARAM l_param) {
FOR_EACH_OBSERVER( FOR_EACH_OBSERVER(NativeWindowObserver, observers_,
NativeWindowObserver, observers_, OnWindowMessage(message, w_param, l_param));
OnWindowMessage(message, w_param,
l_param));
} }
#endif #endif

2
atom/browser/native_window_observer.h
View file

@ -61,7 +61,7 @@ class NativeWindowObserver {
// Called when window message received // Called when window message received
#if defined(OS_WIN) #if defined(OS_WIN)
virtual void OnWindowMessage(UINT message, WPARAM wparam, LPARAM lparam) {} virtual void OnWindowMessage(UINT message, WPARAM w_param, LPARAM l_param) {}
#endif #endif
// Called when renderer is hung. // Called when renderer is hung.