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

fix: correctly destroy spellcheck client (#16526)

Browse source 
* fix: Destroy spellcheck client

* Address review comments
This commit is contained in:
Nitish Sakhawalkar 2019-01-29 15:58:59 -08:00 • committed by Shelley Vohr
parent 6d5b225ac5
commit ce33169b71
2 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

32
atom/renderer/api/atom_api_web_frame.cc
View file

@ -4,6 +4,8 @@
#include "atom/renderer/api/atom_api_web_frame.h" #include "atom/renderer/api/atom_api_web_frame.h"
#include <utility>
#include "atom/common/api/api_messages.h" #include "atom/common/api/api_messages.h"
#include "atom/common/api/event_emitter_caller.h" #include "atom/common/api/event_emitter_caller.h"
#include "atom/common/native_mate_converters/blink_converter.h" #include "atom/common/native_mate_converters/blink_converter.h"
@ -135,6 +137,26 @@ class FrameSpellChecker : public content::RenderFrameVisitor {
} // namespace } // 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) WebFrame::WebFrame(v8::Isolate* isolate)
: web_frame_(blink::WebLocalFrame::FrameForCurrentContext()) { : web_frame_(blink::WebLocalFrame::FrameForCurrentContext()) {
Init(isolate); Init(isolate);
@ -222,15 +244,15 @@ void WebFrame::SetSpellCheckProvider(mate::Arguments* args,
return; return;
} }
auto client = std::make_unique<SpellCheckClient>( auto spell_check_client = std::make_unique<SpellCheckClient>(
language, auto_spell_correct_turned_on, args->isolate(), provider); language, auto_spell_correct_turned_on, args->isolate(), provider);
// Set spellchecker for all live frames in the same process or // Set spellchecker for all live frames in the same process or
// in the sandbox mode for all live sub frames to this WebFrame. // in the sandbox mode for all live sub frames to this WebFrame.
FrameSpellChecker spell_checker( auto* render_frame = content::RenderFrame::FromWebFrame(web_frame_);
client.get(), content::RenderFrame::FromWebFrame(web_frame_)); FrameSpellChecker spell_checker(spell_check_client.get(), render_frame);
content::RenderFrame::ForEach(&spell_checker); 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) { void WebFrame::RegisterURLSchemeAsBypassingCSP(const std::string& scheme) {

4
atom/renderer/api/atom_api_web_frame.h
View file

@ -26,8 +26,6 @@ namespace atom {
namespace api { namespace api {
class SpellCheckClient;
class WebFrame : public mate::Wrappable<WebFrame> { class WebFrame : public mate::Wrappable<WebFrame> {
public: public:
static mate::Handle<WebFrame> Create(v8::Isolate* isolate); static mate::Handle<WebFrame> Create(v8::Isolate* isolate);
@ -99,8 +97,6 @@ class WebFrame : public mate::Wrappable<WebFrame> {
v8::Local<v8::Value> FindFrameByRoutingId(int routing_id) const; v8::Local<v8::Value> FindFrameByRoutingId(int routing_id) const;
v8::Local<v8::Value> RoutingId() const; v8::Local<v8::Value> RoutingId() const;
std::unique_ptr<SpellCheckClient> spell_check_client_;
blink::WebLocalFrame* web_frame_; blink::WebLocalFrame* web_frame_;
DISALLOW_COPY_AND_ASSIGN(WebFrame); DISALLOW_COPY_AND_ASSIGN(WebFrame);