Always enable ENABLE(OFFLINE_WEB_APPLICATIONS)
authorabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 25 Sep 2011 06:04:46 +0000 (06:04 +0000)
committerabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 25 Sep 2011 06:04:46 +0000 (06:04 +0000)
https://bugs.webkit.org/show_bug.cgi?id=68767

Reviewed by Eric Seidel.

.:

* Source/cmake/OptionsEfl.cmake:
* Source/cmake/OptionsWinCE.cmake:
* Source/cmakeconfig.h.cmake:
* configure.ac:

Source/JavaScriptCore:

* Configurations/FeatureDefines.xcconfig:

Source/WebCore:

As discussed on webkit-dev, almost everyone has this enable turned on
and this feature is unlikely to be removed from the web platform given
its popularity.

* CMakeLists.txt:
* Configurations/FeatureDefines.xcconfig:
* GNUmakefile.am:
* GNUmakefile.list.am:
* WebCore.exp.in:
* WebCore.pro:
* bindings/cpp/WebDOMEventTarget.cpp:
(toWebKit):
* bindings/js/JSEventTarget.cpp:
(WebCore::toJS):
(WebCore::toEventTarget):
* bindings/v8/V8DOMWrapper.cpp:
(WebCore::V8DOMWrapper::convertEventTargetToV8Object):
* dom/EventTarget.cpp:
(WebCore::EventTarget::toDOMApplicationCache):
* dom/EventTarget.h:
* features.pri:
* history/PageCache.cpp:
(WebCore::logCanCacheFrameDecision):
(WebCore::PageCache::canCachePageContainingThisFrame):
* html/HTMLHtmlElement.cpp:
(WebCore::HTMLHtmlElement::insertedByParser):
* html/HTMLHtmlElement.h:
* html/HTMLMediaElement.cpp:
(WebCore::createFileURLForApplicationCacheResource):
(WebCore::HTMLMediaElement::loadResource):
* html/ImageDocument.cpp:
(WebCore::ImageDocument::createDocumentStructure):
* html/MediaDocument.cpp:
(WebCore::MediaDocumentParser::createDocumentStructure):
* html/PluginDocument.cpp:
(WebCore::PluginDocumentParser::createDocumentStructure):
* html/parser/HTMLConstructionSite.cpp:
(WebCore::HTMLConstructionSite::insertHTMLHtmlStartTagBeforeHTML):
* inspector/InspectorApplicationCacheAgent.cpp:
* inspector/InspectorApplicationCacheAgent.h:
* inspector/InspectorController.cpp:
(WebCore::InspectorController::InspectorController):
(WebCore::InspectorController::connectFrontend):
(WebCore::InspectorController::disconnectFrontend):
* inspector/InspectorController.h:
* inspector/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::updateApplicationCacheStatusImpl):
* inspector/InspectorInstrumentation.h:
(WebCore::InspectorInstrumentation::networkStateChanged):
(WebCore::InspectorInstrumentation::updateApplicationCacheStatus):
* inspector/InstrumentingAgents.h:
(WebCore::InstrumentingAgents::InstrumentingAgents):
(WebCore::InstrumentingAgents::setInspectorApplicationCacheAgent):
* inspector/WorkerInspectorController.cpp:
(WebCore::WorkerInspectorController::connectFrontend):
* inspector/generate-inspector-idl:
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::DocumentLoader):
(WebCore::DocumentLoader::mainReceivedError):
(WebCore::DocumentLoader::stopLoading):
(WebCore::DocumentLoader::detachFromFrame):
(WebCore::DocumentLoader::handledOnloadEvents):
* loader/DocumentLoader.h:
(WebCore::DocumentLoader::applicationCacheHost):
* loader/EmptyClients.h:
(WebCore::EmptyChromeClient::reachedApplicationCacheOriginQuota):
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::loadResourceSynchronously):
* loader/MainResourceLoader.cpp:
(WebCore::MainResourceLoader::willSendRequest):
(WebCore::MainResourceLoader::didReceiveResponse):
(WebCore::MainResourceLoader::didReceiveData):
(WebCore::MainResourceLoader::didFinishLoading):
(WebCore::MainResourceLoader::didFail):
(WebCore::MainResourceLoader::load):
* loader/ResourceLoader.cpp:
(WebCore::ResourceLoader::start):
(WebCore::ResourceLoader::willSendRequest):
(WebCore::ResourceLoader::didSendData):
(WebCore::ResourceLoader::didReceiveResponse):
(WebCore::ResourceLoader::didReceiveData):
(WebCore::ResourceLoader::didFinishLoading):
(WebCore::ResourceLoader::didFail):
(WebCore::ResourceLoader::wasBlocked):
(WebCore::ResourceLoader::cannotShowURL):
(WebCore::ResourceLoader::shouldUseCredentialStorage):
(WebCore::ResourceLoader::willCacheResponse):
* loader/ResourceLoader.h:
* loader/appcache/ApplicationCache.cpp:
* loader/appcache/ApplicationCache.h:
* loader/appcache/ApplicationCacheGroup.cpp:
* loader/appcache/ApplicationCacheGroup.h:
* loader/appcache/ApplicationCacheHost.cpp:
* loader/appcache/ApplicationCacheHost.h:
* loader/appcache/ApplicationCacheResource.cpp:
* loader/appcache/ApplicationCacheResource.h:
* loader/appcache/ApplicationCacheStorage.cpp:
* loader/appcache/ApplicationCacheStorage.h:
* loader/appcache/DOMApplicationCache.cpp:
* loader/appcache/DOMApplicationCache.h:
* loader/appcache/DOMApplicationCache.idl:
* loader/appcache/ManifestParser.cpp:
(WebCore::parseManifest):
* loader/appcache/ManifestParser.h:
* loader/chromium/ResourceLoaderChromium.cpp:
(WebCore::ResourceLoader::didDownloadData):
* page/ChromeClient.h:
* page/DOMWindow.cpp:
(WebCore::DOMWindow::clear):
(WebCore::DOMWindow::applicationCache):
* page/DOMWindow.h:
(WebCore::DOMWindow::optionalApplicationCache):
* page/DOMWindow.idl:
* xml/parser/XMLDocumentParserLibxml2.cpp:
(WebCore::XMLDocumentParser::startElementNs):
* xml/parser/XMLDocumentParserQt.cpp:
(WebCore::XMLDocumentParser::parseStartElement):

Source/WebKit/chromium:

* features.gypi:
* src/ApplicationCacheHost.cpp:
* src/ApplicationCacheHostInternal.h:
* src/AssertMatchingEnums.cpp:
* src/ChromeClientImpl.cpp:
(WebKit::ChromeClientImpl::reachedApplicationCacheOriginQuota):
* src/ChromeClientImpl.h:
* src/WebDataSourceImpl.cpp:
(WebKit::WebDataSourceImpl::applicationCacheHost):
* src/WebRuntimeFeatures.cpp:
(WebKit::WebRuntimeFeatures::enableApplicationCache):
(WebKit::WebRuntimeFeatures::isApplicationCacheEnabled):

Source/WebKit/efl:

* WebCoreSupport/ChromeClientEfl.cpp:
(WebCore::ChromeClientEfl::reachedApplicationCacheOriginQuota):
* WebCoreSupport/ChromeClientEfl.h:
* ewk/ewk_main.cpp:
(_ewk_init_body):
* ewk/ewk_settings.cpp:
(ewk_settings_cache_directory_path_set):
(ewk_settings_cache_directory_path_get):

Source/WebKit/gtk:

* WebCoreSupport/ChromeClientGtk.cpp:
(WebKit::ChromeClient::reachedApplicationCacheOriginQuota):
* WebCoreSupport/ChromeClientGtk.h:
* webkit/webkitapplicationcache.cpp:
(webkit_application_cache_get_maximum_size):
(webkit_application_cache_set_maximum_size):
(webkit_application_cache_get_database_directory_path):
* webkit/webkitglobals.cpp:
(webkitInit):

Source/WebKit/haiku:

* WebCoreSupport/ChromeClientHaiku.cpp:
(WebCore::ChromeClientWx::reachedApplicationCacheOriginQuota):
* WebCoreSupport/ChromeClientHaiku.h:

Source/WebKit/mac:

* Configurations/FeatureDefines.xcconfig:
* Misc/WebCache.mm:
(+[WebCache empty]):
* WebCoreSupport/WebApplicationCache.mm:
* WebCoreSupport/WebApplicationCacheQuotaManager.mm:
(-[WebApplicationCacheQuotaManager usage]):
(-[WebApplicationCacheQuotaManager quota]):
(-[WebApplicationCacheQuotaManager setQuota:]):
* WebCoreSupport/WebChromeClient.h:
* WebCoreSupport/WebChromeClient.mm:
* WebView/WebDataSource.mm:
(-[WebDataSource _transferApplicationCache:]):
* WebView/WebFrame.mm:
(-[WebFrame _cacheabilityDictionary]):
* WebView/WebView.mm:
(WebKitInitializeApplicationCachePathIfNecessary):

Source/WebKit/qt:

* Api/qwebsecurityorigin.cpp:
(QWebSecurityOrigin::setApplicationCacheQuota):
* Api/qwebsettings.cpp:
(QWebSettings::setOfflineWebApplicationCachePath):
(QWebSettings::offlineWebApplicationCachePath):
(QWebSettings::setOfflineWebApplicationCacheQuota):
(QWebSettings::offlineWebApplicationCacheQuota):
* WebCoreSupport/ChromeClientQt.cpp:
(WebCore::ChromeClientQt::reachedApplicationCacheOriginQuota):
* WebCoreSupport/ChromeClientQt.h:
* WebCoreSupport/DumpRenderTreeSupportQt.cpp:
(DumpRenderTreeSupportQt::clearAllApplicationCaches):

Source/WebKit/win:

* WebCoreSupport/WebChromeClient.cpp:
(WebChromeClient::reachedApplicationCacheOriginQuota):
* WebCoreSupport/WebChromeClient.h:

Source/WebKit/wince:

* WebCoreSupport/ChromeClientWinCE.cpp:
(WebKit::ChromeClientWinCE::reachedApplicationCacheOriginQuota):
* WebCoreSupport/ChromeClientWinCE.h:

Source/WebKit/wx:

* WebKitSupport/ChromeClientWx.cpp:
(WebCore::ChromeClientWx::reachedApplicationCacheOriginQuota):
* WebKitSupport/ChromeClientWx.h:

Source/WebKit2:

* Configurations/FeatureDefines.xcconfig:
* UIProcess/qt/WebContextQt.cpp:
(WebKit::WebContext::applicationCacheDirectory):
* WebProcess/ApplicationCache/WebApplicationCacheManager.cpp:
(WebKit::WebApplicationCacheManager::getApplicationCacheOrigins):
(WebKit::WebApplicationCacheManager::deleteEntriesForOrigin):
(WebKit::WebApplicationCacheManager::deleteAllEntries):
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::reachedApplicationCacheOriginQuota):
* WebProcess/WebCoreSupport/WebChromeClient.h:
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::initializeWebProcess):
(WebKit::WebProcess::clearApplicationCache):
* WebProcess/WebProcess.h:

Tools:

* Scripts/build-webkit:

WebKitLibraries:

* win/tools/vsprops/FeatureDefines.vsprops:
* win/tools/vsprops/FeatureDefinesCairo.vsprops:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@95919 268f45cc-cd09-0410-ab3c-d52691b4dbfc

126 files changed:
ChangeLog
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/GNUmakefile.am
Source/WebCore/GNUmakefile.list.am
Source/WebCore/WebCore.exp.in
Source/WebCore/WebCore.pro
Source/WebCore/bindings/cpp/WebDOMEventTarget.cpp
Source/WebCore/bindings/js/JSEventTarget.cpp
Source/WebCore/bindings/v8/V8DOMWrapper.cpp
Source/WebCore/dom/EventTarget.cpp
Source/WebCore/dom/EventTarget.h
Source/WebCore/features.pri
Source/WebCore/history/PageCache.cpp
Source/WebCore/html/HTMLHtmlElement.cpp
Source/WebCore/html/HTMLHtmlElement.h
Source/WebCore/html/HTMLMediaElement.cpp
Source/WebCore/html/ImageDocument.cpp
Source/WebCore/html/MediaDocument.cpp
Source/WebCore/html/PluginDocument.cpp
Source/WebCore/html/parser/HTMLConstructionSite.cpp
Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp
Source/WebCore/inspector/InspectorApplicationCacheAgent.h
Source/WebCore/inspector/InspectorController.cpp
Source/WebCore/inspector/InspectorController.h
Source/WebCore/inspector/InspectorInstrumentation.cpp
Source/WebCore/inspector/InspectorInstrumentation.h
Source/WebCore/inspector/InstrumentingAgents.h
Source/WebCore/inspector/WorkerInspectorController.cpp
Source/WebCore/inspector/generate-inspector-idl
Source/WebCore/loader/DocumentLoader.cpp
Source/WebCore/loader/DocumentLoader.h
Source/WebCore/loader/EmptyClients.h
Source/WebCore/loader/FrameLoader.cpp
Source/WebCore/loader/MainResourceLoader.cpp
Source/WebCore/loader/ResourceLoader.cpp
Source/WebCore/loader/ResourceLoader.h
Source/WebCore/loader/appcache/ApplicationCache.cpp
Source/WebCore/loader/appcache/ApplicationCache.h
Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp
Source/WebCore/loader/appcache/ApplicationCacheGroup.h
Source/WebCore/loader/appcache/ApplicationCacheHost.cpp
Source/WebCore/loader/appcache/ApplicationCacheHost.h
Source/WebCore/loader/appcache/ApplicationCacheResource.cpp
Source/WebCore/loader/appcache/ApplicationCacheResource.h
Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp
Source/WebCore/loader/appcache/ApplicationCacheStorage.h
Source/WebCore/loader/appcache/DOMApplicationCache.cpp
Source/WebCore/loader/appcache/DOMApplicationCache.h
Source/WebCore/loader/appcache/DOMApplicationCache.idl
Source/WebCore/loader/appcache/ManifestParser.cpp
Source/WebCore/loader/appcache/ManifestParser.h
Source/WebCore/loader/chromium/ResourceLoaderChromium.cpp
Source/WebCore/page/ChromeClient.h
Source/WebCore/page/DOMWindow.cpp
Source/WebCore/page/DOMWindow.h
Source/WebCore/page/DOMWindow.idl
Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp
Source/WebCore/xml/parser/XMLDocumentParserQt.cpp
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/features.gypi
Source/WebKit/chromium/src/ApplicationCacheHost.cpp
Source/WebKit/chromium/src/ApplicationCacheHostInternal.h
Source/WebKit/chromium/src/AssertMatchingEnums.cpp
Source/WebKit/chromium/src/ChromeClientImpl.cpp
Source/WebKit/chromium/src/ChromeClientImpl.h
Source/WebKit/chromium/src/WebDataSourceImpl.cpp
Source/WebKit/chromium/src/WebRuntimeFeatures.cpp
Source/WebKit/efl/ChangeLog
Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp
Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h
Source/WebKit/efl/ewk/ewk_main.cpp
Source/WebKit/efl/ewk/ewk_settings.cpp
Source/WebKit/gtk/ChangeLog
Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h
Source/WebKit/gtk/webkit/webkitapplicationcache.cpp
Source/WebKit/gtk/webkit/webkitglobals.cpp
Source/WebKit/haiku/ChangeLog
Source/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp
Source/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
Source/WebKit/mac/Misc/WebCache.mm
Source/WebKit/mac/WebCoreSupport/WebApplicationCache.mm
Source/WebKit/mac/WebCoreSupport/WebApplicationCacheQuotaManager.mm
Source/WebKit/mac/WebCoreSupport/WebChromeClient.h
Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm
Source/WebKit/mac/WebView/WebDataSource.mm
Source/WebKit/mac/WebView/WebFrame.mm
Source/WebKit/mac/WebView/WebView.mm
Source/WebKit/qt/Api/qwebsecurityorigin.cpp
Source/WebKit/qt/Api/qwebsettings.cpp
Source/WebKit/qt/ChangeLog
Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h
Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
Source/WebKit/win/ChangeLog
Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp
Source/WebKit/win/WebCoreSupport/WebChromeClient.h
Source/WebKit/wince/ChangeLog
Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp
Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h
Source/WebKit/wx/ChangeLog
Source/WebKit/wx/WebKitSupport/ChromeClientWx.cpp
Source/WebKit/wx/WebKitSupport/ChromeClientWx.h
Source/WebKit2/ChangeLog
Source/WebKit2/Configurations/FeatureDefines.xcconfig
Source/WebKit2/UIProcess/qt/WebContextQt.cpp
Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h
Source/WebKit2/WebProcess/WebProcess.cpp
Source/WebKit2/WebProcess/WebProcess.h
Source/cmake/OptionsEfl.cmake
Source/cmake/OptionsWinCE.cmake
Source/cmakeconfig.h.cmake
Tools/ChangeLog
Tools/Scripts/build-webkit
WebKitLibraries/ChangeLog
WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops
configure.ac

