Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1407)

Side by Side Diff: third_party/WebKit/Source/web/WebFrame.cpp

Issue 2625773002: Reenable framebusting (Closed)
Patch Set: Pass through FrameReplicationState Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "public/web/WebFrame.h" 5 #include "public/web/WebFrame.h"
6 6
7 #include "bindings/core/v8/WindowProxyManager.h" 7 #include "bindings/core/v8/WindowProxyManager.h"
8 #include "core/HTMLNames.h" 8 #include "core/HTMLNames.h"
9 #include "core/frame/FrameHost.h" 9 #include "core/frame/FrameHost.h"
10 #include "core/frame/FrameView.h" 10 #include "core/frame/FrameView.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 if (owner->isLocal()) 98 if (owner->isLocal())
99 toHTMLFrameOwnerElement(owner)->setWidget(localFrame.view()); 99 toHTMLFrameOwnerElement(owner)->setWidget(localFrame.view());
100 } else { 100 } else {
101 localFrame.page()->setMainFrame(&localFrame); 101 localFrame.page()->setMainFrame(&localFrame);
102 } 102 }
103 } else { 103 } else {
104 toWebRemoteFrameImpl(frame)->initializeCoreFrame(host, owner, name, 104 toWebRemoteFrameImpl(frame)->initializeCoreFrame(host, owner, name,
105 uniqueName); 105 uniqueName);
106 } 106 }
107 107
108 if (oldFrame->hasReceivedUserGesture())
109 frame->toImplBase()->frame()->setDocumentHasReceivedUserGesture();
110
108 frame->toImplBase()->frame()->getWindowProxyManager()->setGlobals(globals); 111 frame->toImplBase()->frame()->getWindowProxyManager()->setGlobals(globals);
109 112
110 m_parent = nullptr; 113 m_parent = nullptr;
111 114
112 return true; 115 return true;
113 } 116 }
114 117
115 void WebFrame::detach() { 118 void WebFrame::detach() {
116 toImplBase()->frame()->detach(FrameDetachType::Remove); 119 toImplBase()->frame()->detach(FrameDetachType::Remove);
117 } 120 }
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { \ 340 void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { \
338 clearWeakFramesImpl(visitor); \ 341 clearWeakFramesImpl(visitor); \
339 } 342 }
340 343
341 DEFINE_VISITOR_METHOD(Visitor*) 344 DEFINE_VISITOR_METHOD(Visitor*)
342 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor) 345 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor)
343 346
344 #undef DEFINE_VISITOR_METHOD 347 #undef DEFINE_VISITOR_METHOD
345 348
346 } // namespace blink 349 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/RemoteFrameClientImpl.cpp ('k') | third_party/WebKit/Source/web/WebLocalFrameImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698