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

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

Issue 2625773002: Reenable framebusting (Closed)
Patch Set: 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 } 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() { 555 void LocalFrame::setDocumentHasReceivedUserGesture() {
556 if (document()) 556 m_hasReceivedUserGesture = true;
557 document()->setHasReceivedUserGesture();
558 } 557 }
559 558
560 LocalFrame* LocalFrame::localFrameRoot() { 559 LocalFrame* LocalFrame::localFrameRoot() {
561 LocalFrame* curFrame = this; 560 LocalFrame* curFrame = this;
562 while (curFrame && curFrame->tree().parent() && 561 while (curFrame && curFrame->tree().parent() &&
563 curFrame->tree().parent()->isLocalFrame()) 562 curFrame->tree().parent()->isLocalFrame())
564 curFrame = toLocalFrame(curFrame->tree().parent()); 563 curFrame = toLocalFrame(curFrame->tree().parent());
565 564
566 return curFrame; 565 return curFrame;
567 } 566 }
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
888 m_spellChecker(SpellChecker::create(*this)), 887 m_spellChecker(SpellChecker::create(*this)),
889 m_selection(FrameSelection::create(*this)), 888 m_selection(FrameSelection::create(*this)),
890 m_eventHandler(new EventHandler(*this)), 889 m_eventHandler(new EventHandler(*this)),
891 m_console(FrameConsole::create(*this)), 890 m_console(FrameConsole::create(*this)),
892 m_inputMethodController(InputMethodController::create(*this)), 891 m_inputMethodController(InputMethodController::create(*this)),
893 m_idleSpellCheckCallback(IdleSpellCheckCallback::create(*this)), 892 m_idleSpellCheckCallback(IdleSpellCheckCallback::create(*this)),
894 m_navigationDisableCount(0), 893 m_navigationDisableCount(0),
895 m_pageZoomFactor(parentPageZoomFactor(this)), 894 m_pageZoomFactor(parentPageZoomFactor(this)),
896 m_textZoomFactor(parentTextZoomFactor(this)), 895 m_textZoomFactor(parentTextZoomFactor(this)),
897 m_inViewSourceMode(false), 896 m_inViewSourceMode(false),
897 m_hasReceivedUserGesture(false),
898 m_interfaceProvider(interfaceProvider), 898 m_interfaceProvider(interfaceProvider),
899 m_interfaceRegistry(interfaceRegistry) { 899 m_interfaceRegistry(interfaceRegistry) {
900 if (isLocalRoot()) { 900 if (isLocalRoot()) {
901 m_instrumentingAgents = new InstrumentingAgents(); 901 m_instrumentingAgents = new InstrumentingAgents();
902 m_performanceMonitor = new PerformanceMonitor(this); 902 m_performanceMonitor = new PerformanceMonitor(this);
903 } else { 903 } else {
904 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; 904 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents;
905 m_performanceMonitor = localFrameRoot()->m_performanceMonitor; 905 m_performanceMonitor = localFrameRoot()->m_performanceMonitor;
906 } 906 }
907 } 907 }
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
942 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) 942 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
943 m_frame->client()->frameBlameContext()->Enter(); 943 m_frame->client()->frameBlameContext()->Enter();
944 } 944 }
945 945
946 ScopedFrameBlamer::~ScopedFrameBlamer() { 946 ScopedFrameBlamer::~ScopedFrameBlamer() {
947 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) 947 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
948 m_frame->client()->frameBlameContext()->Leave(); 948 m_frame->client()->frameBlameContext()->Leave();
949 } 949 }
950 950
951 } // namespace blink 951 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698