index 1969f95..453bd4a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2011-09-24  Adam Barth  <abarth@webkit.org>
 
+        Always enable ENABLE(OFFLINE_WEB_APPLICATIONS)
+        https://bugs.webkit.org/show_bug.cgi?id=68767
+
+        Reviewed by Eric Seidel.
+
+        * Source/cmake/OptionsEfl.cmake:
+        * Source/cmake/OptionsWinCE.cmake:
+        * Source/cmakeconfig.h.cmake:
+        * configure.ac:
+
+2011-09-24  Adam Barth  <abarth@webkit.org>
+
         Remove ENABLE(WCSS) and associated code
         https://bugs.webkit.org/show_bug.cgi?id=68759
 
index 2b4e7df..bef64f4 100644 (file)
@@ -1,3 +1,12 @@
+2011-09-24  Adam Barth  <abarth@webkit.org>
+
+        Always enable ENABLE(OFFLINE_WEB_APPLICATIONS)
+        https://bugs.webkit.org/show_bug.cgi?id=68767
+
+        Reviewed by Eric Seidel.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2011-09-24  Filip Pizlo  <fpizlo@apple.com>
 
         JIT implementation of put_by_val increments m_length instead of setting
index 2fbf8cf..9b447a1 100644 (file)
@@ -78,7 +78,6 @@ ENABLE_METER_TAG = ENABLE_METER_TAG;
 ENABLE_MHTML = ;
 ENABLE_MUTATION_OBSERVERS = ;
 ENABLE_NOTIFICATIONS = ;
-ENABLE_OFFLINE_WEB_APPLICATIONS = ENABLE_OFFLINE_WEB_APPLICATIONS;
 ENABLE_PAGE_VISIBILITY_API = ;
 ENABLE_PROGRESS_TAG = ENABLE_PROGRESS_TAG;
 ENABLE_QUOTA = ;
@@ -98,4 +97,4 @@ ENABLE_XHTMLMP = ;
 ENABLE_XPATH = ENABLE_XPATH;
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_REGIONS) $(ENABLE_SQL_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_REGIONS) $(ENABLE_SQL_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
index 2e5b4c2..e798380 100644 (file)
@@ -315,6 +315,8 @@ SET(WebCore_IDL_FILES
     inspector/ScriptProfile.idl
     inspector/ScriptProfileNode.idl
 
+    loader/appcache/DOMApplicationCache.idl
+
     page/BarInfo.idl
     page/Console.idl
     page/Coordinates.idl
@@ -2166,12 +2168,6 @@ IF (ENABLE_WEBGL)
     )
 ENDIF ()
 
-IF (ENABLE_OFFLINE_WEB_APPLICATIONS)
-    LIST(APPEND WebCore_IDL_FILES
-        loader/appcache/DOMApplicationCache.idl
-    )
-ENDIF ()
-
 # Modules that the bindings generator scripts may use
 SET(SCRIPTS_BINDINGS
     ${WEBCORE_DIR}/bindings/scripts/IDLParser.pm
index 8d7d1b1..7a1ed2a 100644 (file)
@@ -1,5 +1,130 @@
 2011-09-24  Adam Barth  <abarth@webkit.org>
 
+        Always enable ENABLE(OFFLINE_WEB_APPLICATIONS)
+        https://bugs.webkit.org/show_bug.cgi?id=68767
+
+        Reviewed by Eric Seidel.
+
+        As discussed on webkit-dev, almost everyone has this enable turned on
+        and this feature is unlikely to be removed from the web platform given
+        its popularity.
+
+        * CMakeLists.txt:
+        * Configurations/FeatureDefines.xcconfig:
+        * GNUmakefile.am:
+        * GNUmakefile.list.am:
+        * WebCore.exp.in:
+        * WebCore.pro:
+        * bindings/cpp/WebDOMEventTarget.cpp:
+        (toWebKit):
+        * bindings/js/JSEventTarget.cpp:
+        (WebCore::toJS):
+        (WebCore::toEventTarget):
+        * bindings/v8/V8DOMWrapper.cpp:
+        (WebCore::V8DOMWrapper::convertEventTargetToV8Object):
+        * dom/EventTarget.cpp:
+        (WebCore::EventTarget::toDOMApplicationCache):
+        * dom/EventTarget.h:
+        * features.pri:
+        * history/PageCache.cpp:
+        (WebCore::logCanCacheFrameDecision):
+        (WebCore::PageCache::canCachePageContainingThisFrame):
+        * html/HTMLHtmlElement.cpp:
+        (WebCore::HTMLHtmlElement::insertedByParser):
+        * html/HTMLHtmlElement.h:
+        * html/HTMLMediaElement.cpp:
+        (WebCore::createFileURLForApplicationCacheResource):
+        (WebCore::HTMLMediaElement::loadResource):
+        * html/ImageDocument.cpp:
+        (WebCore::ImageDocument::createDocumentStructure):
+        * html/MediaDocument.cpp:
+        (WebCore::MediaDocumentParser::createDocumentStructure):
+        * html/PluginDocument.cpp:
+        (WebCore::PluginDocumentParser::createDocumentStructure):
+        * html/parser/HTMLConstructionSite.cpp:
+        (WebCore::HTMLConstructionSite::insertHTMLHtmlStartTagBeforeHTML):
+        * inspector/InspectorApplicationCacheAgent.cpp:
+        * inspector/InspectorApplicationCacheAgent.h:
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::InspectorController):
+        (WebCore::InspectorController::connectFrontend):
+        (WebCore::InspectorController::disconnectFrontend):
+        * inspector/InspectorController.h:
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore::InspectorInstrumentation::updateApplicationCacheStatusImpl):
+        * inspector/InspectorInstrumentation.h:
+        (WebCore::InspectorInstrumentation::networkStateChanged):
+        (WebCore::InspectorInstrumentation::updateApplicationCacheStatus):
+        * inspector/InstrumentingAgents.h:
+        (WebCore::InstrumentingAgents::InstrumentingAgents):
+        (WebCore::InstrumentingAgents::setInspectorApplicationCacheAgent):
+        * inspector/WorkerInspectorController.cpp:
+        (WebCore::WorkerInspectorController::connectFrontend):
+        * inspector/generate-inspector-idl:
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::DocumentLoader):
+        (WebCore::DocumentLoader::mainReceivedError):
+        (WebCore::DocumentLoader::stopLoading):
+        (WebCore::DocumentLoader::detachFromFrame):
+        (WebCore::DocumentLoader::handledOnloadEvents):
+        * loader/DocumentLoader.h:
+        (WebCore::DocumentLoader::applicationCacheHost):
+        * loader/EmptyClients.h:
+        (WebCore::EmptyChromeClient::reachedApplicationCacheOriginQuota):
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::loadResourceSynchronously):
+        * loader/MainResourceLoader.cpp:
+        (WebCore::MainResourceLoader::willSendRequest):
+        (WebCore::MainResourceLoader::didReceiveResponse):
+        (WebCore::MainResourceLoader::didReceiveData):
+        (WebCore::MainResourceLoader::didFinishLoading):
+        (WebCore::MainResourceLoader::didFail):
+        (WebCore::MainResourceLoader::load):
+        * loader/ResourceLoader.cpp:
+        (WebCore::ResourceLoader::start):
+        (WebCore::ResourceLoader::willSendRequest):
+        (WebCore::ResourceLoader::didSendData):
+        (WebCore::ResourceLoader::didReceiveResponse):
+        (WebCore::ResourceLoader::didReceiveData):
+        (WebCore::ResourceLoader::didFinishLoading):
+        (WebCore::ResourceLoader::didFail):
+        (WebCore::ResourceLoader::wasBlocked):
+        (WebCore::ResourceLoader::cannotShowURL):
+        (WebCore::ResourceLoader::shouldUseCredentialStorage):
+        (WebCore::ResourceLoader::willCacheResponse):
+        * loader/ResourceLoader.h:
+        * loader/appcache/ApplicationCache.cpp:
+        * loader/appcache/ApplicationCache.h:
+        * loader/appcache/ApplicationCacheGroup.cpp:
+        * loader/appcache/ApplicationCacheGroup.h:
+        * loader/appcache/ApplicationCacheHost.cpp:
+        * loader/appcache/ApplicationCacheHost.h:
+        * loader/appcache/ApplicationCacheResource.cpp:
+        * loader/appcache/ApplicationCacheResource.h:
+        * loader/appcache/ApplicationCacheStorage.cpp:
+        * loader/appcache/ApplicationCacheStorage.h:
+        * loader/appcache/DOMApplicationCache.cpp:
+        * loader/appcache/DOMApplicationCache.h:
+        * loader/appcache/DOMApplicationCache.idl:
+        * loader/appcache/ManifestParser.cpp:
+        (WebCore::parseManifest):
+        * loader/appcache/ManifestParser.h:
+        * loader/chromium/ResourceLoaderChromium.cpp:
+        (WebCore::ResourceLoader::didDownloadData):
+        * page/ChromeClient.h:
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::clear):
+        (WebCore::DOMWindow::applicationCache):
+        * page/DOMWindow.h:
+        (WebCore::DOMWindow::optionalApplicationCache):
+        * page/DOMWindow.idl:
+        * xml/parser/XMLDocumentParserLibxml2.cpp:
+        (WebCore::XMLDocumentParser::startElementNs):
+        * xml/parser/XMLDocumentParserQt.cpp:
+        (WebCore::XMLDocumentParser::parseStartElement):
+
+2011-09-24  Adam Barth  <abarth@webkit.org>
+
         Remove ENABLE(WCSS) and associated code
         https://bugs.webkit.org/show_bug.cgi?id=68759
 
index 9a0db3d..4375f0f 100644 (file)
@@ -76,7 +76,6 @@ ENABLE_METER_TAG = ENABLE_METER_TAG;
 ENABLE_MHTML = ;
 ENABLE_MUTATION_OBSERVERS = ;
 ENABLE_NOTIFICATIONS = ;
-ENABLE_OFFLINE_WEB_APPLICATIONS = ENABLE_OFFLINE_WEB_APPLICATIONS;
 ENABLE_PAGE_VISIBILITY_API = ;
 ENABLE_PROGRESS_TAG = ENABLE_PROGRESS_TAG;
 ENABLE_QUOTA = ;
@@ -97,4 +96,4 @@ ENABLE_XHTMLMP = ;
 ENABLE_XPATH = ENABLE_XPATH;
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_SQL_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_SQL_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
index 6f21985..5a3d7cf 100644 (file)
@@ -173,14 +173,6 @@ webcore_cppflags += -DENABLE_JAVASCRIPT_DEBUGGER=0
 endif # END ENABLE_JAVASCRIPT_DEBUGGER
 
 # ----
-# Offline Web Applications
-# ----
-if ENABLE_OFFLINE_WEB_APPLICATIONS
-FEATURE_DEFINES += ENABLE_OFFLINE_WEB_APPLICATIONS=1
-webcore_cppflags += -DENABLE_OFFLINE_WEB_APPLICATIONS=1
-endif # END ENABLE_OFFLINE_WEB_APPLICATIONS
-
-# ----
 # Database Support
 # ----
 if ENABLE_SQL_DATABASE
index 8a46434..ef80a8b 100644 (file)
@@ -111,6 +111,7 @@ webcore_built_sources += \
        DerivedSources/WebCore/JSDocument.h \
        DerivedSources/WebCore/JSDocumentType.cpp \
        DerivedSources/WebCore/JSDocumentType.h \
+       DerivedSources/WebCore/JSDOMApplicationCache.cpp
        DerivedSources/WebCore/JSDOMApplicationCache.h \
        DerivedSources/WebCore/JSDOMCoreException.cpp \
        DerivedSources/WebCore/JSDOMCoreException.h \
@@ -4107,14 +4108,6 @@ webcoregtk_sources += \
 endif # END USE_PANGO
 
 # ----
-# Offline Web Applications
-# ----
-if ENABLE_OFFLINE_WEB_APPLICATIONS
-webcore_built_sources += \
-       DerivedSources/WebCore/JSDOMApplicationCache.cpp
-endif # END ENABLE_OFFLINE_WEB_APPLICATIONS
-
-# ----
 # Database Support
 # ----
 if ENABLE_SQL_DATABASE
index 7381b4e..46f29d7 100644 (file)
@@ -1861,7 +1861,6 @@ __ZN7WebCore8Document12updateLayoutEv
 __ZNK7WebCore4Node16traverseNextNodeEPKS0_
 #endif
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
 __ZN7WebCore16ApplicationCache18diskUsageForOriginEPNS_14SecurityOriginE
 __ZN7WebCore16ApplicationCache20deleteCacheForOriginEPNS_14SecurityOriginE
 __ZN7WebCore23ApplicationCacheStorage14setMaximumSizeEx
@@ -1876,7 +1875,6 @@ __ZN7WebCore23ApplicationCacheStorage23calculateUsageForOriginEPKNS_14SecurityOr
 __ZN7WebCore23ApplicationCacheStorage26storeUpdatedQuotaForOriginEPKNS_14SecurityOriginEx
 __ZN7WebCore23ApplicationCacheStorage5emptyEv
 __ZNK7WebCore23ApplicationCacheStorage11maximumSizeEv
-#endif
 
 #ifndef BUILDING_ON_LEOPARD
 __ZN7WebCore6Editor13lowercaseWordEv
index 711b7e0..37dd067 100644 (file)
@@ -850,6 +850,13 @@ SOURCES += \
     inspector/TimelineRecordFactory.cpp \
     inspector/WorkerDebuggerAgent.cpp \
     inspector/WorkerInspectorController.cpp \
+    loader/appcache/ApplicationCache.cpp \
+    loader/appcache/ApplicationCacheGroup.cpp \
+    loader/appcache/ApplicationCacheHost.cpp \
+    loader/appcache/ApplicationCacheStorage.cpp \
+    loader/appcache/ApplicationCacheResource.cpp \
+    loader/appcache/DOMApplicationCache.cpp \
+    loader/appcache/ManifestParser.cpp
     loader/archive/ArchiveResource.cpp \
     loader/archive/ArchiveResourceCollection.cpp \
     loader/cache/MemoryCache.cpp \
@@ -3558,17 +3565,6 @@ contains(DEFINES, ENABLE_JAVASCRIPT_DEBUGGER=1) {
     }
 }
 
