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

Side by Side Diff: third_party/WebKit/Source/core/frame/LocalFrame.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 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Simon Hausmann <hausmann@kde.org> 5 * 2000 Simon Hausmann <hausmann@kde.org>
6 * 2000 Stefan Schimanski <1Stein@gmx.de> 6 * 2000 Stefan Schimanski <1Stein@gmx.de>
7 * 2001 George Staikos <staikos@kde.org> 7 * 2001 George Staikos <staikos@kde.org>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
9 * rights reserved. 9 * rights reserved.
10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> 10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
(...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 return LayoutViewItem(contentLayoutObject()); 546 return LayoutViewItem(contentLayoutObject());
547 } 547 }
548 548
549 void LocalFrame::didChangeVisibilityState() { 549 void LocalFrame::didChangeVisibilityState() {
550 if (document()) 550 if (document())
551 document()->didChangeVisibilityState(); 551 document()->didChangeVisibilityState();
552 552
553 Frame::didChangeVisibilityState(); 553 Frame::didChangeVisibilityState();
554 } 554 }
555 555
556 void LocalFrame::setDocumentHasReceivedUserGesture() {
557 if (document())
558 document()->setHasReceivedUserGesture();
559 }
560
561 LocalFrame* LocalFrame::localFrameRoot() { 556 LocalFrame* LocalFrame::localFrameRoot() {
562 LocalFrame* curFrame = this; 557 LocalFrame* curFrame = this;
563 while (curFrame && curFrame->tree().parent() && 558 while (curFrame && curFrame->tree().parent() &&
564 curFrame->tree().parent()->isLocalFrame()) 559 curFrame->tree().parent()->isLocalFrame())
565 curFrame = toLocalFrame(curFrame->tree().parent()); 560 curFrame = toLocalFrame(curFrame->tree().parent());
566 561
567 return curFrame; 562 return curFrame;
568 } 563 }
569 564
570 bool LocalFrame::isCrossOriginSubframe() const { 565 bool LocalFrame::isCrossOriginSubframe() const {
(...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after
943 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) 938 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
944 m_frame->client()->frameBlameContext()->Enter(); 939 m_frame->client()->frameBlameContext()->Enter();
945 } 940 }
946 941
947 ScopedFrameBlamer::~ScopedFrameBlamer() { 942 ScopedFrameBlamer::~ScopedFrameBlamer() {
948 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) 943 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
949 m_frame->client()->frameBlameContext()->Leave(); 944 m_frame->client()->frameBlameContext()->Leave();
950 } 945 }
951 946
952 } // namespace blink 947 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/LocalFrame.h ('k') | third_party/WebKit/Source/core/frame/RemoteFrame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698