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

Side by Side Diff: sky/engine/core/loader/FrameLoader.h

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: 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
« no previous file with comments | « sky/engine/core/loader/EmptyClients.h ('k') | sky/engine/core/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 * 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 class Document; 47 class Document;
48 class Event; 48 class Event;
49 class FetchContext; 49 class FetchContext;
50 class Frame; 50 class Frame;
51 class FrameLoaderClient; 51 class FrameLoaderClient;
52 class LocalFrame; 52 class LocalFrame;
53 class NavigationAction; 53 class NavigationAction;
54 class Page; 54 class Page;
55 class ResourceError; 55 class ResourceError;
56 class ResourceResponse; 56 class ResourceResponse;
57 class SerializedScriptValue;
58 57
59 class FrameLoader { 58 class FrameLoader {
60 WTF_MAKE_NONCOPYABLE(FrameLoader); 59 WTF_MAKE_NONCOPYABLE(FrameLoader);
61 public: 60 public:
62 FrameLoader(LocalFrame*); 61 FrameLoader(LocalFrame*);
63 ~FrameLoader(); 62 ~FrameLoader();
64 63
65 void init(); 64 void init();
66 65
67 LocalFrame* frame() const { return m_frame; } 66 LocalFrame* frame() const { return m_frame; }
(...skipping 17 matching lines...) Expand all
85 LocalFrame* m_frame; 84 LocalFrame* m_frame;
86 85
87 OwnPtr<FetchContext> m_fetchContext; 86 OwnPtr<FetchContext> m_fetchContext;
88 87
89 bool m_inStopAllLoaders; 88 bool m_inStopAllLoaders;
90 }; 89 };
91 90
92 } // namespace blink 91 } // namespace blink
93 92
94 #endif // SKY_ENGINE_CORE_LOADER_FRAMELOADER_H_ 93 #endif // SKY_ENGINE_CORE_LOADER_FRAMELOADER_H_
OLDNEW
« no previous file with comments | « sky/engine/core/loader/EmptyClients.h ('k') | sky/engine/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698