diff options
| author | Steve Block <steveblock@google.com> | 2011-05-19 15:56:03 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-25 15:27:52 +0100 |
| commit | cbaa27bf61927b2a32fd63ff574e57035de6a968 (patch) | |
| tree | af643683d709c67b99e99bd8bee120df3f05c9e3 | |
| parent | 022577c9685aff683d1886ad93000e115dd4d686 (diff) | |
| download | external_webkit-cbaa27bf61927b2a32fd63ff574e57035de6a968.zip external_webkit-cbaa27bf61927b2a32fd63ff574e57035de6a968.tar.gz external_webkit-cbaa27bf61927b2a32fd63ff574e57035de6a968.tar.bz2 | |
Merge WebKit at r78450: FrameLoaderClient::didRunInsecureContent() signature changed
See http://trac.webkit.org/changeset/77602
Change-Id: I3a0459dba328a57688a9a2a0ae6a8d7a9121e240
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 2 | ||||
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp index 33c2920..86588ee 100644 --- a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp +++ b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp @@ -706,7 +706,7 @@ void FrameLoaderClientAndroid::didDisplayInsecureContent() notImplemented(); } -void FrameLoaderClientAndroid::didRunInsecureContent(SecurityOrigin*) +void FrameLoaderClientAndroid::didRunInsecureContent(SecurityOrigin*, const KURL&) { notImplemented(); } diff --git a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h index 25561a8..046fc73 100644 --- a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h +++ b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h @@ -135,7 +135,7 @@ namespace android { virtual bool shouldGoToHistoryItem(HistoryItem*) const; virtual void didDisplayInsecureContent(); - virtual void didRunInsecureContent(SecurityOrigin*); + virtual void didRunInsecureContent(SecurityOrigin*, const KURL&); virtual void dispatchDidAddBackForwardItem(HistoryItem*) const; virtual void dispatchDidRemoveBackForwardItem(HistoryItem*) const; |