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

Side by Side Diff: Source/core/loader/FrameLoader.h

Issue 16140020: Delete NetworkingContext and its subclasses. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
4 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 4 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
5 * Copyright (C) 2011 Google Inc. All rights reserved. 5 * Copyright (C) 2011 Google Inc. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 10 *
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 namespace WebCore { 51 namespace WebCore {
52 52
53 class CachedResource; 53 class CachedResource;
54 class Chrome; 54 class Chrome;
55 class DOMWrapperWorld; 55 class DOMWrapperWorld;
56 class DocumentLoader; 56 class DocumentLoader;
57 class Event; 57 class Event;
58 class FormState; 58 class FormState;
59 class FormSubmission; 59 class FormSubmission;
60 class FrameLoaderClient; 60 class FrameLoaderClient;
61 class FrameNetworkingContext;
62 class NavigationAction; 61 class NavigationAction;
63 class NetworkingContext;
64 class Page; 62 class Page;
65 class ResourceError; 63 class ResourceError;
66 class ResourceRequest; 64 class ResourceRequest;
67 class ResourceResponse; 65 class ResourceResponse;
68 class SecurityOrigin; 66 class SecurityOrigin;
69 class SerializedScriptValue; 67 class SerializedScriptValue;
70 class StringWithDirection; 68 class StringWithDirection;
71 class SubstituteData; 69 class SubstituteData;
72 70
73 struct FrameLoadRequest; 71 struct FrameLoadRequest;
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 void started(); 248 void started();
251 249
252 enum PageDismissalType { 250 enum PageDismissalType {
253 NoDismissal = 0, 251 NoDismissal = 0,
254 BeforeUnloadDismissal = 1, 252 BeforeUnloadDismissal = 1,
255 PageHideDismissal = 2, 253 PageHideDismissal = 2,
256 UnloadDismissal = 3 254 UnloadDismissal = 3
257 }; 255 };
258 PageDismissalType pageDismissalEventBeingDispatched() const { return m_pageD ismissalEventBeingDispatched; } 256 PageDismissalType pageDismissalEventBeingDispatched() const { return m_pageD ismissalEventBeingDispatched; }
259 257
260 NetworkingContext* networkingContext() const;
261
262 void reportMemoryUsage(MemoryObjectInfo*) const; 258 void reportMemoryUsage(MemoryObjectInfo*) const;
263 259
264 private: 260 private:
265 bool allChildrenAreComplete() const; // immediate children, not all descenda nts 261 bool allChildrenAreComplete() const; // immediate children, not all descenda nts
266 262
267 void checkTimerFired(Timer<FrameLoader>*); 263 void checkTimerFired(Timer<FrameLoader>*);
268 264
269 void loadSameDocumentItem(HistoryItem*); 265 void loadSameDocumentItem(HistoryItem*);
270 void loadDifferentDocumentItem(HistoryItem*); 266 void loadDifferentDocumentItem(HistoryItem*);
271 void insertDummyHistoryItem(); 267 void insertDummyHistoryItem();
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 372
377 Frame* m_opener; 373 Frame* m_opener;
378 HashSet<Frame*> m_openedFrames; 374 HashSet<Frame*> m_openedFrames;
379 375
380 bool m_didAccessInitialDocument; 376 bool m_didAccessInitialDocument;
381 Timer<FrameLoader> m_didAccessInitialDocumentTimer; 377 Timer<FrameLoader> m_didAccessInitialDocumentTimer;
382 bool m_suppressOpenerInNewFrame; 378 bool m_suppressOpenerInNewFrame;
383 379
384 SandboxFlags m_forcedSandboxFlags; 380 SandboxFlags m_forcedSandboxFlags;
385 381
386 RefPtr<FrameNetworkingContext> m_networkingContext;
387
388 RefPtr<HistoryItem> m_requestedHistoryItem; 382 RefPtr<HistoryItem> m_requestedHistoryItem;
389 }; 383 };
390 384
391 // This function is called by createWindow() in JSDOMWindowBase.cpp, for example , for 385 // This function is called by createWindow() in JSDOMWindowBase.cpp, for example , for
392 // modal dialog creation. The lookupFrame is for looking up the frame name in c ase 386 // modal dialog creation. The lookupFrame is for looking up the frame name in c ase
393 // the frame name references a frame different from the openerFrame, e.g. when i t is 387 // the frame name references a frame different from the openerFrame, e.g. when i t is
394 // "_self" or "_parent". 388 // "_self" or "_parent".
395 // 389 //
396 // FIXME: Consider making this function part of an appropriate class (not FrameL oader) 390 // FIXME: Consider making this function part of an appropriate class (not FrameL oader)
397 // and moving it to a more appropriate location. 391 // and moving it to a more appropriate location.
398 Frame* createWindow(Frame* openerFrame, Frame* lookupFrame, const FrameLoadReque st&, const WindowFeatures&, bool& created); 392 Frame* createWindow(Frame* openerFrame, Frame* lookupFrame, const FrameLoadReque st&, const WindowFeatures&, bool& created);
399 393
400 } // namespace WebCore 394 } // namespace WebCore
401 395
402 #endif // FrameLoader_h 396 #endif // FrameLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698