| Index: third_party/WebKit/Source/core/frame/LocalFrame.cpp
|
| diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.cpp b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
|
| index d6c6ba2f9253faa02f273f63f3e21860dbf5918d..3697a47e71bc0b1e524fb703a73cb71585f833a4 100644
|
| --- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
|
| @@ -291,9 +291,6 @@ void LocalFrame::Init() {
|
| void LocalFrame::SetView(FrameView* view) {
|
| DCHECK(!view_ || view_ != view);
|
| DCHECK(!GetDocument() || !GetDocument()->IsActive());
|
| -
|
| - GetEventHandler().Clear();
|
| -
|
| view_ = view;
|
| }
|
|
|
| @@ -440,7 +437,6 @@ void LocalFrame::Detach(FrameDetachType type) {
|
| // - FrameLoader::detach() can fire XHR abort events
|
| // - Document::shutdown()'s deferred widget updates can run script.
|
| ScriptForbiddenScope forbid_script;
|
| - loader_.Clear();
|
| if (!Client())
|
| return;
|
|
|
| @@ -524,6 +520,8 @@ void LocalFrame::DetachChildren() {
|
|
|
| void LocalFrame::DocumentAttached() {
|
| DCHECK(GetDocument());
|
| + GetEditor().Clear();
|
| + GetEventHandler().Clear();
|
| Selection().DocumentAttached(GetDocument());
|
| GetInputMethodController().DocumentAttached(GetDocument());
|
| GetSpellChecker().DocumentAttached(GetDocument());
|
|
|