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

Side by Side Diff: third_party/WebKit/Source/core/frame/LocalFrame.cpp

Issue 2625773002: Reenable framebusting (Closed)
Patch Set: Fix unit tests 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 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 return LayoutViewItem(contentLayoutObject()); 545 return LayoutViewItem(contentLayoutObject());
546 } 546 }
547 547
548 void LocalFrame::didChangeVisibilityState() { 548 void LocalFrame::didChangeVisibilityState() {
549 if (document()) 549 if (document())
550 document()->didChangeVisibilityState(); 550 document()->didChangeVisibilityState();
551 551
552 Frame::didChangeVisibilityState(); 552 Frame::didChangeVisibilityState();
553 } 553 }
554 554
555 void LocalFrame::setDocumentHasReceivedUserGesture() {
556 if (document())
557 document()->setHasReceivedUserGesture();
558 }
559
560 LocalFrame* LocalFrame::localFrameRoot() { 555 LocalFrame* LocalFrame::localFrameRoot() {
561 LocalFrame* curFrame = this; 556 LocalFrame* curFrame = this;
562 while (curFrame && curFrame->tree().parent() && 557 while (curFrame && curFrame->tree().parent() &&
563 curFrame->tree().parent()->isLocalFrame()) 558 curFrame->tree().parent()->isLocalFrame())
564 curFrame = toLocalFrame(curFrame->tree().parent()); 559 curFrame = toLocalFrame(curFrame->tree().parent());
565 560
566 return curFrame; 561 return curFrame;
567 } 562 }
568 563
569 bool LocalFrame::isCrossOriginSubframe() const { 564 bool LocalFrame::isCrossOriginSubframe() const {
(...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after
942 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) 937 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
943 m_frame->client()->frameBlameContext()->Enter(); 938 m_frame->client()->frameBlameContext()->Enter();
944 } 939 }
945 940
946 ScopedFrameBlamer::~ScopedFrameBlamer() { 941 ScopedFrameBlamer::~ScopedFrameBlamer() {
947 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) 942 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
948 m_frame->client()->frameBlameContext()->Leave(); 943 m_frame->client()->frameBlameContext()->Leave();
949 } 944 }
950 945
951 } // namespace blink 946 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698