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 861586e7f96c5366425fc35a4a3d36edfb855094..9e0a2db9ae4557fb020ccc27c00937bb908b6ecb 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) { |
ASSERT(!view_ || view_ != view); |
ASSERT(!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()); |