-contains(DEFINES, ENABLE_OFFLINE_WEB_APPLICATIONS=1) {
-SOURCES += \
-    loader/appcache/ApplicationCache.cpp \
-    loader/appcache/ApplicationCacheGroup.cpp \
-    loader/appcache/ApplicationCacheHost.cpp \
-    loader/appcache/ApplicationCacheStorage.cpp \
-    loader/appcache/ApplicationCacheResource.cpp \
-    loader/appcache/DOMApplicationCache.cpp \
-    loader/appcache/ManifestParser.cpp
-}
-
 contains(DEFINES, ENABLE_WEB_SOCKETS=1) {
     HEADERS += \
         websockets/CloseEvent.h \
index 93c5d76..da80e25 100644 (file)
@@ -103,10 +103,7 @@ ConvertTo(XMLHttpRequest)
 ConvertTo(XMLHttpRequestUpload)
 ConvertTo(MessagePort)
 ConvertTo(EventSource)
-
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
 ConvertTo(DOMApplicationCache)
-#endif
 
 #if ENABLE(WORKERS)
 ConvertTo(Worker)
@@ -158,10 +155,8 @@ WebDOMEventTarget toWebKit(WebCore::EventTarget* value)
         return toWebKit(instance);
 #endif
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (WebCore::DOMApplicationCache* cache = value->toDOMApplicationCache())
         return toWebKit(cache);
-#endif
 
 #if ENABLE(WORKERS)
     if (WebCore::Worker* worker = value->toWorker())
index 5e88ef2..c56277e 100644 (file)
 #include "EventSource.h"
 #include "JSEventSource.h"
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
 #include "DOMApplicationCache.h"
 #include "JSDOMApplicationCache.h"
-#endif
 
 #if ENABLE(SVG)
 #include "SVGElementInstance.h"
@@ -133,10 +131,8 @@ JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, EventTarget* targ
     if (XMLHttpRequestUpload* upload = target->toXMLHttpRequestUpload())
         return toJS(exec, globalObject, upload);
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (DOMApplicationCache* cache = target->toDOMApplicationCache())
         return toJS(exec, globalObject, cache);
-#endif
 
     if (MessagePort* messagePort = target->toMessagePort())
         return toJS(exec, globalObject, messagePort);
@@ -217,10 +213,7 @@ EventTarget* toEventTarget(JSC::JSValue value)
         return static_cast<JSDOMWindowShell*>(asObject(value))->impl();
 
     CONVERT_TO_EVENT_TARGET(EventSource)
-
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     CONVERT_TO_EVENT_TARGET(DOMApplicationCache)
-#endif
 
 #if ENABLE(SVG)
     CONVERT_TO_EVENT_TARGET(SVGElementInstance)
index 0c1f60b..99fb3f7 100644 (file)
@@ -422,10 +422,8 @@ v8::Handle<v8::Value> V8DOMWrapper::convertEventTargetToV8Object(EventTarget* ta
         return wrapper;
     }
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (DOMApplicationCache* domAppCache = target->toDOMApplicationCache())
         return toV8(domAppCache);
-#endif
 
     if (EventSource* eventSource = target->toEventSource())
         return toV8(eventSource);
index f33c030..6332d0e 100644 (file)
@@ -105,12 +105,10 @@ XMLHttpRequestUpload* EventTarget::toXMLHttpRequestUpload()
     return 0;
 }
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
 DOMApplicationCache* EventTarget::toDOMApplicationCache()
 {
     return 0;
 }
-#endif
 
 #if ENABLE(SVG)
 SVGElementInstance* EventTarget::toSVGElementInstance()
