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 2702273004: bindings: Simplifies WindowProxyManager and its relation to Frame. (Closed)
Patch Set: Fixed WindowProxyManager::createWindowProxy(ForFrame). 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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 const Color&, 100 const Color&,
101 bool, 101 bool,
102 ScrollbarMode = ScrollbarAuto, 102 ScrollbarMode = ScrollbarAuto,
103 bool horizontalLock = false, 103 bool horizontalLock = false,
104 ScrollbarMode = ScrollbarAuto, 104 ScrollbarMode = ScrollbarAuto,
105 bool verticalLock = false); 105 bool verticalLock = false);
106 106
107 // Frame overrides: 107 // Frame overrides:
108 ~LocalFrame() override; 108 ~LocalFrame() override;
109 DECLARE_VIRTUAL_TRACE(); 109 DECLARE_VIRTUAL_TRACE();
110 WindowProxy* windowProxy(DOMWrapperWorld&) override;
111 void navigate(Document& originDocument, 110 void navigate(Document& originDocument,
112 const KURL&, 111 const KURL&,
113 bool replaceCurrentItem, 112 bool replaceCurrentItem,
114 UserGestureStatus) override; 113 UserGestureStatus) override;
115 void navigate(const FrameLoadRequest&) override; 114 void navigate(const FrameLoadRequest&) override;
116 void reload(FrameLoadType, ClientRedirectPolicy) override; 115 void reload(FrameLoadType, ClientRedirectPolicy) override;
117 void detach(FrameDetachType) override; 116 void detach(FrameDetachType) override;
118 bool shouldClose() override; 117 bool shouldClose() override;
119 SecurityContext* securityContext() const override; 118 SecurityContext* securityContext() const override;
120 void printNavigationErrorMessage(const Frame&, const char* reason) override; 119 void printNavigationErrorMessage(const Frame&, const char* reason) override;
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 224
226 private: 225 private:
227 friend class FrameNavigationDisabler; 226 friend class FrameNavigationDisabler;
228 227
229 LocalFrame(LocalFrameClient*, 228 LocalFrame(LocalFrameClient*,
230 FrameHost*, 229 FrameHost*,
231 FrameOwner*, 230 FrameOwner*,
232 InterfaceProvider*, 231 InterfaceProvider*,
233 InterfaceRegistry*); 232 InterfaceRegistry*);
234 233
235 // Internal Frame helper overrides:
236 WindowProxyManagerBase* getWindowProxyManager() const override;
237 // Intentionally private to prevent redundant checks when the type is 234 // Intentionally private to prevent redundant checks when the type is
238 // already LocalFrame. 235 // already LocalFrame.
239 bool isLocalFrame() const override { return true; } 236 bool isLocalFrame() const override { return true; }
240 bool isRemoteFrame() const override { return false; } 237 bool isRemoteFrame() const override { return false; }
241 238
242 void enableNavigation() { --m_navigationDisableCount; } 239 void enableNavigation() { --m_navigationDisableCount; }
243 void disableNavigation() { ++m_navigationDisableCount; } 240 void disableNavigation() { ++m_navigationDisableCount; }
244 241
245 std::unique_ptr<WebFrameScheduler> m_frameScheduler; 242 std::unique_ptr<WebFrameScheduler> m_frameScheduler;
246 243
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 explicit ScopedFrameBlamer(LocalFrame*); 368 explicit ScopedFrameBlamer(LocalFrame*);
372 ~ScopedFrameBlamer(); 369 ~ScopedFrameBlamer();
373 370
374 private: 371 private:
375 Member<LocalFrame> m_frame; 372 Member<LocalFrame> m_frame;
376 }; 373 };
377 374
378 } // namespace blink 375 } // namespace blink
379 376
380 #endif // LocalFrame_h 377 #endif // LocalFrame_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698