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

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

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-2001 Lars Knoll <knoll@kde.org> 3 * 1999-2001 Lars Knoll <knoll@kde.org>
4 * 1999-2001 Antti Koivisto <koivisto@kde.org> 4 * 1999-2001 Antti Koivisto <koivisto@kde.org>
5 * 2000-2001 Simon Hausmann <hausmann@kde.org> 5 * 2000-2001 Simon Hausmann <hausmann@kde.org>
6 * 2000-2001 Dirk Mueller <mueller@kde.org> 6 * 2000-2001 Dirk Mueller <mueller@kde.org>
7 * 2000 Stefan Schimanski <1Stein@gmx.de> 7 * 2000 Stefan Schimanski <1Stein@gmx.de>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
9 * reserved. 9 * reserved.
10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 void reload(FrameLoadType, ClientRedirectPolicy) override; 116 void reload(FrameLoadType, ClientRedirectPolicy) override;
117 void detach(FrameDetachType) override; 117 void detach(FrameDetachType) override;
118 bool shouldClose() override; 118 bool shouldClose() override;
119 SecurityContext* securityContext() const override; 119 SecurityContext* securityContext() const override;
120 void printNavigationErrorMessage(const Frame&, const char* reason) override; 120 void printNavigationErrorMessage(const Frame&, const char* reason) override;
121 void printNavigationWarning(const String&) override; 121 void printNavigationWarning(const String&) override;
122 bool prepareForCommit() override; 122 bool prepareForCommit() override;
123 void didChangeVisibilityState() override; 123 void didChangeVisibilityState() override;
124 void setDocumentHasReceivedUserGesture() override; 124 void setDocumentHasReceivedUserGesture() override;
125 125
126 bool hasReceivedUserGesture() const { return m_hasReceivedUserGesture; }
127
126 void detachChildren(); 128 void detachChildren();
127 void documentAttached(); 129 void documentAttached();
128 130
129 LocalDOMWindow* domWindow() const; 131 LocalDOMWindow* domWindow() const;
130 void setDOMWindow(LocalDOMWindow*); 132 void setDOMWindow(LocalDOMWindow*);
131 FrameView* view() const; 133 FrameView* view() const;
132 Document* document() const; 134 Document* document() const;
133 void setPagePopupOwner(Element&); 135 void setPagePopupOwner(Element&);
134 Element* pagePopupOwner() const { return m_pagePopupOwner.get(); } 136 Element* pagePopupOwner() const { return m_pagePopupOwner.get(); }
135 137
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 const Member<FrameConsole> m_console; 264 const Member<FrameConsole> m_console;
263 const Member<InputMethodController> m_inputMethodController; 265 const Member<InputMethodController> m_inputMethodController;
264 const Member<IdleSpellCheckCallback> m_idleSpellCheckCallback; 266 const Member<IdleSpellCheckCallback> m_idleSpellCheckCallback;
265 267
266 int m_navigationDisableCount; 268 int m_navigationDisableCount;
267 269
268 float m_pageZoomFactor; 270 float m_pageZoomFactor;
269 float m_textZoomFactor; 271 float m_textZoomFactor;
270 272
271 bool m_inViewSourceMode; 273 bool m_inViewSourceMode;
274 bool m_hasReceivedUserGesture;
Nate Chapin 2017/01/11 19:01:40 This won't propagate if this frame goes cross-proc
ojan 2017/01/11 19:15:48 I think we need to come up with a solution that is
272 275
273 Member<InstrumentingAgents> m_instrumentingAgents; 276 Member<InstrumentingAgents> m_instrumentingAgents;
274 Member<PerformanceMonitor> m_performanceMonitor; 277 Member<PerformanceMonitor> m_performanceMonitor;
275 278
276 InterfaceProvider* const m_interfaceProvider; 279 InterfaceProvider* const m_interfaceProvider;
277 InterfaceRegistry* const m_interfaceRegistry; 280 InterfaceRegistry* const m_interfaceRegistry;
278 }; 281 };
279 282
280 inline void LocalFrame::init() { 283 inline void LocalFrame::init() {
281 m_loader.init(); 284 m_loader.init();
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 explicit ScopedFrameBlamer(LocalFrame*); 381 explicit ScopedFrameBlamer(LocalFrame*);
379 ~ScopedFrameBlamer(); 382 ~ScopedFrameBlamer();
380 383
381 private: 384 private:
382 Member<LocalFrame> m_frame; 385 Member<LocalFrame> m_frame;
383 }; 386 };
384 387
385 } // namespace blink 388 } // namespace blink
386 389
387 #endif // LocalFrame_h 390 #endif // LocalFrame_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698