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

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

Issue 2762423003: Made Frame constructors (and subclasses) take Page& instead of Page* (Closed)
Patch Set: Rebase Created 3 years, 9 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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 extern template class CORE_EXTERN_TEMPLATE_EXPORT Supplement<LocalFrame>; 83 extern template class CORE_EXTERN_TEMPLATE_EXPORT Supplement<LocalFrame>;
84 84
85 class CORE_EXPORT LocalFrame final : public Frame, 85 class CORE_EXPORT LocalFrame final : public Frame,
86 public Supplementable<LocalFrame> { 86 public Supplementable<LocalFrame> {
87 USING_GARBAGE_COLLECTED_MIXIN(LocalFrame); 87 USING_GARBAGE_COLLECTED_MIXIN(LocalFrame);
88 88
89 friend class LocalFrameTest; 89 friend class LocalFrameTest;
90 90
91 public: 91 public:
92 static LocalFrame* create(LocalFrameClient*, 92 static LocalFrame* create(LocalFrameClient*,
93 Page*, 93 Page&,
94 FrameOwner*, 94 FrameOwner*,
95 InterfaceProvider* = nullptr, 95 InterfaceProvider* = nullptr,
96 InterfaceRegistry* = nullptr); 96 InterfaceRegistry* = nullptr);
97 97
98 void init(); 98 void init();
99 void setView(FrameView*); 99 void setView(FrameView*);
100 void createView(const IntSize&, 100 void createView(const IntSize&,
101 const Color&, 101 const Color&,
102 bool, 102 bool,
103 ScrollbarMode = ScrollbarAuto, 103 ScrollbarMode = ScrollbarAuto,
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 LocalFrameClient* client() const; 224 LocalFrameClient* client() const;
225 225
226 PluginData* pluginData() const; 226 PluginData* pluginData() const;
227 227
228 PerformanceMonitor* performanceMonitor() { return m_performanceMonitor; } 228 PerformanceMonitor* performanceMonitor() { return m_performanceMonitor; }
229 229
230 private: 230 private:
231 friend class FrameNavigationDisabler; 231 friend class FrameNavigationDisabler;
232 232
233 LocalFrame(LocalFrameClient*, 233 LocalFrame(LocalFrameClient*,
234 Page*, 234 Page&,
235 FrameOwner*, 235 FrameOwner*,
236 InterfaceProvider*, 236 InterfaceProvider*,
237 InterfaceRegistry*); 237 InterfaceRegistry*);
238 238
239 // Intentionally private to prevent redundant checks when the type is 239 // Intentionally private to prevent redundant checks when the type is
240 // already LocalFrame. 240 // already LocalFrame.
241 bool isLocalFrame() const override { return true; } 241 bool isLocalFrame() const override { return true; }
242 bool isRemoteFrame() const override { return false; } 242 bool isRemoteFrame() const override { return false; }
243 243
244 void enableNavigation() { --m_navigationDisableCount; } 244 void enableNavigation() { --m_navigationDisableCount; }
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 explicit ScopedFrameBlamer(LocalFrame*); 373 explicit ScopedFrameBlamer(LocalFrame*);
374 ~ScopedFrameBlamer(); 374 ~ScopedFrameBlamer();
375 375
376 private: 376 private:
377 Member<LocalFrame> m_frame; 377 Member<LocalFrame> m_frame;
378 }; 378 };
379 379
380 } // namespace blink 380 } // namespace blink
381 381
382 #endif // LocalFrame_h 382 #endif // LocalFrame_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/Frame.cpp ('k') | third_party/WebKit/Source/core/frame/LocalFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698