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

fix: correctly destroy spellcheck client #16525

Merged
merged 2 commits into from Jan 29, 2019
Merged

fix: correctly destroy spellcheck client #16525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cb92bd
fix: Destroy spellcheck client
nitsakh Jan 18, 2019
f224b27
Address review comments
nitsakh Jan 24, 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
32 changes: 27 additions & 5 deletions atom/renderer/api/atom_api_web_frame.cc
View file
Open in desktop
Expand Up @@ -4,6 +4,8 @@

#include "atom/renderer/api/atom_api_web_frame.h"

#include <utility>

#include "atom/common/api/api_messages.h"
#include "atom/common/api/event_emitter_caller.h"
#include "atom/common/native_mate_converters/blink_converter.h"
Expand Down Expand Up @@ -137,6 +139,26 @@ class FrameSpellChecker : public content::RenderFrameVisitor {

} // namespace

class AtomWebFrameObserver : public content::RenderFrameObserver {
public:
explicit AtomWebFrameObserver(
content::RenderFrame* render_frame,
std::unique_ptr<SpellCheckClient> spell_check_client)
: content::RenderFrameObserver(render_frame),
spell_check_client_(std::move(spell_check_client)) {}
~AtomWebFrameObserver() final {}

// RenderFrameObserver implementation.
void OnDestruct() final {
spell_check_client_.reset();
// Frame observers should delete themselves
delete this;
}

private:
std::unique_ptr<SpellCheckClient> spell_check_client_;
};

WebFrame::WebFrame(v8::Isolate* isolate)
: web_frame_(blink::WebLocalFrame::FrameForCurrentContext()) {
Init(isolate);
Expand Down Expand Up @@ -229,15 +251,15 @@ void WebFrame::SetSpellCheckProvider(mate::Arguments* args,
return;
}

auto client =
auto spell_check_client =
std::make_unique<SpellCheckClient>(language, args->isolate(), provider);
// Set spellchecker for all live frames in the same process or
// in the sandbox mode for all live sub frames to this WebFrame.
FrameSpellChecker spell_checker(
client.get(), content::RenderFrame::FromWebFrame(web_frame_));
auto* render_frame = content::RenderFrame::FromWebFrame(web_frame_);
FrameSpellChecker spell_checker(spell_check_client.get(), render_frame);
content::RenderFrame::ForEach(&spell_checker);
spell_check_client_.swap(client);
web_frame_->SetSpellCheckPanelHostClient(spell_check_client_.get());
web_frame_->SetSpellCheckPanelHostClient(spell_check_client.get());
new AtomWebFrameObserver(render_frame, std::move(spell_check_client));
}

void WebFrame::RegisterURLSchemeAsBypassingCSP(const std::string& scheme) {
Expand Down
4 changes: 0 additions & 4 deletions atom/renderer/api/atom_api_web_frame.h
View file
Open in desktop
Expand Up @@ -26,8 +26,6 @@ namespace atom {

namespace api {

class SpellCheckClient;

class WebFrame : public mate::Wrappable<WebFrame> {
public:
static mate::Handle<WebFrame> Create(v8::Isolate* isolate);
Expand Down Expand Up @@ -97,8 +95,6 @@ class WebFrame : public mate::Wrappable<WebFrame> {
v8::Local<v8::Value> FindFrameByRoutingId(int routing_id) const;
v8::Local<v8::Value> RoutingId() const;

std::unique_ptr<SpellCheckClient> spell_check_client_;

blink::WebLocalFrame* web_frame_;

DISALLOW_COPY_AND_ASSIGN(WebFrame);
Expand Down