diff options
Diffstat (limited to 'Source/WebKit/qt/Api')
-rw-r--r-- | Source/WebKit/qt/Api/qwebsettings.cpp | 5 | ||||
-rw-r--r-- | Source/WebKit/qt/Api/qwebsettings.h | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebKit/qt/Api/qwebsettings.cpp b/Source/WebKit/qt/Api/qwebsettings.cpp index d552cec17..3cbb831af 100644 --- a/Source/WebKit/qt/Api/qwebsettings.cpp +++ b/Source/WebKit/qt/Api/qwebsettings.cpp @@ -600,6 +600,7 @@ QWebSettings::QWebSettings() d->attributes.insert(QWebSettings::FullScreenSupportEnabled, true); d->attributes.insert(QWebSettings::ImagesEnabled, true); d->attributes.insert(QWebSettings::AllowRunningInsecureContent, false); + d->attributes.insert(QWebSettings::ErrorPageEnabled, true); d->offlineStorageDefaultQuota = 5 * 1024 * 1024; d->defaultTextEncoding = QLatin1String("iso-8859-1"); d->thirdPartyCookiePolicy = AlwaysAllowThirdPartyCookies; @@ -936,10 +937,8 @@ void QWebSettings::clearMemoryCaches() // FastMalloc has lock-free thread specific caches that can only be cleared from the thread itself. WebCore::StorageThread::releaseFastMallocFreeMemoryInAllThreads(); -#if ENABLE(WORKERS) WebCore::WorkerThread::releaseFastMallocFreeMemoryInAllThreads(); -#endif - WTF::releaseFastMallocFreeMemory(); + WTF::releaseFastMallocFreeMemory(); } /*! diff --git a/Source/WebKit/qt/Api/qwebsettings.h b/Source/WebKit/qt/Api/qwebsettings.h index 0b0a1f00a..2c22fb46e 100644 --- a/Source/WebKit/qt/Api/qwebsettings.h +++ b/Source/WebKit/qt/Api/qwebsettings.h @@ -92,7 +92,8 @@ public: WebSecurityEnabled, FullScreenSupportEnabled, ImagesEnabled, - AllowRunningInsecureContent + AllowRunningInsecureContent, + ErrorPageEnabled }; enum WebGraphic { MissingImageGraphic, |