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

Side by Side Diff: Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.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/WebKit/efl/ChangeLog ('k') | Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2006 Zack Rusin <zack@kde.org>	2 * Copyright (C) 2006 Zack Rusin <zack@kde.org>

3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.	3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.

4 * Copyright (C) 2008 Collabora Ltd. All rights reserved.	4 * Copyright (C) 2008 Collabora Ltd. All rights reserved.

5 * Copyright (C) 2008 INdT - Instituto Nokia de Tecnologia	5 * Copyright (C) 2008 INdT - Instituto Nokia de Tecnologia

6 * Copyright (C) 2009-2010 ProFUSION embedded systems	6 * Copyright (C) 2009-2010 ProFUSION embedded systems

7 * Copyright (C) 2009-2010 Samsung Electronics	7 * Copyright (C) 2009-2010 Samsung Electronics

8 *	8 *

9 * All rights reserved.	9 * All rights reserved.

10 *	10 *

(...skipping 146 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
157	157

158 virtual void willChangeTitle(DocumentLoader*);	158 virtual void willChangeTitle(DocumentLoader*);

159 virtual void didChangeTitle(DocumentLoader*);	159 virtual void didChangeTitle(DocumentLoader*);

160	160

161 virtual void committedLoad(DocumentLoader, const char, int);	161 virtual void committedLoad(DocumentLoader, const char, int);

162 virtual void finishedLoading(DocumentLoader*);	162 virtual void finishedLoading(DocumentLoader*);

163	163

164 virtual void updateGlobalHistory();	164 virtual void updateGlobalHistory();

165 virtual void updateGlobalHistoryRedirectLinks();	165 virtual void updateGlobalHistoryRedirectLinks();

166 virtual bool shouldGoToHistoryItem(HistoryItem*) const;	166 virtual bool shouldGoToHistoryItem(HistoryItem*) const;

	167 virtual bool shouldStopLoadingForHistoryItem(HistoryItem*) const;

167 virtual void didDisplayInsecureContent();	168 virtual void didDisplayInsecureContent();

168 virtual void didRunInsecureContent(SecurityOrigin*);	169 virtual void didRunInsecureContent(SecurityOrigin*);

169	170

170 virtual ResourceError cancelledError(const ResourceRequest&);	171 virtual ResourceError cancelledError(const ResourceRequest&);

171 virtual ResourceError blockedError(const ResourceRequest&);	172 virtual ResourceError blockedError(const ResourceRequest&);

172 virtual ResourceError cannotShowURLError(const ResourceRequest&);	173 virtual ResourceError cannotShowURLError(const ResourceRequest&);

173 virtual ResourceError interruptForPolicyChangeError(const ResourceRequest&);	174 virtual ResourceError interruptForPolicyChangeError(const ResourceRequest&);

174	175

175 virtual ResourceError cannotShowMIMETypeError(const ResourceResponse&);	176 virtual ResourceError cannotShowMIMETypeError(const ResourceResponse&);

176 virtual ResourceError fileDoesNotExistError(const ResourceResponse&);	177 virtual ResourceError fileDoesNotExistError(const ResourceResponse&);

(...skipping 43 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
220 ResourceError m_loadError;	221 ResourceError m_loadError;

221	222

222 // Plugin view to redirect data to	223 // Plugin view to redirect data to

223 PluginView* m_pluginView;	224 PluginView* m_pluginView;

224 bool m_hasSentResponseToPlugin;	225 bool m_hasSentResponseToPlugin;

225 };	226 };

226	227

227 }	228 }

228	229

229 #endif // FrameLoaderClientEfl_h	230 #endif // FrameLoaderClientEfl_h

OLD	NEW