index 7b2c060..d6e4315 100644 (file)
@@ -106,9 +106,7 @@ namespace WebCore {
         virtual DOMWindow* toDOMWindow();
         virtual XMLHttpRequest* toXMLHttpRequest();
         virtual XMLHttpRequestUpload* toXMLHttpRequestUpload();
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
         virtual DOMApplicationCache* toDOMApplicationCache();
-#endif
 #if ENABLE(SVG)
         virtual SVGElementInstance* toSVGElementInstance();
 #endif
index dd679c3..2c027ee 100644 (file)
@@ -13,6 +13,9 @@ meegotouch {
     DEFINES += WTF_USE_MEEGOTOUCH=1
 }
 
+# SQLite is required to build WebKit
+DEFINES += ENABLE_SQLITE=1
+
 ## load mobilityconfig if mobility is available
 load(mobilityconfig, true)
 
@@ -43,28 +46,14 @@ isEmpty(HAVE_QRAWFONT) {
     DEFINES += ENABLE_SVG_FONTS=0
 }
 
-# turn off SQLITE support if we do not have sqlite3 available
-!CONFIG(QTDIR_build):win32-*:!exists( $${SQLITE3SRCDIR}/sqlite3.c ): DEFINES += ENABLE_SQLITE=0 ENABLE_SQL_DATABASE=0 ENABLE_WORKERS=0 ENABLE_SHARED_WORKERS=0 ENABLE_ICONDATABASE=0 ENABLE_OFFLINE_WEB_APPLICATIONS=0 ENABLE_DOM_STORAGE=0
-
 !contains(DEFINES, ENABLE_JAVASCRIPT_DEBUGGER=.): DEFINES += ENABLE_JAVASCRIPT_DEBUGGER=1
 !contains(DEFINES, ENABLE_SQL_DATABASE=.): DEFINES += ENABLE_SQL_DATABASE=1
-!contains(DEFINES, ENABLE_OFFLINE_WEB_APPLICATIONS=.): DEFINES += ENABLE_OFFLINE_WEB_APPLICATIONS=1
 !contains(DEFINES, ENABLE_DOM_STORAGE=.): DEFINES += ENABLE_DOM_STORAGE=1
 !contains(DEFINES, ENABLE_ICONDATABASE=.): DEFINES += ENABLE_ICONDATABASE=1
 !contains(DEFINES, ENABLE_CHANNEL_MESSAGING=.): DEFINES += ENABLE_CHANNEL_MESSAGING=1
 !contains(DEFINES, ENABLE_DIRECTORY_UPLOAD=.): DEFINES += ENABLE_DIRECTORY_UPLOAD=0
 !contains(DEFINES, ENABLE_FILE_SYSTEM=.): DEFINES += ENABLE_FILE_SYSTEM=0
 !contains(DEFINES, ENABLE_QUOTA=.): DEFINES += ENABLE_QUOTA=0 
-
-# turn on SQLITE support if any of the dependent features are turned on
-!contains(DEFINES, ENABLE_SQLITE=.) {
-  contains(DEFINES, ENABLE_SQL_DATABASE=1)|contains(DEFINES, ENABLE_ICONDATABASE=1)|contains(DEFINES, ENABLE_DOM_STORAGE=1)|contains(DEFINES, ENABLE_OFFLINE_WEB_APPLICATIONS=1) {
-    DEFINES += ENABLE_SQLITE=1
-  } else {
-    DEFINES += ENABLE_SQLITE=0
-  }
-}
-
 !contains(DEFINES, ENABLE_DASHBOARD_SUPPORT=.): DEFINES += ENABLE_DASHBOARD_SUPPORT=0
 !contains(DEFINES, ENABLE_FILTERS=.): DEFINES += ENABLE_FILTERS=1
 !contains(DEFINES, ENABLE_XPATH=.): DEFINES += ENABLE_XPATH=1
@@ -216,7 +205,6 @@ contains(DEFINES, ENABLE_XHTMLMP=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_XHTMLM
 contains(DEFINES, ENABLE_SVG=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG=1
 contains(DEFINES, ENABLE_SVG_FONTS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG_FONTS=1
 contains(DEFINES, ENABLE_JAVASCRIPT_DEBUGGER=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_JAVASCRIPT_DEBUGGER=1
-contains(DEFINES, ENABLE_OFFLINE_WEB_APPLICATIONS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_OFFLINE_WEB_APPLICATIONS=1
 contains(DEFINES, ENABLE_WEB_SOCKETS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_WEB_SOCKETS=1
 contains(DEFINES, ENABLE_WEB_TIMING=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_WEB_TIMING=1
 contains(DEFINES, ENABLE_TOUCH_EVENTS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_TOUCH_EVENTS=1
index 166d8c9..2dd732c 100644 (file)
@@ -155,12 +155,10 @@ static bool logCanCacheFrameDecision(Frame* frame, int indentLevel)
             PCLOG("   -The document cannot suspect its active DOM Objects");
             cannotCache = true;
         }
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
         if (!frame->loader()->documentLoader()->applicationCacheHost()->canCacheInPageCache()) {
             PCLOG("   -The DocumentLoader uses an application cache");
             cannotCache = true;
         }
-#endif
         if (!frame->loader()->client()->canCachePage()) {
             PCLOG("   -The client says this frame cannot be cached");
             cannotCache = true; 
@@ -277,11 +275,9 @@ bool PageCache::canCachePageContainingThisFrame(Frame* frame)
         && !frame->loader()->documentLoader()->isLoadingInAPISense()
         && !frame->loader()->documentLoader()->isStopping()
         && frame->document()->canSuspendActiveDOMObjects()
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
         // FIXME: We should investigating caching frames that have an associated
         // application cache. <rdar://problem/5917899> tracks that work.
         && frame->loader()->documentLoader()->applicationCacheHost()->canCacheInPageCache()
-#endif
         && frame->loader()->client()->canCachePage();
 }
     
index 59c0d3e..3515a29 100644 (file)
@@ -56,7 +56,6 @@ bool HTMLHtmlElement::isURLAttribute(Attribute* attribute) const
     return attribute->name() == manifestAttr;
 }
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
 void HTMLHtmlElement::insertedByParser()
 {
     // When parsing a fragment, its dummy document has a null parser.
@@ -76,6 +75,5 @@ void HTMLHtmlElement::insertedByParser()
     else
         documentLoader->applicationCacheHost()->selectCacheWithManifest(document()->completeURL(manifest));
 }
-#endif
 
 }
index 9cad44e..982627a 100644 (file)
@@ -33,9 +33,7 @@ public:
     static PassRefPtr<HTMLHtmlElement> create(Document*);
     static PassRefPtr<HTMLHtmlElement> create(const QualifiedName&, Document*);
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     void insertedByParser();
-#endif
 
 private:
     HTMLHtmlElement(const QualifiedName&, Document*);
index 16fe278..17d0302 100644 (file)
@@ -726,7 +726,7 @@ void HTMLMediaElement::loadNextSourceChild()
     loadResource(mediaURL, contentType);
 }
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS) && !PLATFORM(CHROMIUM)
+#if !PLATFORM(CHROMIUM)
 static KURL createFileURLForApplicationCacheResource(const String& path)
 {
     // KURL should have a function to create a url from a path, but it does not. This function
@@ -777,7 +777,7 @@ void HTMLMediaElement::loadResource(const KURL& initialURL, ContentType& content
     // The resource fetch algorithm 
     m_networkState = NETWORK_LOADING;
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS) && !PLATFORM(CHROMIUM)
+#if !PLATFORM(CHROMIUM)
     // If the url should be loaded from the application cache, pass the url of the cached file
     // to the media engine.
     ApplicationCacheHost* cacheHost = frame->loader()->documentLoader()->applicationCacheHost();
@@ -796,7 +796,7 @@ void HTMLMediaElement::loadResource(const KURL& initialURL, ContentType& content
     // cache is an internal detail not exposed through the media element API.
     m_currentSrc = url;
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS) && !PLATFORM(CHROMIUM)
+#if !PLATFORM(CHROMIUM)
     if (resource) {
         url = createFileURLForApplicationCacheResource(resource->path());
         LOG(Media, "HTMLMediaElement::loadResource - will load from app cache -> %s", urlForLogging(url).utf8().data());
index 37ad993..4617b6f 100644 (file)
@@ -195,9 +195,7 @@ void ImageDocument::createDocumentStructure()
     
     RefPtr<Element> rootElement = Document::createElement(htmlTag, false);
     appendChild(rootElement, ec);
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     static_cast<HTMLHtmlElement*>(rootElement.get())->insertedByParser();
-#endif
 
     if (frame() && frame()->loader())
         frame()->loader()->dispatchDocumentElementAvailable();
index aed28db..1cb867d 100644 (file)
@@ -73,9 +73,7 @@ void MediaDocumentParser::createDocumentStructure()
     ExceptionCode ec;
     RefPtr<Element> rootElement = document()->createElement(htmlTag, false);
     document()->appendChild(rootElement, ec);
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     static_cast<HTMLHtmlElement*>(rootElement.get())->insertedByParser();
-#endif
 
     if (document()->frame())
         document()->frame()->loader()->dispatchDocumentElementAvailable();
index 908ba6c..64a6e09 100644 (file)
@@ -70,9 +70,7 @@ void PluginDocumentParser::createDocumentStructure()
     ExceptionCode ec;
     RefPtr<Element> rootElement = document()->createElement(htmlTag, false);
     document()->appendChild(rootElement, ec);
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     static_cast<HTMLHtmlElement*>(rootElement.get())->insertedByParser();
-#endif
 
     if (document()->frame() && document()->frame()->loader())
         document()->frame()->loader()->dispatchDocumentElementAvailable();
index 14adebd..cc97bb6 100644 (file)
@@ -184,9 +184,7 @@ void HTMLConstructionSite::insertHTMLHtmlStartTagBeforeHTML(AtomicHTMLToken& tok
     RefPtr<HTMLHtmlElement> element = HTMLHtmlElement::create(m_document);
     element->setAttributeMap(token.takeAtributes(), m_fragmentScriptingPermission);
     m_openElements.pushHTMLHtmlElement(attach<Element>(m_attachmentRoot, element.get()));
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     element->insertedByParser();
-#endif
     dispatchDocumentElementAvailableIfNeeded();
 }
 
index 705a640..05a3593 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "InspectorApplicationCacheAgent.h"
 
-#if ENABLE(INSPECTOR) && ENABLE(OFFLINE_WEB_APPLICATIONS)
+#if ENABLE(INSPECTOR)
 
 #include "ApplicationCacheHost.h"
 #include "DocumentLoader.h"
@@ -138,4 +138,4 @@ PassRefPtr<InspectorObject> InspectorApplicationCacheAgent::buildObjectForApplic
 
 } // namespace WebCore
 
-#endif // ENABLE(INSPECTOR) && ENABLE(OFFLINE_WEB_APPLICATIONS)
+#endif // ENABLE(INSPECTOR)
index 04b9533..5b37788 100644 (file)
@@ -25,7 +25,7 @@
 #ifndef InspectorApplicationCacheAgent_h
 #define InspectorApplicationCacheAgent_h
 
-#if ENABLE(INSPECTOR) && ENABLE(OFFLINE_WEB_APPLICATIONS)
+#if ENABLE(INSPECTOR)
 
 #include "ApplicationCacheHost.h"
 #include "InspectorFrontend.h"
@@ -74,5 +74,5 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(INSPECTOR) && ENABLE(OFFLINE_WEB_APPLICATIONS)
+#endif // ENABLE(INSPECTOR)
 #endif // InspectorApplicationCacheAgent_h
index f3c8004..44ae2a2 100644 (file)
@@ -108,9 +108,7 @@ InspectorController::InspectorController(Page* page, InspectorClient* inspectorC
     , m_domStorageAgent(InspectorDOMStorageAgent::create(m_instrumentingAgents.get(), m_state.get()))
 #endif
     , m_timelineAgent(InspectorTimelineAgent::create(m_instrumentingAgents.get(), m_state.get()))
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     , m_applicationCacheAgent(adoptPtr(new InspectorApplicationCacheAgent(m_instrumentingAgents.get(), page)))
-#endif
     , m_resourceAgent(InspectorResourceAgent::create(m_instrumentingAgents.get(), m_pageAgent.get(), inspectorClient, m_state.get()))
     , m_runtimeAgent(adoptPtr(new PageRuntimeAgent(m_injectedScriptManager.get(), page, m_pageAgent.get())))
     , m_consoleAgent(adoptPtr(new InspectorConsoleAgent(m_instrumentingAgents.get(), m_inspectorAgent.get(), m_state.get(), m_injectedScriptManager.get(), m_domAgent.get())))
@@ -202,9 +200,7 @@ void InspectorController::connectFrontend()
     // We can reconnect to existing front-end -> unmute state.
     m_state->unmute();
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     m_applicationCacheAgent->setFrontend(m_inspectorFrontend.get());
-#endif
     m_pageAgent->setFrontend(m_inspectorFrontend.get());
     m_domAgent->setFrontend(m_inspectorFrontend.get());
     m_consoleAgent->setFrontend(m_inspectorFrontend.get());
@@ -232,9 +228,7 @@ void InspectorController::connectFrontend()
     ASSERT(m_inspectorClient);
     m_inspectorBackendDispatcher = adoptRef(new InspectorBackendDispatcher(
         m_inspectorClient,
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
         m_applicationCacheAgent.get(),
-#endif
         m_cssAgent.get(),
         m_consoleAgent.get(),
         m_domAgent.get(),
@@ -285,9 +279,7 @@ void InspectorController::disconnectFrontend()
     m_domDebuggerAgent->clearFrontend();
     m_profilerAgent->clearFrontend();
 #endif
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     m_applicationCacheAgent->clearFrontend();
-#endif
     m_consoleAgent->clearFrontend();
     m_domAgent->clearFrontend();
     m_cssAgent->clearFrontend();
index ef35136..effa8cb 100644 (file)
@@ -141,9 +141,7 @@ private:
     OwnPtr<InspectorDOMStorageAgent> m_domStorageAgent;
 #endif
     OwnPtr<InspectorTimelineAgent> m_timelineAgent;
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     OwnPtr<InspectorApplicationCacheAgent> m_applicationCacheAgent;
-#endif
     RefPtr<InspectorResourceAgent> m_resourceAgent;
     OwnPtr<InspectorRuntimeAgent> m_runtimeAgent;
     OwnPtr<InspectorConsoleAgent> m_consoleAgent;
index bef6d14..7b97f6c 100644 (file)
@@ -822,7 +822,6 @@ void InspectorInstrumentation::didCloseWebSocketImpl(InstrumentingAgents* instru
 }
 #endif
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
 void InspectorInstrumentation::networkStateChangedImpl(InstrumentingAgents* instrumentingAgents)
 {
     if (InspectorApplicationCacheAgent* applicationCacheAgent = instrumentingAgents->inspectorApplicationCacheAgent())
@@ -834,7 +833,6 @@ void InspectorInstrumentation::updateApplicationCacheStatusImpl(InstrumentingAge
     if (InspectorApplicationCacheAgent* applicationCacheAgent = instrumentingAgents->inspectorApplicationCacheAgent())
         applicationCacheAgent->updateApplicationCacheStatus(frame);
 }
-#endif
 
 bool InspectorInstrumentation::collectingHTMLParseErrors(InstrumentingAgents* instrumentingAgents)
 {
index ed95015..c2cd471 100644 (file)
@@ -189,10 +189,7 @@ public:
 #endif
 
     static void networkStateChanged(Page*);
-
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     static void updateApplicationCacheStatus(Frame*);
-#endif
 
 #if ENABLE(INSPECTOR)
     static void frontendCreated() { s_frontendCounter += 1; }
@@ -322,10 +319,8 @@ private:
     static void didCloseWebSocketImpl(InstrumentingAgents*, unsigned long identifier);
 #endif
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     static void networkStateChangedImpl(InstrumentingAgents*);
     static void updateApplicationCacheStatusImpl(InstrumentingAgents*, Frame*);
-#endif
 
     static InstrumentingAgents* instrumentingAgentsForPage(Page*);
     static InstrumentingAgents* instrumentingAgentsForFrame(Frame*);
@@ -1016,14 +1011,13 @@ inline void InspectorInstrumentation::didCloseWebSocket(ScriptExecutionContext*
 
 inline void InspectorInstrumentation::networkStateChanged(Page* page)
 {
-#if ENABLE(INSPECTOR) && ENABLE(OFFLINE_WEB_APPLICATIONS)
+#if ENABLE(INSPECTOR)
     FAST_RETURN_IF_NO_FRONTENDS(void());
     if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
         networkStateChangedImpl(instrumentingAgents);
 #endif
 }
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
 inline void InspectorInstrumentation::updateApplicationCacheStatus(Frame* frame)
 {
 #if ENABLE(INSPECTOR)
@@ -1032,7 +1026,6 @@ inline void InspectorInstrumentation::updateApplicationCacheStatus(Frame* frame)
         updateApplicationCacheStatusImpl(instrumentingAgents, frame);
 #endif
 }
-#endif
 
 inline void InspectorInstrumentation::didRegisterAnimationFrameCallback(Document* document, int callbackId)
 {
index 3c886a9..983c867 100644 (file)
@@ -73,9 +73,7 @@ public:
 #if ENABLE(SQL_DATABASE)
         , m_inspectorDatabaseAgent(0)
 #endif
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
         , m_inspectorApplicationCacheAgent(0)
-#endif
 #if ENABLE(JAVASCRIPT_DEBUGGER)
         , m_inspectorDebuggerAgent(0)
         , m_inspectorDOMDebuggerAgent(0)
@@ -119,10 +117,8 @@ public:
     InspectorDatabaseAgent* inspectorDatabaseAgent() const { return m_inspectorDatabaseAgent; }
     void setInspectorDatabaseAgent(InspectorDatabaseAgent* agent) { m_inspectorDatabaseAgent = agent; }
 #endif
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     InspectorApplicationCacheAgent* inspectorApplicationCacheAgent() const { return m_inspectorApplicationCacheAgent; }
     void setInspectorApplicationCacheAgent(InspectorApplicationCacheAgent* agent) { m_inspectorApplicationCacheAgent = agent; }
-#endif
 #if ENABLE(JAVASCRIPT_DEBUGGER)
     InspectorDebuggerAgent* inspectorDebuggerAgent() const { return m_inspectorDebuggerAgent; }
     void setInspectorDebuggerAgent(InspectorDebuggerAgent* agent) { m_inspectorDebuggerAgent = agent; }
@@ -153,9 +149,7 @@ private:
 #if ENABLE(SQL_DATABASE)
     InspectorDatabaseAgent* m_inspectorDatabaseAgent;
 #endif
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     InspectorApplicationCacheAgent* m_inspectorApplicationCacheAgent;
-#endif
 #if ENABLE(JAVASCRIPT_DEBUGGER)
     InspectorDebuggerAgent* m_inspectorDebuggerAgent;
     InspectorDOMDebuggerAgent* m_inspectorDOMDebuggerAgent;
index 9a9a449..75ea8d4 100644 (file)
@@ -126,9 +126,7 @@ void WorkerInspectorController::connectFrontend()
     m_frontend = adoptPtr(new InspectorFrontend(m_frontendChannel.get()));
     m_backendDispatcher = adoptRef(new InspectorBackendDispatcher(
         m_frontendChannel.get(),
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
         0, // InspectorApplicationCacheAgent
-#endif
 #if ENABLE(JAVASCRIPT_DEBUGGER)
         0, // InspectorDOMDebuggerAgent
 #endif
index fe47ccd..3202c00 100755 (executable)
@@ -86,7 +86,6 @@ ref_types = {}
 macro_traits = {
     "Database": "SQL_DATABASE",
     "DOMStorage": "DOM_STORAGE",
-    "ApplicationCache": "OFFLINE_WEB_APPLICATIONS",
     "Debugger": "JAVASCRIPT_DEBUGGER",
     "DOMDebugger": "JAVASCRIPT_DEBUGGER",
     "Profiler": "JAVASCRIPT_DEBUGGER",
index be9112e..7c69dfd 100644 (file)
@@ -98,9 +98,7 @@ DocumentLoader::DocumentLoader(const ResourceRequest& req, const SubstituteData&
     , m_stopRecordingResponses(false)
     , m_substituteResourceDeliveryTimer(this, &DocumentLoader::substituteResourceDeliveryTimerFired)
     , m_didCreateGlobalHistoryEntry(false)
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     , m_applicationCacheHost(adoptPtr(new ApplicationCacheHost(this)))
-#endif
 {
 }
 
@@ -200,10 +198,8 @@ void DocumentLoader::mainReceivedError(const ResourceError& error, bool isComple
 {
     ASSERT(!error.isNull());
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     m_applicationCacheHost->failedLoadingMainResource();
-#endif
-    
+
     if (!frameLoader())
         return;
     setMainDocumentError(error);
@@ -235,9 +231,7 @@ void DocumentLoader::stopLoading()
     cancelAll(m_multipartSubresourceLoaders);
 
     // Appcache uses ResourceHandle directly, DocumentLoader doesn't count these loads.
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     m_applicationCacheHost->stopLoadingInFrame(m_frame);
-#endif
 
     if (!loading)
         return;
@@ -402,9 +396,7 @@ void DocumentLoader::detachFromFrame()
 {
     ASSERT(m_frame);
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     m_applicationCacheHost->setDOMApplicationCache(0);
-#endif
     InspectorInstrumentation::loaderDetachedFromFrame(m_frame, this);
     m_frame = 0;
 }
@@ -898,9 +890,7 @@ void DocumentLoader::getIconDataForIconURL(const String& urlString)
 void DocumentLoader::handledOnloadEvents()
 {
     m_wasOnloadHandled = true;
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     applicationCacheHost()->stopDeferringEvents();
-#endif
 }
 
 } // namespace WebCore
index c7e78c0..3721f3d 100644 (file)
@@ -248,9 +248,7 @@ namespace WebCore {
         // actually be added to the document.
         void commitData(const char* bytes, size_t length);
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
         ApplicationCacheHost* applicationCacheHost() const { return m_applicationCacheHost.get(); }
-#endif
 
     protected:
         DocumentLoader(const ResourceRequest&, const SubstituteData&);
@@ -349,10 +347,8 @@ namespace WebCore {
         RefPtr<IconLoadDecisionCallback> m_iconLoadDecisionCallback;
         RefPtr<IconDataCallback> m_iconDataCallback;
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
         friend class ApplicationCacheHost;  // for substitute resource delivery
         OwnPtr<ApplicationCacheHost> m_applicationCacheHost;
-#endif
     };
 
     inline void DocumentLoader::recordMemoryCacheLoadForFutureClientNotification(const String& url)
index 0de876b..7f9555c 100644 (file)
@@ -184,10 +184,8 @@ public:
     virtual void exceededDatabaseQuota(Frame*, const String&) { }
 #endif
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     virtual void reachedMaxAppCacheSize(int64_t) { }
     virtual void reachedApplicationCacheOriginQuota(SecurityOrigin*, int64_t) { }
-#endif
 
 #if ENABLE(NOTIFICATIONS)
     virtual NotificationPresenter* notificationPresenter() const { return 0; }
index 5e4bd2b..baaf202 100644 (file)
@@ -2634,14 +2634,10 @@ unsigned long FrameLoader::loadResourceSynchronously(const ResourceRequest& requ
     if (error.isNull()) {
         ASSERT(!newRequest.isNull());
         
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
         if (!documentLoader()->applicationCacheHost()->maybeLoadSynchronously(newRequest, error, response, data)) {
-#endif
             ResourceHandle::loadResourceSynchronously(networkingContext(), newRequest, storedCredentials, error, response, data);
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
             documentLoader()->applicationCacheHost()->maybeLoadFallbackSynchronously(newRequest, error, response, data);
         }
-#endif
     }
     int encodedDataLength = response.resourceLoadInfo() ? static_cast<int>(response.resourceLoadInfo()->encodedDataLength) : -1;
     notifier()->sendRemainingDelegateMessages(m_documentLoader.get(), identifier, response, data.data(), data.size(), encodedDataLength, error);
index 06e0547..832fae3 100644 (file)
@@ -221,13 +221,11 @@ void MainResourceLoader::willSendRequest(ResourceRequest& newRequest, const Reso
     // Don't set this on the first request. It is set when the main load was started.
     m_documentLoader->setRequest(newRequest);
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (!redirectResponse.isNull()) {
         // We checked application cache for initial URL, now we need to check it for redirected one.
         ASSERT(!m_substituteData.isValid());
         documentLoader()->applicationCacheHost()->maybeLoadMainResourceForRedirect(newRequest, m_substituteData);
     }
-#endif
 
     // FIXME: Ideally we'd stop the I/O until we hear back from the navigation policy delegate
     // listener. But there's no way to do that in practice. So instead we cancel later if the
@@ -360,10 +358,8 @@ void MainResourceLoader::substituteMIMETypeFromPluginDatabase(const ResourceResp
 
 void MainResourceLoader::didReceiveResponse(const ResourceResponse& r)
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (documentLoader()->applicationCacheHost()->maybeLoadFallbackForMainResponse(request(), r))
         return;
-#endif
 
     HTTPHeaderMap::const_iterator it = r.httpHeaderFields().find(AtomicString("x-frame-options"));
     if (it != r.httpHeaderFields().end()) {
@@ -450,10 +446,8 @@ void MainResourceLoader::didReceiveData(const char* data, int length, long long
 #if !USE(CF)
     ASSERT(!defersLoading());
 #endif
- #if ENABLE(OFFLINE_WEB_APPLICATIONS)
+
     documentLoader()->applicationCacheHost()->mainResourceDataReceived(data, length, encodedDataLength, allAtOnce);
-#endif
 
     // The additional processing can do anything including possibly removing the last
     // reference to this object; one example of this is 3266216.
@@ -475,27 +469,20 @@ void MainResourceLoader::didFinishLoading(double finishTime)
     // The additional processing can do anything including possibly removing the last
     // reference to this object.
     RefPtr<MainResourceLoader> protect(this);
-
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     RefPtr<DocumentLoader> dl = documentLoader();
-#endif
 
     ASSERT(!documentLoader()->timing()->responseEnd);
     documentLoader()->timing()->responseEnd = finishTime ? finishTime : (m_timeOfLastDataReceived ? m_timeOfLastDataReceived : currentTime());
     frameLoader()->finishedLoading();
     ResourceLoader::didFinishLoading(finishTime);
-    
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
+
     dl->applicationCacheHost()->finishedLoadingMainResource();
-#endif
 }
 
 void MainResourceLoader::didFail(const ResourceError& error)
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (documentLoader()->applicationCacheHost()->maybeLoadFallbackForMainError(request(), error))
         return;
-#endif
 
     // There is a bug in CFNetwork where callbacks can be dispatched even when loads are deferred.
     // See <rdar://problem/6304600> for more details.
@@ -599,9 +586,7 @@ bool MainResourceLoader::load(const ResourceRequest& r, const SubstituteData& su
     documentLoader()->timing()->fetchStart = currentTime();
     ResourceRequest request(r);
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     documentLoader()->applicationCacheHost()->maybeLoadMainResource(request, m_substituteData);
-#endif
 
     bool defer = defersLoading();
     if (defer) {
index 26bf651..f95aaa3 100644 (file)
@@ -143,11 +143,9 @@ void ResourceLoader::start()
     if (m_documentLoader->scheduleArchiveLoad(this, m_request, m_request.url()))
         return;
 #endif
-    
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
+
     if (m_documentLoader->applicationCacheHost()->maybeLoadResource(this, m_request, m_request.url()))
         return;
-#endif
 
     if (m_defersLoading) {
         m_deferredRequest = m_request;
@@ -211,10 +209,8 @@ void ResourceLoader::clearResourceData()
 
 void ResourceLoader::willSendRequest(ResourceRequest& request, const ResourceResponse& redirectResponse)
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (!fastMallocSize(documentLoader()->applicationCacheHost()))
         CRASH();
-#endif
     if (!fastMallocSize(documentLoader()->frame()))
         CRASH();
     // Protect this in this delegate method since the additional processing can do
@@ -239,20 +235,16 @@ void ResourceLoader::willSendRequest(ResourceRequest& request, const ResourceRes
 
 void ResourceLoader::didSendData(unsigned long long, unsigned long long)
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (!fastMallocSize(documentLoader()->applicationCacheHost()))
         CRASH();
-#endif
     if (!fastMallocSize(documentLoader()->frame()))
         CRASH();
 }
 
 void ResourceLoader::didReceiveResponse(const ResourceResponse& r)
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (!fastMallocSize(documentLoader()->applicationCacheHost()))
         CRASH();
-#endif
     if (!fastMallocSize(documentLoader()->frame()))
         CRASH();
     ASSERT(!m_reachedTerminalState);
@@ -272,10 +264,8 @@ void ResourceLoader::didReceiveResponse(const ResourceResponse& r)
 
 void ResourceLoader::didReceiveData(const char* data, int length, long long encodedDataLength, bool allAtOnce)
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (!m_cancelled && !fastMallocSize(documentLoader()->applicationCacheHost()))
         CRASH();
-#endif
     if (!m_cancelled && !fastMallocSize(documentLoader()->frame()))
         CRASH();
     // The following assertions are not quite valid here, since a subclass
@@ -422,10 +412,8 @@ ResourceError ResourceLoader::cannotShowURLError()
 
 void ResourceLoader::willSendRequest(ResourceHandle*, ResourceRequest& request, const ResourceResponse& redirectResponse)
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (documentLoader()->applicationCacheHost()->maybeLoadFallbackForRedirect(this, request, redirectResponse))
         return;
-#endif
     willSendRequest(request, redirectResponse);
 }
 
@@ -436,10 +424,8 @@ void ResourceLoader::didSendData(ResourceHandle*, unsigned long long bytesSent,
 
 void ResourceLoader::didReceiveResponse(ResourceHandle*, const ResourceResponse& response)
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (documentLoader()->applicationCacheHost()->maybeLoadFallbackForResponse(this, response))
         return;
-#endif
     didReceiveResponse(response);
 }
 
@@ -452,10 +438,8 @@ void ResourceLoader::didReceiveData(ResourceHandle*, const char* data, int lengt
 
 void ResourceLoader::didFinishLoading(ResourceHandle*, double finishTime)
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (!fastMallocSize(documentLoader()->applicationCacheHost()))
         CRASH();
-#endif
     if (!fastMallocSize(documentLoader()->frame()))
         CRASH();
     didFinishLoading(finishTime);
@@ -463,25 +447,19 @@ void ResourceLoader::didFinishLoading(ResourceHandle*, double finishTime)
 
 void ResourceLoader::didFail(ResourceHandle*, const ResourceError& error)
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (!fastMallocSize(documentLoader()->applicationCacheHost()))
         CRASH();
-#endif
     if (!fastMallocSize(documentLoader()->frame()))
         CRASH();
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (documentLoader()->applicationCacheHost()->maybeLoadFallbackForError(this, error))
         return;
-#endif
     didFail(error);
 }
 
 void ResourceLoader::wasBlocked(ResourceHandle*)
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (!fastMallocSize(documentLoader()->applicationCacheHost()))
         CRASH();
-#endif
     if (!fastMallocSize(documentLoader()->frame()))
         CRASH();
     didFail(blockedError());
@@ -489,10 +467,8 @@ void ResourceLoader::wasBlocked(ResourceHandle*)
 
 void ResourceLoader::cannotShowURL(ResourceHandle*)
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (!fastMallocSize(documentLoader()->applicationCacheHost()))
         CRASH();
-#endif
     if (!fastMallocSize(documentLoader()->frame()))
         CRASH();
     didFail(cannotShowURLError());
@@ -500,10 +476,8 @@ void ResourceLoader::cannotShowURL(ResourceHandle*)
 
 bool ResourceLoader::shouldUseCredentialStorage()
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (!fastMallocSize(documentLoader()->applicationCacheHost()))
         CRASH();
-#endif
     if (!fastMallocSize(documentLoader()->frame()))
         CRASH();
 
@@ -560,10 +534,8 @@ void ResourceLoader::receivedCancellation(const AuthenticationChallenge&)
 
 void ResourceLoader::willCacheResponse(ResourceHandle*, CacheStoragePolicy& policy)
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (!fastMallocSize(documentLoader()->applicationCacheHost()))
         CRASH();
-#endif
     if (!fastMallocSize(documentLoader()->frame()))
         CRASH();
     // <rdar://problem/7249553> - There are reports of crashes with this method being called
index 707731c..6cd9cda 100644 (file)
@@ -148,9 +148,7 @@ namespace WebCore {
     protected:
         ResourceLoader(Frame*, ResourceLoaderOptions);
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
         friend class ApplicationCacheHost;  // for access to request()
-#endif
         friend class ResourceLoadScheduler; // for access to start()
         // start() actually sends the load to the network (unless the load is being 
         // deferred) and should only be called by ResourceLoadScheduler or setDefersLoading().
index a13872f..589587d 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "ApplicationCache.h"
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-
 #include "ApplicationCacheGroup.h"
 #include "ApplicationCacheResource.h"
 #include "ApplicationCacheStorage.h"
@@ -227,5 +225,3 @@ void ApplicationCache::dump()
 #endif
 
 }
-
-#endif // ENABLE(OFFLINE_WEB_APPLICATIONS)
index 23fd440..325e4c0 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef ApplicationCache_h
 #define ApplicationCache_h
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-
 #include "PlatformString.h"
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
@@ -117,6 +115,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(OFFLINE_WEB_APPLICATIONS)
-
 #endif // ApplicationCache_h
index dcfa524..d453e93 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "ApplicationCacheGroup.h"
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-
 #include "ApplicationCache.h"
 #include "ApplicationCacheHost.h"
 #include "ApplicationCacheResource.h"
@@ -1158,7 +1156,4 @@ void ApplicationCacheGroup::clearStorageID()
         (*it)->clearStorageID();
 }
 
-
 }
-
-#endif // ENABLE(OFFLINE_WEB_APPLICATIONS)
index b8eeac4..d181c8c 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef ApplicationCacheGroup_h
 #define ApplicationCacheGroup_h
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-
 #include "DOMApplicationCache.h"
 #include "KURL.h"
 #include "PlatformString.h"
@@ -207,6 +205,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(OFFLINE_WEB_APPLICATIONS)
-
 #endif // ApplicationCacheGroup_h
index 9b0f54e..d2df69e 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "ApplicationCacheHost.h"
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-
 #include "ApplicationCache.h"
 #include "ApplicationCacheGroup.h"
 #include "ApplicationCacheResource.h"
@@ -464,5 +462,3 @@ bool ApplicationCacheHost::isApplicationCacheEnabled()
 }
 
 }  // namespace WebCore
-
-#endif  // ENABLE(OFFLINE_WEB_APPLICATIONS)
index 24073cf..a8508d7 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef ApplicationCacheHost_h
 #define ApplicationCacheHost_h
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-
 #include "KURL.h"
 #include <wtf/Deque.h>
 #include <wtf/OwnPtr.h>
@@ -208,5 +206,4 @@ namespace WebCore {
 
 }  // namespace WebCore
 
-#endif  // ENABLE(OFFLINE_WEB_APPLICATIONS)
 #endif  // ApplicationCacheHost_h
index c0df573..d831784 100644 (file)
@@ -27,8 +27,6 @@
 #include "ApplicationCacheResource.h"
 #include <stdio.h>
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-
 namespace WebCore {
 
 ApplicationCacheResource::ApplicationCacheResource(const KURL& url, const ResourceResponse& response, unsigned type, PassRefPtr<SharedBuffer> data, const String& path)
@@ -87,5 +85,3 @@ void ApplicationCacheResource::dumpType(unsigned type)
 #endif
 
 } // namespace WebCore
-
-#endif // ENABLE(OFFLINE_WEB_APPLICATIONS)
index 6633c6c..d1dfea4 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef ApplicationCacheResource_h
 #define ApplicationCacheResource_h
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-
 #include "SubstituteResource.h"
 
 namespace WebCore {
@@ -74,6 +72,4 @@ private:
     
 } // namespace WebCore
 
-#endif // ENABLE(OFFLINE_WEB_APPLICATIONS)
-
 #endif // ApplicationCacheResource_h
index 888c143..16a7ccf 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "ApplicationCacheStorage.h"
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-
 #include "ApplicationCache.h"
 #include "ApplicationCacheGroup.h"
 #include "ApplicationCacheHost.h"
@@ -1539,5 +1537,3 @@ ApplicationCacheStorage& cacheStorage()
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(OFFLINE_WEB_APPLICATIONS)
index 422f230..0d35d18 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef ApplicationCacheStorage_h
 #define ApplicationCacheStorage_h
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-
 #include "PlatformString.h"
 #include "SecurityOriginHash.h"
 #include "SQLiteDatabase.h"
@@ -155,6 +153,4 @@ ApplicationCacheStorage& cacheStorage();
     
 } // namespace WebCore
 
-#endif // ENABLE(OFFLINE_WEB_APPLICATIONS)
-
 #endif // ApplicationCacheStorage_h
index 3535b54..29f07ef 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "DOMApplicationCache.h"
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-
 #include "ApplicationCacheHost.h"
 #include "Document.h"
 #include "DocumentLoader.h"
@@ -128,5 +126,3 @@ EventTargetData* DOMApplicationCache::ensureEventTargetData()
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(OFFLINE_WEB_APPLICATIONS)
index d10e330..9e93bf1 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef DOMApplicationCache_h
 #define DOMApplicationCache_h
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-
 #include "ApplicationCacheHost.h"
 #include "EventNames.h"
 #include "EventTarget.h"
@@ -92,6 +90,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(OFFLINE_WEB_APPLICATIONS)
-
 #endif // DOMApplicationCache_h
index 2c1662d..5673ff3 100644 (file)
@@ -26,7 +26,6 @@
 module offline {
  
     interface [
-        Conditional=OFFLINE_WEB_APPLICATIONS,
         EventTarget,
         OmitConstructor,
         DontCheckEnums,
index df83a96..8a589eb 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "ManifestParser.h"
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-
 #include "KURL.h"
 #include "TextResourceDecoder.h"
 #include <wtf/unicode/CharacterNames.h>
@@ -182,7 +180,5 @@ bool parseManifest(const KURL& manifestURL, const char* data, int length, Manife
 
     return true;
 }
-    
-}
 
-#endif // ENABLE(OFFLINE_WEB_APPLICATIONS)
+}
index f0369ee..39b760d 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef ManifestParser_h
 #define ManifestParser_h
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-
 #include "ApplicationCache.h"
 
 namespace WebCore {
@@ -45,6 +43,4 @@ namespace WebCore {
 
 }
 
-#endif // ENABLE(OFFLINE_WEB_APPLICATIONS)
-
 #endif // ManifestParser_h
index 2a4b4e2..c9052ff 100644 (file)
@@ -44,10 +44,8 @@ void ResourceLoader::didDownloadData(ResourceHandle*, int length)
 
 void ResourceLoader::didDownloadData(int length)
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (!m_cancelled && !fastMallocSize(documentLoader()->applicationCacheHost()))
         CRASH();
-#endif
     if (!m_cancelled && !fastMallocSize(documentLoader()->frame()))
         CRASH();
 }
index 34b51a1..6d90dca 100644 (file)
@@ -183,7 +183,6 @@ namespace WebCore {
         virtual void exceededDatabaseQuota(Frame*, const String& databaseName) = 0;
 #endif
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
         // Callback invoked when the application cache fails to save a cache object
         // because storing it would grow the database file past its defined maximum
         // size or past the amount of free space on the device. 
@@ -200,7 +199,6 @@ namespace WebCore {
         // other existing caches for the origin that would not be replaced by
         // the new cache.
         virtual void reachedApplicationCacheOriginQuota(SecurityOrigin*, int64_t totalSpaceNeeded) = 0;
-#endif
 
 #if ENABLE(DASHBOARD_SUPPORT)
         virtual void dashboardRegionsChanged();
index e2c1c2d..b50c37e 100644 (file)
@@ -502,11 +502,9 @@ void DOMWindow::clear()
     m_localStorage = 0;
 #endif
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (m_applicationCache)
         m_applicationCache->disconnectFrame();
     m_applicationCache = 0;
-#endif
 
 #if ENABLE(NOTIFICATIONS)
     if (m_notifications)
@@ -599,14 +597,12 @@ Console* DOMWindow::console() const
     return m_console.get();
 }
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
 DOMApplicationCache* DOMWindow::applicationCache() const
 {
     if (!m_applicationCache)
         m_applicationCache = DOMApplicationCache::create(m_frame);
     return m_applicationCache.get();
 }
-#endif
 
 Navigator* DOMWindow::navigator() const
 {
index 32321a1..a8083cc 100644 (file)
@@ -388,10 +388,8 @@ namespace WebCore {
         StorageInfo* webkitStorageInfo() const;
 #endif
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
         DOMApplicationCache* applicationCache() const;
         DOMApplicationCache* optionalApplicationCache() const { return m_applicationCache.get(); }
-#endif
 
 #if ENABLE(ORIENTATION_EVENTS)
         // This is the interface orientation in degrees. Some examples are:
@@ -460,9 +458,7 @@ namespace WebCore {
         mutable RefPtr<IDBFactory> m_idbFactory;
 #endif
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
         mutable RefPtr<DOMApplicationCache> m_applicationCache;
-#endif
 
 #if ENABLE(NOTIFICATIONS)
         mutable RefPtr<NotificationCenter> m_notifications;
index 702f0e7..c2bee46 100644 (file)
@@ -164,9 +164,7 @@ module window {
         WebKitPoint webkitConvertPointFromNodeToPage(in [Optional=CallWithDefaultValue] Node node, 
                                                      in [Optional=CallWithDefaultValue] WebKitPoint p);
 
-#if defined(ENABLE_OFFLINE_WEB_APPLICATIONS) && ENABLE_OFFLINE_WEB_APPLICATIONS
         readonly attribute [EnabledAtRuntime] DOMApplicationCache applicationCache;
-#endif    
 #if defined(ENABLE_SQL_DATABASE) && ENABLE_SQL_DATABASE
         [EnabledAtRuntime] Database openDatabase(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize, in [Callback, Optional] DatabaseCallback creationCallback)
             raises(DOMException);
index d401a8e..0d2892b 100644 (file)
@@ -830,10 +830,8 @@ void XMLDocumentParser::startElementNs(const xmlChar* xmlLocalName, const xmlCha
     if (m_view && !newElement->attached())
         newElement->attach();
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (newElement->hasTagName(HTMLNames::htmlTag))
         static_cast<HTMLHtmlElement*>(newElement.get())->insertedByParser();
-#endif
 
     if (!m_parsingFragment && isFirstElement && document()->frame())
         document()->frame()->loader()->dispatchDocumentElementAvailable();
index 2c07e5a..f5d17d8 100644 (file)
@@ -529,10 +529,8 @@ void XMLDocumentParser::parseStartElement()
     if (m_view && !newElement->attached())
         newElement->attach();
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (newElement->hasTagName(HTMLNames::htmlTag))
         static_cast<HTMLHtmlElement*>(newElement.get())->insertedByParser();
-#endif
 
     if (isFirstElement && document()->frame())
         document()->frame()->loader()->dispatchDocumentElementAvailable();
index 82d10c4..3429a65 100644 (file)
@@ -1,3 +1,23 @@
+2011-09-24  Adam Barth  <abarth@webkit.org>
+
+        Always enable ENABLE(OFFLINE_WEB_APPLICATIONS)
+        https://bugs.webkit.org/show_bug.cgi?id=68767
+
+        Reviewed by Eric Seidel.
+
+        * features.gypi:
+        * src/ApplicationCacheHost.cpp:
+        * src/ApplicationCacheHostInternal.h:
+        * src/AssertMatchingEnums.cpp:
+        * src/ChromeClientImpl.cpp:
+        (WebKit::ChromeClientImpl::reachedApplicationCacheOriginQuota):
+        * src/ChromeClientImpl.h:
+        * src/WebDataSourceImpl.cpp:
+        (WebKit::WebDataSourceImpl::applicationCacheHost):
+        * src/WebRuntimeFeatures.cpp:
+        (WebKit::WebRuntimeFeatures::enableApplicationCache):
+        (WebKit::WebRuntimeFeatures::isApplicationCacheEnabled):
+
 2011-09-23  Adam Klein  <adamk@chromium.org>
 
         Add ENABLE_MUTATION_OBSERVERS feature flag
index 406a6af..6c45cd1 100644 (file)
@@ -62,7 +62,6 @@
       'ENABLE_MHTML=1',
       'ENABLE_MUTATION_OBSERVERS=0',
       'ENABLE_NOTIFICATIONS=1',
-      'ENABLE_OFFLINE_WEB_APPLICATIONS=1',
       'ENABLE_ORIENTATION_EVENTS=0',
       'ENABLE_PAGE_VISIBILITY_API=1',
       'ENABLE_PROGRESS_TAG=1',
index 7109108..ab10e46 100644 (file)
@@ -31,8 +31,6 @@
 #include "config.h"
 #include "ApplicationCacheHost.h"
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-
 #include "ApplicationCacheHostInternal.h"
 #include "DocumentLoader.h"
 #include "DOMApplicationCache.h"
@@ -302,5 +300,3 @@ bool ApplicationCacheHost::isApplicationCacheEnabled()
 }
 
 }  // namespace WebCore
-
-#endif  // ENABLE(OFFLINE_WEB_APPLICATIONS)
index e44f0ee..38158c1 100644 (file)
@@ -31,8 +31,6 @@
 #include "config.h"
 #include "ApplicationCacheHost.h"
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-
 #include "DocumentLoader.h"
 #include "WebApplicationCacheHostClient.h"
 #include "WebFrameClient.h"
@@ -82,5 +80,3 @@ private:
 };
 
 }
-
-#endif  // ENABLE(OFFLINE_WEB_APPLICATIONS)
index 0bc5d4f..9cdb8c9 100644 (file)
@@ -207,7 +207,6 @@ COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleDocumentNote, DocumentNoteRole)
 COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleDocumentRegion, DocumentRegionRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleUserInterfaceTooltip, UserInterfaceTooltipRole);
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
 COMPILE_ASSERT_MATCHING_ENUM(WebApplicationCacheHost::Uncached, ApplicationCacheHost::UNCACHED);
 COMPILE_ASSERT_MATCHING_ENUM(WebApplicationCacheHost::Idle, ApplicationCacheHost::IDLE);
 COMPILE_ASSERT_MATCHING_ENUM(WebApplicationCacheHost::Checking, ApplicationCacheHost::CHECKING);
@@ -222,7 +221,6 @@ COMPILE_ASSERT_MATCHING_ENUM(WebApplicationCacheHost::ProgressEvent, Application
 COMPILE_ASSERT_MATCHING_ENUM(WebApplicationCacheHost::UpdateReadyEvent, ApplicationCacheHost::UPDATEREADY_EVENT);
 COMPILE_ASSERT_MATCHING_ENUM(WebApplicationCacheHost::CachedEvent, ApplicationCacheHost::CACHED_EVENT);
 COMPILE_ASSERT_MATCHING_ENUM(WebApplicationCacheHost::ObsoleteEvent, ApplicationCacheHost::OBSOLETE_EVENT);
-#endif
 
 COMPILE_ASSERT_MATCHING_ENUM(WebClipboard::FormatPlainText, PasteboardPrivate::PlainTextFormat);
 COMPILE_ASSERT_MATCHING_ENUM(WebClipboard::FormatHTML, PasteboardPrivate::HTMLFormat);
index fef7e7c..a80c69a 100644 (file)
@@ -645,7 +645,6 @@ void ChromeClientImpl::exceededDatabaseQuota(Frame* frame, const String& databas
     // Chromium users cannot currently change the default quota
 }
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
 void ChromeClientImpl::reachedMaxAppCacheSize(int64_t spaceNeeded)
 {
     ASSERT_NOT_REACHED();
@@ -655,7 +654,6 @@ void ChromeClientImpl::reachedApplicationCacheOriginQuota(SecurityOrigin*, int64
 {
     ASSERT_NOT_REACHED();
 }
-#endif
 
 void ChromeClientImpl::runOpenPanel(Frame* frame, PassRefPtr<FileChooser> fileChooser)
 {
index 0909390..7903c39 100644 (file)
@@ -128,10 +128,8 @@ public:
     virtual void print(WebCore::Frame*);
     virtual void exceededDatabaseQuota(
         WebCore::Frame*, const WTF::String& databaseName);
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     virtual void reachedMaxAppCacheSize(int64_t spaceNeeded);
     virtual void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*, int64_t totalSpaceNeeded);
-#endif
 #if ENABLE(NOTIFICATIONS)
     virtual WebCore::NotificationPresenter* notificationPresenter() const;
 #endif
index 2e8e3a6..21265bc 100644 (file)
@@ -121,11 +121,7 @@ void WebDataSourceImpl::setExtraData(ExtraData* extraData)
 
 WebApplicationCacheHost* WebDataSourceImpl::applicationCacheHost()
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     return ApplicationCacheHostInternal::toWebApplicationCacheHost(DocumentLoader::applicationCacheHost());
-#else
-    return 0;
-#endif
 }
 
 void WebDataSourceImpl::setDeferMainResourceDataLoad(bool defer)
index 56e748f..c244880 100644 (file)
@@ -140,18 +140,12 @@ bool WebRuntimeFeatures::isNotificationsEnabled()
 
 void WebRuntimeFeatures::enableApplicationCache(bool enable)
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     RuntimeEnabledFeatures::setApplicationCacheEnabled(enable);
-#endif
 }
 
 bool WebRuntimeFeatures::isApplicationCacheEnabled()
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     return RuntimeEnabledFeatures::applicationCacheEnabled();
-#else
-    return false;
-#endif
 }
 
 void WebRuntimeFeatures::enableDataTransferItems(bool enable)
index ebbeaf1..647b0c0 100755 (executable)
@@ -1,3 +1,19 @@
+2011-09-24  Adam Barth  <abarth@webkit.org>
+
+        Always enable ENABLE(OFFLINE_WEB_APPLICATIONS)
+        https://bugs.webkit.org/show_bug.cgi?id=68767
+
+        Reviewed by Eric Seidel.
+
+        * WebCoreSupport/ChromeClientEfl.cpp:
+        (WebCore::ChromeClientEfl::reachedApplicationCacheOriginQuota):
+        * WebCoreSupport/ChromeClientEfl.h:
+        * ewk/ewk_main.cpp:
+        (_ewk_init_body):
+        * ewk/ewk_settings.cpp:
+        (ewk_settings_cache_directory_path_set):
+        (ewk_settings_cache_directory_path_get):
+
 2011-09-21  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
 
         [EFL] Revert pointer operator coding style in ewk
index 2435956..d1110c3 100644 (file)
@@ -374,7 +374,6 @@ void ChromeClientEfl::print(Frame* frame)
     notImplemented();
 }
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
 void ChromeClientEfl::reachedMaxAppCacheSize(int64_t spaceNeeded)
 {
     // FIXME: Free some space.
@@ -385,7 +384,6 @@ void ChromeClientEfl::reachedApplicationCacheOriginQuota(SecurityOrigin*, int64_
 {
     notImplemented();
 }
-#endif
 
 #if ENABLE(TOUCH_EVENTS)
 void ChromeClientEfl::needTouchEvents(bool needed)
index c92c367..25c6a62 100644 (file)
@@ -114,10 +114,8 @@ public:
     virtual NotificationPresenter* notificationPresenter() const;
 #endif
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     virtual void reachedMaxAppCacheSize(int64_t spaceNeeded);
     virtual void reachedApplicationCacheOriginQuota(SecurityOrigin*, int64_t totalSpaceNeeded);
-#endif
 
 #if ENABLE(CONTEXT_MENUS)
     virtual void showContextMenu() { }
index 1e36abd..eb03233 100644 (file)
@@ -182,10 +182,7 @@ Eina_Bool _ewk_init_body(void)
     WTF::String wkdir = home + "/.webkit";
     if (WebCore::makeAllDirectories(wkdir)) {
         ewk_settings_web_database_path_set(wkdir.utf8().data());
-
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
         ewk_settings_cache_directory_path_set(wkdir.utf8().data());
-#endif
     }
 
     // TODO: this should move to WebCore, already reported to webkit-gtk folks:
index b410fdc..eae3dba 100644 (file)
 #include <wtf/text/CString.h>
 #include <wtf/text/StringConcatenate.h>
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
+// FIXME: Why is there a directory in this include?
 #include "appcache/ApplicationCacheStorage.h"
 
 static const char* _ewk_cache_directory_path = 0;
-#endif
 
 static const char* _ewk_icon_database_path = 0;
 #if ENABLE(SQL_DATABASE)
@@ -255,7 +254,6 @@ const char* ewk_settings_default_user_agent_get(void)
 
 Eina_Bool ewk_settings_cache_directory_path_set(const char* path)
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (!path)
         return EINA_FALSE;
 
@@ -265,18 +263,11 @@ Eina_Bool ewk_settings_cache_directory_path_set(const char* path)
     else
         eina_stringshare_replace(&_ewk_cache_directory_path, path);
     return EINA_TRUE;
-#else
-    EINA_SAFETY_ON_TRUE_RETURN_VAL(1, EINA_FALSE);
-#endif
 }
 
 const char* ewk_settings_cache_directory_path_get()
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     return _ewk_cache_directory_path;
-#else
-    EINA_SAFETY_ON_TRUE_RETURN_VAL(1, 0);
-#endif
 }
 
 double ewk_settings_default_timer_interval_get(void)
index 4ba7c95..2bbe3b9 100644 (file)
@@ -1,3 +1,20 @@
+2011-09-24  Adam Barth  <abarth@webkit.org>
+
+        Always enable ENABLE(OFFLINE_WEB_APPLICATIONS)
+        https://bugs.webkit.org/show_bug.cgi?id=68767
+
+        Reviewed by Eric Seidel.
+
+        * WebCoreSupport/ChromeClientGtk.cpp:
+        (WebKit::ChromeClient::reachedApplicationCacheOriginQuota):
+        * WebCoreSupport/ChromeClientGtk.h:
+        * webkit/webkitapplicationcache.cpp:
+        (webkit_application_cache_get_maximum_size):
+        (webkit_application_cache_set_maximum_size):
+        (webkit_application_cache_get_database_directory_path):
+        * webkit/webkitglobals.cpp:
+        (webkitInit):
+
 2011-09-22  Gustavo Noronha Silva  <gustavo.noronha@collabora.com>
 
         Remove useless empty WebKit namespace.
index c1c0427..f1a57c6 100644 (file)
@@ -589,7 +589,6 @@ void ChromeClient::exceededDatabaseQuota(Frame* frame, const String& databaseNam
 }
 #endif
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
 void ChromeClient::reachedMaxAppCacheSize(int64_t spaceNeeded)
 {
     // FIXME: Free some space.
@@ -600,7 +599,6 @@ void ChromeClient::reachedApplicationCacheOriginQuota(SecurityOrigin*, int64_t)
 {
     notImplemented();
 }
-#endif
 
 void ChromeClient::runOpenPanel(Frame*, PassRefPtr<FileChooser> prpFileChooser)
 {
index d0d40fc..c7faa7f 100644 (file)
@@ -118,10 +118,8 @@ namespace WebKit {
 #if ENABLE(SQL_DATABASE)
         virtual void exceededDatabaseQuota(WebCore::Frame*, const WTF::String&);
 #endif
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
         virtual void reachedMaxAppCacheSize(int64_t spaceNeeded);
         virtual void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*, int64_t totalSpaceNeeded);
-#endif
 #if ENABLE(CONTEXT_MENUS)
         virtual void showContextMenu() { }
 #endif
index c8c464d..c22f7dd 100644 (file)
@@ -41,11 +41,7 @@ static unsigned long long cacheMaxSize = UINT_MAX;
  **/
 unsigned long long webkit_application_cache_get_maximum_size()
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     return (cacheMaxSize = WebCore::cacheStorage().maximumSize());
-#else
-    return 0;
-#endif
 }
 
 /**
@@ -60,16 +56,12 @@ unsigned long long webkit_application_cache_get_maximum_size()
  **/
 void webkit_application_cache_set_maximum_size(unsigned long long size)
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (size != cacheMaxSize) {
         WebCore::cacheStorage().empty();
         WebCore::cacheStorage().vacuumDatabaseFile();
         WebCore::cacheStorage().setMaximumSize(size);
         cacheMaxSize = size;
     }
-#else
-    UNUSED_PARAM(size);
-#endif
 }
 
 /**
@@ -85,11 +77,7 @@ void webkit_application_cache_set_maximum_size(unsigned long long size)
  **/
 const gchar* webkit_application_cache_get_database_directory_path()
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     CString path = WebCore::fileSystemRepresentation(WebCore::cacheStorage().cacheDirectory());
     return path.data();
-#else
-    return "";
-#endif
 }
 
index 57e32e5..439c23c 100644 (file)
@@ -318,9 +318,7 @@ void webkitInit()
 
     gchar* databaseDirectory = g_build_filename(g_get_user_data_dir(), "webkit", "databases", NULL);
     webkit_set_web_database_directory_path(databaseDirectory);
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     WebCore::cacheStorage().setCacheDirectory(databaseDirectory);
-#endif
 
     g_free(databaseDirectory);
 
index b485463..98172ab 100644 (file)
@@ -1,3 +1,14 @@
+2011-09-24  Adam Barth  <abarth@webkit.org>
+
+        Always enable ENABLE(OFFLINE_WEB_APPLICATIONS)
+        https://bugs.webkit.org/show_bug.cgi?id=68767
+
+        Reviewed by Eric Seidel.
+
+        * WebCoreSupport/ChromeClientHaiku.cpp:
+        (WebCore::ChromeClientWx::reachedApplicationCacheOriginQuota):
+        * WebCoreSupport/ChromeClientHaiku.h:
+
 2011-09-17  Mihai Parparita  <mihaip@chromium.org>
 
         FrameLoaderClient BackForwardList-related methods are unsued
index a0138bf..a0a0051 100644 (file)
@@ -344,7 +344,6 @@ void ChromeClientHaiku::exceededDatabaseQuota(Frame*, const String& databaseName
     notImplemented();
 }
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
 void ChromeClientWx::reachedMaxAppCacheSize(int64_t spaceNeeded)
 {
     notImplemented();
@@ -354,7 +353,6 @@ void ChromeClientWx::reachedApplicationCacheOriginQuota(SecurityOrigin*, int64_t
 {
     notImplemented();
 }
-#endif
 
 void ChromeClientHaiku::requestGeolocationPermissionForFrame(Frame*, Geolocation*)
 {
index 2f77987..d0f52ca 100644 (file)
@@ -136,10 +136,8 @@ namespace WebCore {
         virtual PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const;
         virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const;
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
         virtual void reachedMaxAppCacheSize(int64_t spaceNeeded);
         virtual void reachedApplicationCacheOriginQuota(SecurityOrigin*, int64_t totalSpaceNeeded);
-#endif
 #if ENABLE(CONTEXT_MENUS)
         virtual void showContextMenu() { }
 #endif
index 3033366..9d5142b 100644 (file)
@@ -1,3 +1,27 @@
+2011-09-24  Adam Barth  <abarth@webkit.org>
+
+        Always enable ENABLE(OFFLINE_WEB_APPLICATIONS)
+        https://bugs.webkit.org/show_bug.cgi?id=68767
+
+        Reviewed by Eric Seidel.
+
+        * Configurations/FeatureDefines.xcconfig:
+        * Misc/WebCache.mm:
+        (+[WebCache empty]):
+        * WebCoreSupport/WebApplicationCache.mm:
+        * WebCoreSupport/WebApplicationCacheQuotaManager.mm:
+        (-[WebApplicationCacheQuotaManager usage]):
+        (-[WebApplicationCacheQuotaManager quota]):
+        (-[WebApplicationCacheQuotaManager setQuota:]):
+        * WebCoreSupport/WebChromeClient.h:
+        * WebCoreSupport/WebChromeClient.mm:
+        * WebView/WebDataSource.mm:
+        (-[WebDataSource _transferApplicationCache:]):
+        * WebView/WebFrame.mm:
+        (-[WebFrame _cacheabilityDictionary]):
+        * WebView/WebView.mm:
+        (WebKitInitializeApplicationCachePathIfNecessary):
+
 2011-09-23  Adam Klein  <adamk@chromium.org>
 
         Add ENABLE_MUTATION_OBSERVERS feature flag
index 7754bd5..cdacaeb 100644 (file)
@@ -76,7 +76,6 @@ ENABLE_METER_TAG = ENABLE_METER_TAG;
 ENABLE_MHTML = ;
 ENABLE_MUTATION_OBSERVERS = ;
 ENABLE_NOTIFICATIONS = ;
-ENABLE_OFFLINE_WEB_APPLICATIONS = ENABLE_OFFLINE_WEB_APPLICATIONS;
 ENABLE_PAGE_VISIBILITY_API = ;
 ENABLE_PROGRESS_TAG = ENABLE_PROGRESS_TAG;
 ENABLE_QUOTA = ;
@@ -97,4 +96,4 @@ ENABLE_XHTMLMP = ;
 ENABLE_XPATH = ENABLE_XPATH;
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
index 2833691..ebbdc70 100644 (file)
     [WebView _setCacheModel:WebCacheModelDocumentViewer];
     [WebView _setCacheModel:cacheModel];
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     // Empty the application cache.
     WebCore::cacheStorage().empty();
-#endif
 
     // Empty the Cross-Origin Preflight cache
     WebCore::CrossOriginPreflightResultCache::shared().empty();
index 6a7322c..9d70cd2 100644 (file)
@@ -23,8 +23,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-
 #import "WebApplicationCache.h"
 
 #import "WebSecurityOriginInternal.h"
@@ -90,5 +88,3 @@ using namespace WebCore;
 }
 
 @end
-
-#endif
index ba92c9b..c4d52fd 100644 (file)
@@ -49,33 +49,23 @@ using namespace WebCore;
 
 - (unsigned long long)usage
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     long long usage;
     if (cacheStorage().calculateUsageForOrigin([_origin _core], usage))
         return usage;
     return 0;
-#else
-    return 0;
-#endif
 }
 
 - (unsigned long long)quota
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     long long quota;
     if (cacheStorage().calculateQuotaForOrigin([_origin _core], quota))
         return quota;
     return 0;
-#else
-    return 0;
-#endif
 }
 
 - (void)setQuota:(unsigned long long)quota
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     cacheStorage().storeUpdatedQuotaForOrigin([_origin _core], quota);
-#endif
 }
 
 @end
index 2a03b93..fe6fafa 100644 (file)
@@ -112,10 +112,8 @@ public:
 #if ENABLE(SQL_DATABASE)
     virtual void exceededDatabaseQuota(WebCore::Frame*, const WTF::String& databaseName) OVERRIDE;
 #endif
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     virtual void reachedMaxAppCacheSize(int64_t spaceNeeded) OVERRIDE;
     virtual void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*, int64_t totalSpaceNeeded) OVERRIDE;
-#endif
     virtual void populateVisitedLinks() OVERRIDE;
 
 #if ENABLE(DASHBOARD_SUPPORT)
index 7cf8387..4f2e5e7 100644 (file)
@@ -656,8 +656,6 @@ void WebChromeClient::exceededDatabaseQuota(Frame* frame, const String& database
 
 #endif
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-
 void WebChromeClient::reachedMaxAppCacheSize(int64_t spaceNeeded)
 {
     // FIXME: Free some space.
@@ -674,8 +672,6 @@ void WebChromeClient::reachedApplicationCacheOriginQuota(SecurityOrigin* origin,
     END_BLOCK_OBJC_EXCEPTIONS;
 }
 
-#endif
-    
 void WebChromeClient::populateVisitedLinks()
 {
     if ([m_webView historyDelegate]) {
index a6ac7cd..c3093ab 100644 (file)
@@ -195,7 +195,6 @@ static inline void addTypesFromClass(NSMutableDictionary *allTypes, Class objCCl
 
 - (BOOL)_transferApplicationCache:(NSString*)destinationBundleIdentifier
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     DocumentLoader* loader = [self _documentLoader];
     
     if (!loader)
@@ -204,9 +203,6 @@ static inline void addTypesFromClass(NSMutableDictionary *allTypes, Class objCCl
     NSString *cacheDir = [NSString _webkit_localCacheDirectoryWithBundleIdentifier:destinationBundleIdentifier];
     
     return ApplicationCacheStorage::storeCopyOfCache(cacheDir, loader->applicationCacheHost());
-#else
-    return NO;
-#endif
 }
 
 - (void)_setDeferMainResourceDataLoad:(BOOL)flag
index 3caf327..9db2f6d 100644 (file)
@@ -1158,11 +1158,8 @@ static inline WebDataSource *dataSource(DocumentLoader* loader)
     if (DOMWindow* domWindow = _private->coreFrame->domWindow()) {
         if (domWindow->hasEventListeners(eventNames().unloadEvent))
             [result setObject:[NSNumber numberWithBool:YES] forKey:WebFrameHasUnloadListener];
-            
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
         if (domWindow->optionalApplicationCache())
             [result setObject:[NSNumber numberWithBool:YES] forKey:WebFrameUsesApplicationCache];
-#endif
     }
     
     if (Document* document = _private->coreFrame->document()) {
index b740335..d2f71ea 100644 (file)
@@ -576,7 +576,6 @@ static NSString *createUserVisibleWebKitVersionString()
 
 static void WebKitInitializeApplicationCachePathIfNecessary()
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     static BOOL initialized = NO;
     if (initialized)
         return;
@@ -584,14 +583,13 @@ static void WebKitInitializeApplicationCachePathIfNecessary()
     NSString *appName = [[NSBundle mainBundle] bundleIdentifier];
     if (!appName)
         appName = [[NSProcessInfo processInfo] processName];
-    
+
     ASSERT(appName);
 
     NSString* cacheDir = [NSString _webkit_localCacheDirectoryWithBundleIdentifier:appName];
 
     cacheStorage().setCacheDirectory(cacheDir);
     initialized = YES;
-#endif
 }
 
 static bool runningLeopardMail()
index ccd9c54..afac42b 100644 (file)
@@ -155,9 +155,7 @@ void QWebSecurityOrigin::setDatabaseQuota(qint64 quota)
 
 void QWebSecurityOrigin::setApplicationCacheQuota(qint64 quota)
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     WebCore::cacheStorage().storeUpdatedQuotaForOrigin(d->origin.get(), quota);
-#endif
 }
 /*!
     Destroys the security origin.
index 24cc432..4d5c612 100644 (file)
@@ -1045,9 +1045,7 @@ qint64 QWebSettings::offlineStorageDefaultQuota()
 */
 void QWebSettings::setOfflineWebApplicationCachePath(const QString& path)
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     WebCore::cacheStorage().setCacheDirectory(path);
-#endif
 }
 
 /*!
@@ -1060,11 +1058,7 @@ void QWebSettings::setOfflineWebApplicationCachePath(const QString& path)
 */
 QString QWebSettings::offlineWebApplicationCachePath()
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     return WebCore::cacheStorage().cacheDirectory();
-#else
-    return QString();
-#endif
 }
 
 /*!
@@ -1075,11 +1069,9 @@ QString QWebSettings::offlineWebApplicationCachePath()
 */
 void QWebSettings::setOfflineWebApplicationCacheQuota(qint64 maximumSize)
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     WebCore::cacheStorage().empty();
     WebCore::cacheStorage().vacuumDatabaseFile();
     WebCore::cacheStorage().setMaximumSize(maximumSize);
-#endif
 }
 
 /*!
@@ -1089,11 +1081,7 @@ void QWebSettings::setOfflineWebApplicationCacheQuota(qint64 maximumSize)
 */
 qint64 QWebSettings::offlineWebApplicationCacheQuota()
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     return WebCore::cacheStorage().maximumSize();
-#else
-    return 0;
-#endif
 }
 
 /*!
index a2fb815..7d9a7a1 100644 (file)
@@ -1,3 +1,23 @@
+2011-09-24  Adam Barth  <abarth@webkit.org>
+
+        Always enable ENABLE(OFFLINE_WEB_APPLICATIONS)
+        https://bugs.webkit.org/show_bug.cgi?id=68767
+
+        Reviewed by Eric Seidel.
+
+        * Api/qwebsecurityorigin.cpp:
+        (QWebSecurityOrigin::setApplicationCacheQuota):
+        * Api/qwebsettings.cpp:
+        (QWebSettings::setOfflineWebApplicationCachePath):
+        (QWebSettings::offlineWebApplicationCachePath):
+        (QWebSettings::setOfflineWebApplicationCacheQuota):
+        (QWebSettings::offlineWebApplicationCacheQuota):
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::reachedApplicationCacheOriginQuota):
+        * WebCoreSupport/ChromeClientQt.h:
+        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+        (DumpRenderTreeSupportQt::clearAllApplicationCaches):
+
 2011-09-21  Andras Becsi  <andras.becsi@nokia.com>
 
         [Qt] Remove Qt specific code from css/SelectorChecker.cpp
index 69a6a84..993ff82 100644 (file)
@@ -541,7 +541,6 @@ void ChromeClientQt::exceededDatabaseQuota(Frame* frame, const String& databaseN
 }
 #endif
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
 void ChromeClientQt::reachedMaxAppCacheSize(int64_t)
 {
     // FIXME: Free some space.
@@ -561,7 +560,6 @@ void ChromeClientQt::reachedApplicationCacheOriginQuota(SecurityOrigin* origin,
 
     emit m_webPage->applicationCacheQuotaExceeded(securityOrigin, defaultOriginQuota, static_cast<quint64>(totalSpaceNeeded));
 }
-#endif
 
 #if ENABLE(NOTIFICATIONS)
 NotificationPresenter* ChromeClientQt::notificationPresenter() const
index b06fc2b..ec81617 100644 (file)
@@ -136,10 +136,8 @@ public:
 #if ENABLE(SQL_DATABASE)
     virtual void exceededDatabaseQuota(Frame*, const String&);
 #endif
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     virtual void reachedMaxAppCacheSize(int64_t spaceNeeded);
     virtual void reachedApplicationCacheOriginQuota(SecurityOrigin*, int64_t totalSpaceNeeded);
-#endif
 #if ENABLE(CONTEXT_MENUS)
     virtual void showContextMenu() { }
 #endif
index 03e4b37..60e8c51 100644 (file)
@@ -670,10 +670,8 @@ void DumpRenderTreeSupportQt::setEditingBehavior(QWebPage* page, const QString&
 
 void DumpRenderTreeSupportQt::clearAllApplicationCaches()
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     WebCore::cacheStorage().empty();
     WebCore::cacheStorage().vacuumDatabaseFile();
-#endif
 }
 
 void DumpRenderTreeSupportQt::dumpFrameLoader(bool b)
index d99f7f4..5fa169b 100644 (file)
@@ -1,3 +1,14 @@
+2011-09-24  Adam Barth  <abarth@webkit.org>
+
+        Always enable ENABLE(OFFLINE_WEB_APPLICATIONS)
+        https://bugs.webkit.org/show_bug.cgi?id=68767
+
+        Reviewed by Eric Seidel.
+
+        * WebCoreSupport/WebChromeClient.cpp:
+        (WebChromeClient::reachedApplicationCacheOriginQuota):
+        * WebCoreSupport/WebChromeClient.h:
+
 2011-09-22  Adam Roben  <aroben@apple.com>
 
         Remove FindSafari from all our .sln files
index 17c90fa..c166e82 100644 (file)
@@ -614,8 +614,9 @@ void WebChromeClient::exceededDatabaseQuota(Frame* frame, const String& database
 }
 #endif
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
+// FIXME: Move this include to the top of the file with the other includes.
 #include "ApplicationCacheStorage.h"
+
 void WebChromeClient::reachedMaxAppCacheSize(int64_t spaceNeeded)
 {
     // FIXME: Free some space.
@@ -626,7 +627,6 @@ void WebChromeClient::reachedApplicationCacheOriginQuota(SecurityOrigin*, int64_
 {
     notImplemented();
 }
-#endif
 
 void WebChromeClient::populateVisitedLinks()
 {
index 2e84d1e..a5459ff 100644 (file)
@@ -117,10 +117,8 @@ public:
     virtual void exceededDatabaseQuota(WebCore::Frame*, const WTF::String&);
 #endif
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     virtual void reachedMaxAppCacheSize(int64_t spaceNeeded);
     virtual void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*, int64_t totalSpaceNeeded);
-#endif
 
 #if ENABLE(CONTEXT_MENUS)
     virtual void showContextMenu() { }
index 39e2d11..744172f 100644 (file)
@@ -1,3 +1,14 @@
+2011-09-24  Adam Barth  <abarth@webkit.org>
+
+        Always enable ENABLE(OFFLINE_WEB_APPLICATIONS)
+        https://bugs.webkit.org/show_bug.cgi?id=68767
+
+        Reviewed by Eric Seidel.
+
+        * WebCoreSupport/ChromeClientWinCE.cpp:
+        (WebKit::ChromeClientWinCE::reachedApplicationCacheOriginQuota):
+        * WebCoreSupport/ChromeClientWinCE.h:
+
 2011-09-21  Andras Becsi  <andras.becsi@nokia.com>
 
         [Qt] Remove Qt specific code from css/SelectorChecker.cpp
index 4c40883..ee550a4 100644 (file)
@@ -305,7 +305,6 @@ void ChromeClientWinCE::exceededDatabaseQuota(Frame*, const String&)
 }
 #endif
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
 void ChromeClientWinCE::reachedMaxAppCacheSize(int64_t)
 {
     notImplemented();
@@ -315,7 +314,6 @@ void ChromeClientWinCE::reachedApplicationCacheOriginQuota(SecurityOrigin*, int6
 {
     notImplemented();
 }
-#endif
 
 #if ENABLE(TOUCH_EVENTS)
 void ChromeClientWinCE::needTouchEvents(bool)
index 9033a7d..def2084 100644 (file)
@@ -117,7 +117,6 @@ public:
     virtual void exceededDatabaseQuota(WebCore::Frame*, const WTF::String& databaseName);
 #endif
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     // Callback invoked when the application cache fails to save a cache object
     // because storing it would grow the database file past its defined maximum
     // size or past the amount of free space on the device.
@@ -131,7 +130,6 @@ public:
     // to take action, such as prompting the user to ask to increase the quota
     // for this origin.
     virtual void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*, int64_t totalSpaceNeeded);
-#endif
 
 #if ENABLE(CONTEXT_MENUS)
     virtual void showContextMenu() { }
index d5b9eba..c636001 100644 (file)
@@ -1,3 +1,14 @@
+2011-09-24  Adam Barth  <abarth@webkit.org>
+
+        Always enable ENABLE(OFFLINE_WEB_APPLICATIONS)
+        https://bugs.webkit.org/show_bug.cgi?id=68767
+
+        Reviewed by Eric Seidel.
+
+        * WebKitSupport/ChromeClientWx.cpp:
+        (WebCore::ChromeClientWx::reachedApplicationCacheOriginQuota):
+        * WebKitSupport/ChromeClientWx.h:
+
 2011-09-17  Mihai Parparita  <mihaip@chromium.org>
 
         FrameLoaderClient BackForwardList-related methods are unsued
index 857ef9e..9142f70 100644 (file)
@@ -433,7 +433,6 @@ void ChromeClientWx::exceededDatabaseQuota(Frame*, const String&)
 }
 #endif
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
 void ChromeClientWx::reachedMaxAppCacheSize(int64_t spaceNeeded)
 {
     notImplemented();
@@ -443,7 +442,6 @@ void ChromeClientWx::reachedApplicationCacheOriginQuota(SecurityOrigin*, int64_t
 {
     notImplemented();
 }
-#endif
 
 void ChromeClientWx::scroll(const IntSize&, const IntRect&, const IntRect&)
 {
index 39bdf86..101e09f 100644 (file)
@@ -124,10 +124,8 @@ public:
     virtual void exceededDatabaseQuota(Frame*, const String&);
 #endif
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     virtual void reachedMaxAppCacheSize(int64_t spaceNeeded);
     virtual void reachedApplicationCacheOriginQuota(SecurityOrigin*, int64_t totalSpaceNeeded);
-#endif
 
 #if ENABLE(CONTEXT_MENUS)
     virtual void showContextMenu() { }
index 6f433a9..6a021dd 100644 (file)
@@ -1,3 +1,25 @@
+2011-09-24  Adam Barth  <abarth@webkit.org>
+
+        Always enable ENABLE(OFFLINE_WEB_APPLICATIONS)
+        https://bugs.webkit.org/show_bug.cgi?id=68767
+
+        Reviewed by Eric Seidel.
+
+        * Configurations/FeatureDefines.xcconfig:
+        * UIProcess/qt/WebContextQt.cpp:
+        (WebKit::WebContext::applicationCacheDirectory):
+        * WebProcess/ApplicationCache/WebApplicationCacheManager.cpp:
+        (WebKit::WebApplicationCacheManager::getApplicationCacheOrigins):
+        (WebKit::WebApplicationCacheManager::deleteEntriesForOrigin):
+        (WebKit::WebApplicationCacheManager::deleteAllEntries):
+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+        (WebKit::WebChromeClient::reachedApplicationCacheOriginQuota):
+        * WebProcess/WebCoreSupport/WebChromeClient.h:
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::initializeWebProcess):
+        (WebKit::WebProcess::clearApplicationCache):
+        * WebProcess/WebProcess.h:
+
 2011-09-23  Adam Klein  <adamk@chromium.org>
 
         Add ENABLE_MUTATION_OBSERVERS feature flag
index 7754bd5..cdacaeb 100644 (file)
@@ -76,7 +76,6 @@ ENABLE_METER_TAG = ENABLE_METER_TAG;
 ENABLE_MHTML = ;
 ENABLE_MUTATION_OBSERVERS = ;
 ENABLE_NOTIFICATIONS = ;
-ENABLE_OFFLINE_WEB_APPLICATIONS = ENABLE_OFFLINE_WEB_APPLICATIONS;
 ENABLE_PAGE_VISIBILITY_API = ;
 ENABLE_PROGRESS_TAG = ENABLE_PROGRESS_TAG;
 ENABLE_QUOTA = ;
@@ -97,4 +96,4 @@ ENABLE_XHTMLMP = ;
 ENABLE_XPATH = ENABLE_XPATH;
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
index 5c6bdad..de8bc4a 100644 (file)
@@ -36,11 +36,7 @@ namespace WebKit {
 
 String WebContext::applicationCacheDirectory()
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     return WebCore::cacheStorage().cacheDirectory();
-#else
-    return QString();
-#endif
 }
 
 void WebContext::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
index 5f9a724..2b38533 100644 (file)
@@ -60,9 +60,7 @@ void WebApplicationCacheManager::getApplicationCacheOrigins(uint64_t callbackID)
 
     HashSet<RefPtr<SecurityOrigin>, SecurityOriginHash> origins;
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     cacheStorage().getOriginsWithCache(origins);
-#endif
 
     Vector<SecurityOriginData> identifiers;
     identifiers.reserveCapacity(origins.size());
@@ -87,22 +85,18 @@ void WebApplicationCacheManager::deleteEntriesForOrigin(const SecurityOriginData
 {
     WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared());
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     RefPtr<SecurityOrigin> origin = SecurityOrigin::create(originData.protocol, originData.host, originData.port);
     if (!origin)
         return;
     
     ApplicationCache::deleteCacheForOrigin(origin.get());
-#endif
 }
 
 void WebApplicationCacheManager::deleteAllEntries()
 {
     WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared());
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     cacheStorage().deleteAllEntries();
-#endif
 }
 
 } // namespace WebKit
index 456be4f..7e27859 100644 (file)
@@ -543,7 +543,6 @@ void WebChromeClient::exceededDatabaseQuota(Frame* frame, const String& database
 #endif
 
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
 void WebChromeClient::reachedMaxAppCacheSize(int64_t)
 {
     notImplemented();
@@ -553,7 +552,6 @@ void WebChromeClient::reachedApplicationCacheOriginQuota(SecurityOrigin*, int64_
 {
     notImplemented();
 }
-#endif
 
 #if ENABLE(DASHBOARD_SUPPORT)
 void WebChromeClient::dashboardRegionsChanged()
index 120902b..242c26c 100644 (file)
@@ -135,10 +135,8 @@ private:
     virtual void exceededDatabaseQuota(WebCore::Frame*, const String& databaseName) OVERRIDE;
 #endif
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     virtual void reachedMaxAppCacheSize(int64_t spaceNeeded) OVERRIDE;
     virtual void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*, int64_t spaceNeeded) OVERRIDE;
-#endif
 
 #if ENABLE(DASHBOARD_SUPPORT)
     virtual void dashboardRegionsChanged() OVERRIDE;
index 5b3eba1..214f2ae 100644 (file)
@@ -204,11 +204,9 @@ void WebProcess::initializeWebProcess(const WebProcessCreationParameters& parame
     StorageTracker::initializeTracker(parameters.localStorageDirectory, 0);
     m_localStorageDirectory = parameters.localStorageDirectory;
 #endif
-    
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
+
     if (!parameters.applicationCacheDirectory.isEmpty())
         cacheStorage().setCacheDirectory(parameters.applicationCacheDirectory);
-#endif
 
     setShouldTrackVisitedLinks(parameters.shouldTrackVisitedLinks);
     setCacheModel(static_cast<uint32_t>(parameters.cacheModel));
@@ -771,10 +769,8 @@ void WebProcess::clearResourceCaches(ResourceCachesToClear resourceCachesToClear
 
 void WebProcess::clearApplicationCache()
 {
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     // Empty the application cache.
     cacheStorage().empty();
-#endif
 }
 
 #if !ENABLE(PLUGIN_PROCESS)
index d90784c..55b2486 100644 (file)
@@ -238,9 +238,7 @@ private:
     
     String m_localStorageDirectory;
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     RefPtr<SandboxExtension> m_applicationCachePathExtension;
-#endif
 
 #if ENABLE(PLUGIN_PROCESS)
     PluginProcessConnectionManager m_pluginProcessConnectionManager;
index 8b272e2..ff81e37 100644 (file)
@@ -82,7 +82,6 @@ WEBKIT_FEATURE(ENABLE_MATHML "Enable MathML" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_METER_TAG "Enable Meter tag" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_NETSCAPE_PLUGIN_API "Enable Netscape plugin API" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_NOTIFICATIONS "Enable notifications" DEFAULT OFF)
-WEBKIT_FEATURE(ENABLE_OFFLINE_WEB_APPLICATIONS "Enable offline web applications" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_ORIENTATION_EVENTS "Enable orientation events" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_PROGRESS_TAG "Enable progress tag" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_SHARED_WORKERS "Enable shared workers" DEFAULT ON)
index e07dd39..7cde329 100644 (file)
@@ -38,7 +38,6 @@ WEBKIT_FEATURE(ENABLE_JIT "Enable JIT code" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_MATHML "Enable MathML" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_NETSCAPE_PLUGIN_API "Enable Netscape plugin API" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_NOTIFICATIONS "Enable notifications" DEFAULT OFF)
-WEBKIT_FEATURE(ENABLE_OFFLINE_WEB_APPLICATIONS "Enable offline web applications" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_ORIENTATION_EVENTS "Enable orientation events" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_PROGRESS_TAG "Enable progress tag" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_SHARED_WORKERS "Enable shared workers" DEFAULT OFF)
index 62feddd..f57dd19 100644 (file)
@@ -29,7 +29,6 @@
 #cmakedefine01 ENABLE_METER_TAG
 #cmakedefine01 ENABLE_NETSCAPE_PLUGIN_API
 #cmakedefine01 ENABLE_NOTIFICATIONS
-#cmakedefine01 ENABLE_OFFLINE_WEB_APPLICATIONS
 #cmakedefine01 ENABLE_ORIENTATION_EVENTS
 #cmakedefine01 ENABLE_PROGRESS_TAG
 #cmakedefine01 ENABLE_SHARED_WORKERS
index e7afc43..5802e58 100644 (file)
@@ -1,5 +1,14 @@
 2011-09-24  Adam Barth  <abarth@webkit.org>
 
+        Always enable ENABLE(OFFLINE_WEB_APPLICATIONS)
+        https://bugs.webkit.org/show_bug.cgi?id=68767
+
+        Reviewed by Eric Seidel.
+
+        * Scripts/build-webkit:
+
+2011-09-24  Adam Barth  <abarth@webkit.org>
+
         Remove ENABLE(WCSS) and associated code
         https://bugs.webkit.org/show_bug.cgi?id=68759
 
index 50717ec..81224f8 100755 (executable)
@@ -102,7 +102,6 @@ my (
     $mutationObserversSupport,
     $netscapePluginSupport,
     $notificationsSupport,
-    $offlineWebApplicationSupport,
     $orientationEventsSupport,
     $pageVisibilityApiSupport,
     $progressTagSupport,
@@ -242,9 +241,6 @@ my @features = (
     { option => "notifications", desc => "Toggle Desktop Notifications Support",
       define => "ENABLE_NOTIFICATIONS", default => 0, value => \$notificationsSupport },
 
-    { option => "offline-web-applications", desc => "Toggle Offline Web Application Support",
-      define => "ENABLE_OFFLINE_WEB_APPLICATIONS", default => 1, value => \$offlineWebApplicationSupport },
-
     { option => "orientation-events", desc => "Toggle Orientation Events support",
       define => "ENABLE_ORIENTATION_EVENTS", default => 0, value => \$orientationEventsSupport },
 
index 58ab3fa..18c29b4 100644 (file)
@@ -1,3 +1,13 @@
+2011-09-24  Adam Barth  <abarth@webkit.org>
+
+        Always enable ENABLE(OFFLINE_WEB_APPLICATIONS)
+        https://bugs.webkit.org/show_bug.cgi?id=68767
+
+        Reviewed by Eric Seidel.
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
+
 2011-09-23  Adam Klein  <adamk@chromium.org>
 
         Add ENABLE_MUTATION_OBSERVERS feature flag
index b08ce9d..f949d87 100644 (file)
@@ -9,7 +9,7 @@
        >
   <Tool
                Name="VCCLCompilerTool"
-               PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_FULLSCREEN_API);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_MUTATION_OBSERVERS);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
+               PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_FULLSCREEN_API);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_MUTATION_OBSERVERS);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
        />
   <UserMacro
                Name="ENABLE_3D_CANVAS"
                PerformEnvironmentSet="true"
        />
   <UserMacro
-               Name="ENABLE_OFFLINE_WEB_APPLICATIONS"
-               Value="ENABLE_OFFLINE_WEB_APPLICATIONS"
-               PerformEnvironmentSet="true"
-       />
-  <UserMacro
                Name="ENABLE_PAGE_VISIBILITY_API"
                Value=""
                PerformEnvironmentSet="true"
index ae4d345..59120e3 100644 (file)
@@ -9,7 +9,7 @@
        >
   <Tool
                Name="VCCLCompilerTool"
-               PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_FULLSCREEN_API);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_MUTATION_OBSERVERS);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
+               PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_FULLSCREEN_API);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_MUTATION_OBSERVERS);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
        />
   <UserMacro
                Name="ENABLE_3D_CANVAS"
                PerformEnvironmentSet="true"
        />
   <UserMacro
-               Name="ENABLE_OFFLINE_WEB_APPLICATIONS"
-               Value="ENABLE_OFFLINE_WEB_APPLICATIONS"
-               PerformEnvironmentSet="true"
-       />
-  <UserMacro
                Name="ENABLE_PAGE_VISIBILITY_API"
                Value=""
                PerformEnvironmentSet="true"
index 6fdb647..978453f 100644 (file)
@@ -454,14 +454,6 @@ AC_ARG_ENABLE(data_transfer_items,
               [],[enable_data_transfer_items="no"])
 AC_MSG_RESULT([$enable_data_transfer_items])
 
-# check whether to enable HTML5 Offline Web Applications support
-AC_MSG_CHECKING([whether to enable HTML5 offline web applications support])
-AC_ARG_ENABLE(offline_web_applications,
-              AC_HELP_STRING([--enable-offline-web-applications],
-                             [enable HTML5 offline web applications support [default=yes]]),
-              [],[enable_offline_web_applications="yes"])
-AC_MSG_RESULT([$enable_offline_web_applications])
-
 # check whether to enable DOM mutation observer support
 AC_MSG_CHECKING([whether to enable DOM mutation observer support])
 AC_ARG_ENABLE(mutation_observers,
@@ -1002,10 +994,7 @@ fi
 AC_SUBST([SQLITE3_CFLAGS])
 AC_SUBST([SQLITE3_LIBS])
 
-if (test "$sqlite3_found" = "no") && (test "$enable_icon_database" = "yes" || \
-   test "$enable_sql_database" = "yes" || \
-   test "$enable_offline_web_applications" = "yes" || \
-   test "$enable_dom_storage" = "yes"); then
+if (test "$sqlite3_found" = "no"); then
    AC_MSG_ERROR([SQLite3 is required for the Database related features])
 fi
 
@@ -1127,7 +1116,6 @@ AM_CONDITIONAL([ENABLE_PAGE_VISIBILITY_API],[test "$enable_page_visibility_api"
 AM_CONDITIONAL([ENABLE_PROGRESS_TAG],[test "$enable_progress_tag" = "yes"])
 AM_CONDITIONAL([ENABLE_CHANNEL_MESSAGING],[test "$enable_channel_messaging" = "yes"])
 AM_CONDITIONAL([ENABLE_JAVASCRIPT_DEBUGGER],[test "$enable_javascript_debugger" = "yes"])
-AM_CONDITIONAL([ENABLE_OFFLINE_WEB_APPLICATIONS],[test "$enable_offline_web_applications" = "yes"])
 AM_CONDITIONAL([ENABLE_DIRECTORY_UPLOAD],[test "$enable_directory_upload" = "yes"])
 AM_CONDITIONAL([ENABLE_DATAGRID],[test "$enable_datagrid" = "yes"])
 AM_CONDITIONAL([ENABLE_DATA_TRANSFER_ITEMS],[test "$enable_data_transfer_items" = "yes"])
@@ -1243,7 +1231,6 @@ Features:
  MathML support                                           : $enable_mathml
  Media source                                             : $enable_media_source
  Media statistics                                         : $enable_media_statistics
- HTML5 offline web applications support                   : $enable_offline_web_applications
  HTML5 channel messaging support                          : $enable_channel_messaging
  HTML5 meter element support                              : $enable_meter_tag
  Page Visibility API support                              : $enable_page_visibility_api