summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-08-04 18:53:30 +0100
committerSteve Block <steveblock@google.com>2010-08-09 13:25:53 +0100
commitc4daefab2bd7617afd2562dad5353da63d239428 (patch)
tree33053b0ab0082a5552f26ba047f2d9c19c798f79
parent9e4593fcc93d1bf0b5d5aa00b17ed2177c8eed06 (diff)
downloadexternal_webkit-c4daefab2bd7617afd2562dad5353da63d239428.zip
external_webkit-c4daefab2bd7617afd2562dad5353da63d239428.tar.gz
external_webkit-c4daefab2bd7617afd2562dad5353da63d239428.tar.bz2
Merge WebKit at r64523 : Stub out ChromeClient::reachedApplicationCacheOriginQuota() for Android
See http://trac.webkit.org/changeset/64400 Change-Id: Ia72d447c94bcfd918876e4549a296dc88ab3abfa
-rw-r--r--WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp5
-rw-r--r--WebKit/android/WebCoreSupport/ChromeClientAndroid.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
index 3b46ffc..45de0d5 100644
--- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
@@ -526,6 +526,11 @@ PassRefPtr<SearchPopupMenu> ChromeClientAndroid::createSearchPopupMenu(PopupMenu
return adoptRef(new SearchPopupMenuAndroid);
}
+void ChromeClientAndroid::reachedApplicationCacheOriginQuota(SecurityOrigin*)
+{
+ notImplemented();
+}
+
#if ENABLE(ANDROID_INSTALLABLE_WEB_APPS)
void ChromeClientAndroid::webAppCanBeInstalled()
{
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
index 8fe01dd..7137e11 100644
--- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
+++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
@@ -134,6 +134,7 @@ namespace android {
#endif
#if ENABLE(OFFLINE_WEB_APPLICATIONS)
virtual void reachedMaxAppCacheSize(int64_t spaceNeeded);
+ virtual void reachedApplicationCacheOriginQuota(SecurityOrigin*);
#endif
virtual void populateVisitedLinks();