clear the spellcheck client on script context invalidation

auditors: @bbondy, @darkdh Fix brave/browser-laptop#3841
brave · Sep 9, 2016 · 711a025 · 711a025 · bbondy · Sep 11, 2016
1 parent 3f27e53
commit 711a025
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/brave/renderer/extensions/web_frame_bindings.cc b/brave/renderer/extensions/web_frame_bindings.cc
@@ -46,6 +46,12 @@ WebFrameBindings::WebFrameBindings(extensions::ScriptContext* context)
 WebFrameBindings::~WebFrameBindings() {
 }
 
+void WebFrameBindings::Invalidate() {
+  context()->web_frame()->view()->setSpellCheckClient(nullptr);
+  spell_check_client_.reset(nullptr);
+  ObjectBackedNativeHandler::Invalidate();
+}
+
 void WebFrameBindings::SetSpellCheckProvider(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   const std::string lang = mate::V8ToString(args[0].As<v8::String>());

diff --git a/brave/renderer/extensions/web_frame_bindings.h b/brave/renderer/extensions/web_frame_bindings.h
@@ -21,6 +21,7 @@ class WebFrameBindings : public extensions::ObjectBackedNativeHandler {
   void SetSpellCheckProvider(const v8::FunctionCallbackInfo<v8::Value>& args);
   void SetGlobal(const v8::FunctionCallbackInfo<v8::Value>& args);
   void ExecuteJavaScript(const v8::FunctionCallbackInfo<v8::Value>& args);
+  void Invalidate() override;
 
  private:
   void BindToGC(const v8::FunctionCallbackInfo<v8::Value>& args);