| OLD | NEW | 
|---|
| 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 68 class SubstituteData; | 68 class SubstituteData; | 
| 69 | 69 | 
| 70 struct FrameLoadRequest; | 70 struct FrameLoadRequest; | 
| 71 struct WindowFeatures; | 71 struct WindowFeatures; | 
| 72 | 72 | 
| 73 bool isBackForwardLoadType(FrameLoadType); | 73 bool isBackForwardLoadType(FrameLoadType); | 
| 74 | 74 | 
| 75 class FrameLoader { | 75 class FrameLoader { | 
| 76     WTF_MAKE_NONCOPYABLE(FrameLoader); | 76     WTF_MAKE_NONCOPYABLE(FrameLoader); | 
| 77 public: | 77 public: | 
|  | 78     static ResourceRequest requestFromHistoryItem(HistoryItem*, ResourceRequestC
     achePolicy); | 
|  | 79 | 
| 78     FrameLoader(LocalFrame*); | 80     FrameLoader(LocalFrame*); | 
| 79     ~FrameLoader(); | 81     ~FrameLoader(); | 
| 80 | 82 | 
| 81     void init(); | 83     void init(); | 
| 82 | 84 | 
| 83     LocalFrame* frame() const { return m_frame; } | 85     LocalFrame* frame() const { return m_frame; } | 
| 84 | 86 | 
| 85     MixedContentChecker* mixedContentChecker() const { return &m_mixedContentChe
     cker; } | 87     MixedContentChecker* mixedContentChecker() const { return &m_mixedContentChe
     cker; } | 
| 86     ProgressTracker& progress() const { return *m_progressTracker; } | 88     ProgressTracker& progress() const { return *m_progressTracker; } | 
| 87 | 89 | 
| (...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 277     Timer<FrameLoader> m_didAccessInitialDocumentTimer; | 279     Timer<FrameLoader> m_didAccessInitialDocumentTimer; | 
| 278 | 280 | 
| 279     SandboxFlags m_forcedSandboxFlags; | 281     SandboxFlags m_forcedSandboxFlags; | 
| 280 | 282 | 
| 281     bool m_willDetachClient; | 283     bool m_willDetachClient; | 
| 282 }; | 284 }; | 
| 283 | 285 | 
| 284 } // namespace WebCore | 286 } // namespace WebCore | 
| 285 | 287 | 
| 286 #endif // FrameLoader_h | 288 #endif // FrameLoader_h | 
| OLD | NEW | 
|---|