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

Merge pull request #11547 from electron/draggable_regions_patch

Browse source 
fix: draggable region ipc should be frame based
This commit is contained in:
Cheng Zhao 2018-01-07 21:15:50 +09:00 • committed by GitHub
commit 4298aecb7c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/native_window.cc
View file

@ -688,10 +688,11 @@ void NativeWindow::DidFirstVisuallyNonEmptyPaint() {
base::Bind(&NativeWindow::NotifyReadyToShow, GetWeakPtr())); base::Bind(&NativeWindow::NotifyReadyToShow, GetWeakPtr()));
} }
bool NativeWindow::OnMessageReceived(const IPC::Message& message) { bool NativeWindow::OnMessageReceived(const IPC::Message& message,
content::RenderFrameHost* rfh) {
bool handled = true; bool handled = true;
IPC_BEGIN_MESSAGE_MAP(NativeWindow, message) IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(NativeWindow, message, rfh)
IPC_MESSAGE_HANDLER(AtomViewHostMsg_UpdateDraggableRegions, IPC_MESSAGE_HANDLER(AtomFrameHostMsg_UpdateDraggableRegions,
UpdateDraggableRegions) UpdateDraggableRegions)
IPC_MESSAGE_UNHANDLED(handled = false) IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP() IPC_END_MESSAGE_MAP()
@ -700,6 +701,7 @@ bool NativeWindow::OnMessageReceived(const IPC::Message& message) {
} }
void NativeWindow::UpdateDraggableRegions( void NativeWindow::UpdateDraggableRegions(
content::RenderFrameHost* rfh,
const std::vector<DraggableRegion>& regions) { const std::vector<DraggableRegion>& regions) {
// Draggable region is not supported for non-frameless window. // Draggable region is not supported for non-frameless window.
if (has_frame_) if (has_frame_)

4
atom/browser/native_window.h
View file

@ -313,13 +313,15 @@ class NativeWindow : public base::SupportsUserData,
// Called when the window needs to update its draggable region. // Called when the window needs to update its draggable region.
virtual void UpdateDraggableRegions( virtual void UpdateDraggableRegions(
content::RenderFrameHost* rfh,
const std::vector<DraggableRegion>& regions); const std::vector<DraggableRegion>& regions);
// content::WebContentsObserver: // content::WebContentsObserver:
void RenderViewCreated(content::RenderViewHost* render_view_host) override; void RenderViewCreated(content::RenderViewHost* render_view_host) override;
void BeforeUnloadDialogCancelled() override; void BeforeUnloadDialogCancelled() override;
void DidFirstVisuallyNonEmptyPaint() override; void DidFirstVisuallyNonEmptyPaint() override;
bool OnMessageReceived(const IPC::Message& message) override; bool OnMessageReceived(const IPC::Message& message,
content::RenderFrameHost* rfh) override;
private: private:
// Schedule a notification unresponsive event. // Schedule a notification unresponsive event.

1
atom/browser/native_window_mac.h
View file

@ -159,6 +159,7 @@ class NativeWindowMac : public NativeWindow,
gfx::Rect ContentBoundsToWindowBounds(const gfx::Rect& bounds) const; gfx::Rect ContentBoundsToWindowBounds(const gfx::Rect& bounds) const;
gfx::Rect WindowBoundsToContentBounds(const gfx::Rect& bounds) const; gfx::Rect WindowBoundsToContentBounds(const gfx::Rect& bounds) const;
void UpdateDraggableRegions( void UpdateDraggableRegions(
content::RenderFrameHost* rfh,
const std::vector<DraggableRegion>& regions) override; const std::vector<DraggableRegion>& regions) override;
void InternalSetParentWindow(NativeWindow* parent, bool attach); void InternalSetParentWindow(NativeWindow* parent, bool attach);

3
atom/browser/native_window_mac.mm
View file

@ -1814,8 +1814,9 @@ gfx::Rect NativeWindowMac::WindowBoundsToContentBounds(
} }
void NativeWindowMac::UpdateDraggableRegions( void NativeWindowMac::UpdateDraggableRegions(
content::RenderFrameHost* rfh,
const std::vector<DraggableRegion>& regions) { const std::vector<DraggableRegion>& regions) {
NativeWindow::UpdateDraggableRegions(regions); NativeWindow::UpdateDraggableRegions(rfh, regions);
draggable_regions_ = regions; draggable_regions_ = regions;
UpdateDraggableRegionViews(regions); UpdateDraggableRegionViews(regions);
} }

2
atom/common/api/api_messages.h
View file

@ -49,7 +49,7 @@ IPC_MESSAGE_ROUTED1(AtomAutofillFrameMsg_AcceptSuggestion,
base::string16 /* suggestion */) base::string16 /* suggestion */)
// Sent by the renderer when the draggable regions are updated. // Sent by the renderer when the draggable regions are updated.
IPC_MESSAGE_ROUTED1(AtomViewHostMsg_UpdateDraggableRegions, IPC_MESSAGE_ROUTED1(AtomFrameHostMsg_UpdateDraggableRegions,
std::vector<atom::DraggableRegion> /* regions */) std::vector<atom::DraggableRegion> /* regions */)
// Update renderer process preferences. // Update renderer process preferences.

2
atom/renderer/atom_render_frame_observer.cc
View file

@ -52,7 +52,7 @@ void AtomRenderFrameObserver::DraggableRegionsChanged() {
region.draggable = webregion.draggable; region.draggable = webregion.draggable;
regions.push_back(region); regions.push_back(region);
} }
Send(new AtomViewHostMsg_UpdateDraggableRegions(routing_id(), regions)); Send(new AtomFrameHostMsg_UpdateDraggableRegions(routing_id(), regions));
} }
void AtomRenderFrameObserver::WillReleaseScriptContext( void AtomRenderFrameObserver::WillReleaseScriptContext(