diff options
| author | John Reck <jreck@google.com> | 2010-11-04 14:56:49 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2010-11-09 11:38:14 -0800 |
| commit | f1f796b0c3a725a520ac41959a0db7855480e9de (patch) | |
| tree | dfa931af62e1018300d091a02c78eb80573f6c3e /WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | |
| parent | a7c57d04cd472b56dc816aff1a1203cfc7bb24b0 (diff) | |
| download | external_webkit-f1f796b0c3a725a520ac41959a0db7855480e9de.zip external_webkit-f1f796b0c3a725a520ac41959a0db7855480e9de.tar.gz external_webkit-f1f796b0c3a725a520ac41959a0db7855480e9de.tar.bz2 | |
Merge Webkit at r70949: Added new FrameLoaderClient stubs
http://trac.webkit.org/changeset/70333
http://trac.webkit.org/changeset/70574
http://trac.webkit.org/changeset/70894
Change-Id: I9a212f4ab07c0599ebb8dbd10201f5ca0fa71f69
Diffstat (limited to 'WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp')
| -rw-r--r-- | WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp index 1903f2e..d622719 100644 --- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp @@ -411,7 +411,7 @@ void FrameLoaderClientAndroid::dispatchDidFirstVisuallyNonEmptyLayout() notImplemented(); } -Frame* FrameLoaderClientAndroid::dispatchCreatePage() { +Frame* FrameLoaderClientAndroid::dispatchCreatePage(const NavigationAction&) { ASSERT(m_frame); #ifdef ANDROID_MULTIPLE_WINDOWS if (m_frame->settings() && m_frame->settings()->supportMultipleWindows()) @@ -926,6 +926,10 @@ void FrameLoaderClientAndroid::transitionToCommittedForNewPage() { m_webFrame->transitionToCommitted(m_frame); } +void FrameLoaderClientAndroid::dispatchDidBecomeFrameset(bool) +{ +} + bool FrameLoaderClientAndroid::canCachePage() const { return true; } @@ -1244,6 +1248,11 @@ void FrameLoaderClientAndroid::didTransferChildFrameToNewDocument(WebCore::Page* } } +void FrameLoaderClientAndroid::transferLoadingResourceFromPage(unsigned long, DocumentLoader*, const ResourceRequest&, Page*) +{ + notImplemented(); +} + // This function is used by the <OBJECT> element to determine the type of // the contents and work out if it can render it. ObjectContentType FrameLoaderClientAndroid::objectContentType(const KURL& url, |