diff options
| author | Patrick Scott <phanna@android.com> | 2010-02-22 12:44:41 -0500 |
|---|---|---|
| committer | Patrick Scott <phanna@android.com> | 2010-02-23 10:22:50 -0500 |
| commit | 48633eb761269223d399736219ca400d62df8027 (patch) | |
| tree | e68df9fb2daae3aeea7666d1ff44a781add1b203 /WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h | |
| parent | 15027de75d16455fd1e449b771fac8fd2cf88233 (diff) | |
| download | external_webkit-48633eb761269223d399736219ca400d62df8027.zip external_webkit-48633eb761269223d399736219ca400d62df8027.tar.gz external_webkit-48633eb761269223d399736219ca400d62df8027.tar.bz2 | |
Do not merge.
Implement redirectDataToPlugin.
This fixes going to swf files directly (i.e. http://foo.com/bar.swf).
Bug: 2435632
Diffstat (limited to 'WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h')
| -rw-r--r-- | WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h index ddf0deb..2fb552c 100644 --- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h +++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h @@ -31,6 +31,10 @@ #include "ResourceResponse.h" #include "WebIconDatabase.h" +namespace WebCore { +class PluginManualLoader; +} + using namespace WebCore; namespace android { @@ -205,9 +209,11 @@ namespace android { // FIXME: this doesn't really go here, but it's better than Frame CacheBuilder& getCacheBuilder() { return m_cacheBuilder; } private: - CacheBuilder m_cacheBuilder; + CacheBuilder m_cacheBuilder; Frame* m_frame; - WebFrame* m_webFrame; + WebFrame* m_webFrame; + PluginManualLoader* m_manualLoader; + bool m_hasSentResponseToPlugin; enum ResourceErrors { InternalErrorCancelled = -99, |