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

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

Issue 7711011: Merge 93296 - Prepare frames for history navigation. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/
Patch Set: Created 9 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 | « Source/WebCore/ChangeLog ('k') | Source/WebCore/loader/FrameLoader.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) 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 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 9 *
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 void init(); 84 void init();
85 85
86 Frame* frame() const { return m_frame; } 86 Frame* frame() const { return m_frame; }
87 87
88 PolicyChecker* policyChecker() const { return &m_policyChecker; } 88 PolicyChecker* policyChecker() const { return &m_policyChecker; }
89 HistoryController* history() const { return &m_history; } 89 HistoryController* history() const { return &m_history; }
90 ResourceLoadNotifier* notifier() const { return &m_notifer; } 90 ResourceLoadNotifier* notifier() const { return &m_notifer; }
91 SubframeLoader* subframeLoader() const { return &m_subframeLoader; } 91 SubframeLoader* subframeLoader() const { return &m_subframeLoader; }
92 IconController* icon() const { return &m_icon; } 92 IconController* icon() const { return &m_icon; }
93 93
94 void prepareForHistoryNavigation();
94 void prepareForLoadStart(); 95 void prepareForLoadStart();
95 void setupForReplace(); 96 void setupForReplace();
96 97
97 // FIXME: These are all functions which start loads. We have too many. 98 // FIXME: These are all functions which start loads. We have too many.
98 void loadURLIntoChildFrame(const KURL&, const String& referer, Frame*); 99 void loadURLIntoChildFrame(const KURL&, const String& referer, Frame*);
99 void loadFrameRequest(const FrameLoadRequest&, bool lockHistory, bool lockBa ckForwardList, // Called by submitForm, calls loadPostRequest and loadURL. 100 void loadFrameRequest(const FrameLoadRequest&, bool lockHistory, bool lockBa ckForwardList, // Called by submitForm, calls loadPostRequest and loadURL.
100 PassRefPtr<Event>, PassRefPtr<FormState>, ReferrerPolicy); 101 PassRefPtr<Event>, PassRefPtr<FormState>, ReferrerPolicy);
101 102
102 void load(const ResourceRequest&, bool lockHistory); // Called by WebFrame, calls load(ResourceRequest, SubstituteDat a). 103 void load(const ResourceRequest&, bool lockHistory); // Called by WebFrame, calls load(ResourceRequest, SubstituteDat a).
103 void load(const ResourceRequest&, const SubstituteData&, bool lockHistory); // Called both by WebFrame and internally, calls load(DocumentLo ader*). 104 void load(const ResourceRequest&, const SubstituteData&, bool lockHistory); // Called both by WebFrame and internally, calls load(DocumentLo ader*).
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 // the frame name references a frame different from the openerFrame, e.g. when i t is 442 // the frame name references a frame different from the openerFrame, e.g. when i t is
442 // "_self" or "_parent". 443 // "_self" or "_parent".
443 // 444 //
444 // FIXME: Consider making this function part of an appropriate class (not FrameL oader) 445 // FIXME: Consider making this function part of an appropriate class (not FrameL oader)
445 // and moving it to a more appropriate location. 446 // and moving it to a more appropriate location.
446 Frame* createWindow(Frame* openerFrame, Frame* lookupFrame, const FrameLoadReque st&, const WindowFeatures&, bool& created); 447 Frame* createWindow(Frame* openerFrame, Frame* lookupFrame, const FrameLoadReque st&, const WindowFeatures&, bool& created);
447 448
448 } // namespace WebCore 449 } // namespace WebCore
449 450
450 #endif // FrameLoader_h 451 #endif // FrameLoader_h
OLDNEW
« no previous file with comments | « Source/WebCore/ChangeLog ('k') | Source/WebCore/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698