Source/WebKit/chromium/src/FrameLoaderClientImpl.h - Issue 6541090: Merge 79107 - 2011-02-19 Charlie Reis <creis@chromium.org>...

Side by Side Diff: Source/WebKit/chromium/src/FrameLoaderClientImpl.h

Issue 6541090: Merge 79107 - 2011-02-19 Charlie Reis <creis@chromium.org>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/

Patch Set: Created 9 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 | « Source/WebCore/page/Page.cpp ('k') | Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2009 Google Inc. All rights reserved.	2 * Copyright (C) 2009 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 120 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
131 virtual void postProgressFinishedNotification();	131 virtual void postProgressFinishedNotification();

132 virtual void setMainFrameDocumentReady(bool);	132 virtual void setMainFrameDocumentReady(bool);

133 virtual void startDownload(const WebCore::ResourceRequest&);	133 virtual void startDownload(const WebCore::ResourceRequest&);

134 virtual void willChangeTitle(WebCore::DocumentLoader*);	134 virtual void willChangeTitle(WebCore::DocumentLoader*);

135 virtual void didChangeTitle(WebCore::DocumentLoader*);	135 virtual void didChangeTitle(WebCore::DocumentLoader*);

136 virtual void committedLoad(WebCore::DocumentLoader, const char, int);	136 virtual void committedLoad(WebCore::DocumentLoader, const char, int);

137 virtual void finishedLoading(WebCore::DocumentLoader*);	137 virtual void finishedLoading(WebCore::DocumentLoader*);

138 virtual void updateGlobalHistory();	138 virtual void updateGlobalHistory();

139 virtual void updateGlobalHistoryRedirectLinks();	139 virtual void updateGlobalHistoryRedirectLinks();

140 virtual bool shouldGoToHistoryItem(WebCore::HistoryItem*) const;	140 virtual bool shouldGoToHistoryItem(WebCore::HistoryItem*) const;

	141 virtual bool shouldStopLoadingForHistoryItem(WebCore::HistoryItem*) const;

141 virtual void dispatchDidAddBackForwardItem(WebCore::HistoryItem*) const;	142 virtual void dispatchDidAddBackForwardItem(WebCore::HistoryItem*) const;

142 virtual void dispatchDidRemoveBackForwardItem(WebCore::HistoryItem*) const;	143 virtual void dispatchDidRemoveBackForwardItem(WebCore::HistoryItem*) const;

143 virtual void dispatchDidChangeBackForwardIndex() const;	144 virtual void dispatchDidChangeBackForwardIndex() const;

144 virtual void didDisplayInsecureContent();	145 virtual void didDisplayInsecureContent();

145 virtual void didRunInsecureContent(WebCore::SecurityOrigin*);	146 virtual void didRunInsecureContent(WebCore::SecurityOrigin*);

146 virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) ;	147 virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) ;

147 virtual WebCore::ResourceError cancelledError(const WebCore::ResourceRequest &);	148 virtual WebCore::ResourceError cancelledError(const WebCore::ResourceRequest &);

148 virtual WebCore::ResourceError cannotShowURLError(const WebCore::ResourceReq uest&);	149 virtual WebCore::ResourceError cannotShowURLError(const WebCore::ResourceReq uest&);

149 virtual WebCore::ResourceError interruptForPolicyChangeError(const WebCore:: ResourceRequest&);	150 virtual WebCore::ResourceError interruptForPolicyChangeError(const WebCore:: ResourceRequest&);

150 virtual WebCore::ResourceError cannotShowMIMETypeError(const WebCore::Resour ceResponse&);	151 virtual WebCore::ResourceError cannotShowMIMETypeError(const WebCore::Resour ceResponse&);

(...skipping 93 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
244 // which specifies that the plugin should be ready to accept data.	245 // which specifies that the plugin should be ready to accept data.

245 bool m_sentInitialResponseToPlugin;	246 bool m_sentInitialResponseToPlugin;

246	247

247 // The navigation policy to use for the next call to dispatchCreatePage.	248 // The navigation policy to use for the next call to dispatchCreatePage.

248 WebNavigationPolicy m_nextNavigationPolicy;	249 WebNavigationPolicy m_nextNavigationPolicy;

249 };	250 };

250	251

251 } // namespace WebKit	252 } // namespace WebKit

252	253

253 #endif	254 #endif

OLD	NEW