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

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

Issue 2121433002: Fix navigator.plugins and navigator.mimeTypes for OOPIFs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2743
Patch Set: Created 4 years, 5 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 reserved. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
9 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 10 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 class HTMLPlugInElement; 59 class HTMLPlugInElement;
60 class InputMethodController; 60 class InputMethodController;
61 class IntPoint; 61 class IntPoint;
62 class IntSize; 62 class IntSize;
63 class InstrumentingAgents; 63 class InstrumentingAgents;
64 class LayoutViewItem; 64 class LayoutViewItem;
65 class LocalDOMWindow; 65 class LocalDOMWindow;
66 class NavigationScheduler; 66 class NavigationScheduler;
67 class Node; 67 class Node;
68 class NodeTraversal; 68 class NodeTraversal;
69 class PluginData;
69 class Range; 70 class Range;
70 class LayoutView; 71 class LayoutView;
71 class ScriptController; 72 class ScriptController;
72 class ServiceRegistry; 73 class ServiceRegistry;
73 class SpellChecker; 74 class SpellChecker;
74 class WebFrameHostScheduler; 75 class WebFrameHostScheduler;
75 class WebFrameScheduler; 76 class WebFrameScheduler;
76 template <typename Strategy> class PositionWithAffinityTemplate; 77 template <typename Strategy> class PositionWithAffinityTemplate;
77 78
78 class CORE_EXPORT LocalFrame : public Frame, public LocalFrameLifecycleNotifier, public Supplementable<LocalFrame> { 79 class CORE_EXPORT LocalFrame : public Frame, public LocalFrameLifecycleNotifier, public Supplementable<LocalFrame> {
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 // Returns the frame scheduler, creating one if needed. 173 // Returns the frame scheduler, creating one if needed.
173 WebFrameScheduler* frameScheduler(); 174 WebFrameScheduler* frameScheduler();
174 void scheduleVisualUpdateUnlessThrottled(); 175 void scheduleVisualUpdateUnlessThrottled();
175 176
176 bool isNavigationAllowed() const { return m_navigationDisableCount == 0; } 177 bool isNavigationAllowed() const { return m_navigationDisableCount == 0; }
177 178
178 ServiceRegistry* serviceRegistry() { return m_serviceRegistry; } 179 ServiceRegistry* serviceRegistry() { return m_serviceRegistry; }
179 180
180 FrameLoaderClient* client() const; 181 FrameLoaderClient* client() const;
181 182
183 PluginData* pluginData() const;
184
182 private: 185 private:
183 friend class FrameNavigationDisabler; 186 friend class FrameNavigationDisabler;
184 187
185 LocalFrame(FrameLoaderClient*, FrameHost*, FrameOwner*, ServiceRegistry*); 188 LocalFrame(FrameLoaderClient*, FrameHost*, FrameOwner*, ServiceRegistry*);
186 189
187 // Internal Frame helper overrides: 190 // Internal Frame helper overrides:
188 WindowProxyManager* getWindowProxyManager() const override; 191 WindowProxyManager* getWindowProxyManager() const override;
189 192
190 String localLayerTreeAsText(unsigned flags) const; 193 String localLayerTreeAsText(unsigned flags) const;
191 194
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 explicit FrameNavigationDisabler(LocalFrame&); 307 explicit FrameNavigationDisabler(LocalFrame&);
305 ~FrameNavigationDisabler(); 308 ~FrameNavigationDisabler();
306 309
307 private: 310 private:
308 Member<LocalFrame> m_frame; 311 Member<LocalFrame> m_frame;
309 }; 312 };
310 313
311 } // namespace blink 314 } // namespace blink
312 315
313 #endif // LocalFrame_h 316 #endif // LocalFrame_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/DOMImplementation.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