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

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

Issue 2172153002: Move FrameLoader completion check timer to loading task runner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Don't lazy create the frame scheduler Created 4 years, 4 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
« no previous file with comments | « no previous file | third_party/WebKit/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 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 // Internal Frame helper overrides: 193 // Internal Frame helper overrides:
194 WindowProxyManager* getWindowProxyManager() const override; 194 WindowProxyManager* getWindowProxyManager() const override;
195 // Intentionally private to prevent redundant checks when the type is 195 // Intentionally private to prevent redundant checks when the type is
196 // already LocalFrame. 196 // already LocalFrame.
197 bool isLocalFrame() const override { return true; } 197 bool isLocalFrame() const override { return true; }
198 bool isRemoteFrame() const override { return false; } 198 bool isRemoteFrame() const override { return false; }
199 199
200 void enableNavigation() { --m_navigationDisableCount; } 200 void enableNavigation() { --m_navigationDisableCount; }
201 void disableNavigation() { ++m_navigationDisableCount; } 201 void disableNavigation() { ++m_navigationDisableCount; }
202 202
203 std::unique_ptr<WebFrameScheduler> m_frameScheduler;
204
203 mutable FrameLoader m_loader; 205 mutable FrameLoader m_loader;
204 Member<NavigationScheduler> m_navigationScheduler; 206 Member<NavigationScheduler> m_navigationScheduler;
205 207
206 Member<FrameView> m_view; 208 Member<FrameView> m_view;
207 Member<LocalDOMWindow> m_domWindow; 209 Member<LocalDOMWindow> m_domWindow;
208 // Usually 0. Non-null if this is the top frame of PagePopup. 210 // Usually 0. Non-null if this is the top frame of PagePopup.
209 Member<Element> m_pagePopupOwner; 211 Member<Element> m_pagePopupOwner;
210 212
211 const Member<ScriptController> m_script; 213 const Member<ScriptController> m_script;
212 const Member<Editor> m_editor; 214 const Member<Editor> m_editor;
213 const Member<SpellChecker> m_spellChecker; 215 const Member<SpellChecker> m_spellChecker;
214 const Member<FrameSelection> m_selection; 216 const Member<FrameSelection> m_selection;
215 const Member<EventHandler> m_eventHandler; 217 const Member<EventHandler> m_eventHandler;
216 const Member<FrameConsole> m_console; 218 const Member<FrameConsole> m_console;
217 const Member<InputMethodController> m_inputMethodController; 219 const Member<InputMethodController> m_inputMethodController;
218 std::unique_ptr<WebFrameScheduler> m_frameScheduler;
219 220
220 int m_navigationDisableCount; 221 int m_navigationDisableCount;
221 222
222 float m_pageZoomFactor; 223 float m_pageZoomFactor;
223 float m_textZoomFactor; 224 float m_textZoomFactor;
224 225
225 bool m_inViewSourceMode; 226 bool m_inViewSourceMode;
226 227
227 Member<InstrumentingAgents> m_instrumentingAgents; 228 Member<InstrumentingAgents> m_instrumentingAgents;
228 229
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 explicit ScopedFrameBlamer(LocalFrame*); 337 explicit ScopedFrameBlamer(LocalFrame*);
337 ~ScopedFrameBlamer(); 338 ~ScopedFrameBlamer();
338 339
339 private: 340 private:
340 Member<LocalFrame> m_frame; 341 Member<LocalFrame> m_frame;
341 }; 342 };
342 343
343 } // namespace blink 344 } // namespace blink
344 345
345 #endif // LocalFrame_h 346 #endif // LocalFrame_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/frame/LocalFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698