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

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

Issue 898593002: DevTools: use per-LocalFrame instrumenting agents instead of per-Page ones. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fixed assertion Created 5 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | Source/core/frame/LocalFrame.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 class FetchContext; 50 class FetchContext;
51 class FloatSize; 51 class FloatSize;
52 class FrameConsole; 52 class FrameConsole;
53 class FrameDestructionObserver; 53 class FrameDestructionObserver;
54 class FrameSelection; 54 class FrameSelection;
55 class FrameView; 55 class FrameView;
56 class HTMLPlugInElement; 56 class HTMLPlugInElement;
57 class InputMethodController; 57 class InputMethodController;
58 class IntPoint; 58 class IntPoint;
59 class IntSize; 59 class IntSize;
60 class InstrumentingAgents;
60 class LocalDOMWindow; 61 class LocalDOMWindow;
61 class Node; 62 class Node;
62 class Range; 63 class Range;
63 class RenderView; 64 class RenderView;
64 class TreeScope; 65 class TreeScope;
65 class ScriptController; 66 class ScriptController;
66 class SpellChecker; 67 class SpellChecker;
67 class TreeScope; 68 class TreeScope;
68 class VisiblePosition; 69 class VisiblePosition;
69 70
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 FrameConsole& console() const; 119 FrameConsole& console() const;
119 120
120 void didChangeVisibilityState(); 121 void didChangeVisibilityState();
121 122
122 // This method is used to get the highest level LocalFrame in this 123 // This method is used to get the highest level LocalFrame in this
123 // frame's in-process subtree. 124 // frame's in-process subtree.
124 // FIXME: This is a temporary hack to support RemoteFrames, and callers 125 // FIXME: This is a temporary hack to support RemoteFrames, and callers
125 // should be updated to avoid storing things on the main frame. 126 // should be updated to avoid storing things on the main frame.
126 LocalFrame* localFrameRoot(); 127 LocalFrame* localFrameRoot();
127 128
129 InstrumentingAgents* instrumentingAgents();
130 void setInstrumentingAgents(InstrumentingAgents*);
131
128 // ======== All public functions below this point are candidates to move out of LocalFrame into another class. ======== 132 // ======== All public functions below this point are candidates to move out of LocalFrame into another class. ========
129 133
130 bool inScope(TreeScope*) const; 134 bool inScope(TreeScope*) const;
131 135
132 void countObjectsNeedingLayout(unsigned& needsLayoutObjects, unsigned& t otalObjects, bool& isPartial); 136 void countObjectsNeedingLayout(unsigned& needsLayoutObjects, unsigned& t otalObjects, bool& isPartial);
133 137
134 // See GraphicsLayerClient.h for accepted flags. 138 // See GraphicsLayerClient.h for accepted flags.
135 String layerTreeAsText(unsigned flags = 0) const; 139 String layerTreeAsText(unsigned flags = 0) const;
136 140
137 void setPrinting(bool printing, const FloatSize& pageSize, const FloatSi ze& originalPageSize, float maximumShrinkRatio); 141 void setPrinting(bool printing, const FloatSize& pageSize, const FloatSi ze& originalPageSize, float maximumShrinkRatio);
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 // weak callback, the set itself is not on the heap and the 219 // weak callback, the set itself is not on the heap and the
216 // references are bare pointers (rather than WeakMembers.) 220 // references are bare pointers (rather than WeakMembers.)
217 // See LocalFrame::clearWeakMembers(). 221 // See LocalFrame::clearWeakMembers().
218 HashSet<HTMLPlugInElement*> m_pluginElements; 222 HashSet<HTMLPlugInElement*> m_pluginElements;
219 #endif 223 #endif
220 224
221 float m_pageZoomFactor; 225 float m_pageZoomFactor;
222 float m_textZoomFactor; 226 float m_textZoomFactor;
223 227
224 bool m_inViewSourceMode; 228 bool m_inViewSourceMode;
229
230 RefPtrWillBeMember<InstrumentingAgents> m_instrumentingAgents;
225 }; 231 };
226 232
227 inline void LocalFrame::init() 233 inline void LocalFrame::init()
228 { 234 {
229 m_loader.init(); 235 m_loader.init();
230 } 236 }
231 237
232 inline LocalDOMWindow* LocalFrame::localDOMWindow() const 238 inline LocalDOMWindow* LocalFrame::localDOMWindow() const
233 { 239 {
234 return m_domWindow.get(); 240 return m_domWindow.get();
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 DEFINE_TYPE_CASTS(LocalFrame, Frame, localFrame, localFrame->isLocalFrame(), localFrame.isLocalFrame()); 304 DEFINE_TYPE_CASTS(LocalFrame, Frame, localFrame, localFrame->isLocalFrame(), localFrame.isLocalFrame());
299 305
300 } // namespace blink 306 } // namespace blink
301 307
302 // During refactoring, there are some places where we need to do type conversion s that 308 // During refactoring, there are some places where we need to do type conversion s that
303 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte d out. 309 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte d out.
304 // At that time this #define will be removed and all the uses of it will need to be corrected. 310 // At that time this #define will be removed and all the uses of it will need to be corrected.
305 #define toLocalFrameTemporary toLocalFrame 311 #define toLocalFrameTemporary toLocalFrame
306 312
307 #endif // LocalFrame_h 313 #endif // LocalFrame_h
OLDNEW
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | Source/core/frame/LocalFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698