diff options
| author | Steve Block <steveblock@google.com> | 2009-10-12 12:23:49 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-20 00:45:08 +0100 |
| commit | b20ad8a215a2ab055647d0a026a8141b4bde7ca2 (patch) | |
| tree | 6512f3c35d0b8e19911fc9016d9f75f34bbd2f32 /WebKit/android/WebCoreSupport | |
| parent | 8e465e3d03d149943a3e592c3d2af395d50917eb (diff) | |
| download | external_webkit-b20ad8a215a2ab055647d0a026a8141b4bde7ca2.zip external_webkit-b20ad8a215a2ab055647d0a026a8141b4bde7ca2.tar.gz external_webkit-b20ad8a215a2ab055647d0a026a8141b4bde7ca2.tar.bz2 | |
Merge webkit.org at R49305 : Stub out methods for mixed content in FrameLoaderClientAndroid.
See http://trac.webkit.org/changeset/48032
Change-Id: I2b4182ff87857d3dd374b34ffd1c9b46ca84db90
Diffstat (limited to 'WebKit/android/WebCoreSupport')
| -rw-r--r-- | WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 10 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h | 4 |
2 files changed, 14 insertions, 0 deletions
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp index fa4e1d4..29ebb71 100644 --- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp @@ -635,6 +635,16 @@ bool FrameLoaderClientAndroid::shouldGoToHistoryItem(HistoryItem* item) const { return item != NULL; } +void FrameLoaderClientAndroid::didDisplayInsecureContent() +{ + notImplemented(); +} + +void FrameLoaderClientAndroid::didRunInsecureContent(SecurityOrigin*) +{ + notImplemented(); +} + void FrameLoaderClientAndroid::committedLoad(DocumentLoader* loader, const char* data, int length) { ASSERT(m_frame); String encoding = loader->overrideEncoding(); diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h index 176c8be..7b3a4c8 100644 --- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h +++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h @@ -126,6 +126,10 @@ namespace android { virtual void updateGlobalHistoryRedirectLinks(); virtual bool shouldGoToHistoryItem(HistoryItem*) const; + + virtual void didDisplayInsecureContent(); + virtual void didRunInsecureContent(SecurityOrigin*); + #ifdef ANDROID_HISTORY_CLIENT virtual void dispatchDidAddHistoryItem(HistoryItem*) const; virtual void dispatchDidRemoveHistoryItem(HistoryItem*, int) const; |