diff -r 79859ed3eea9 -r 919f36ff910f webengine/osswebengine/WebCore/platform/symbian/StaticObjectsContainer.cpp --- a/webengine/osswebengine/WebCore/platform/symbian/StaticObjectsContainer.cpp Tue Aug 31 16:17:46 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/symbian/StaticObjectsContainer.cpp Wed Sep 01 12:28:30 2010 +0100 @@ -29,15 +29,15 @@ #include "config.h" #include <../bidi.h> // work around for multiple bidi.h files #include "StaticObjectsContainer.h" -#include "BrCtl.h" +#include "Brctl.h" #include "AtomicString.h" #include "PlatformFontCache.h" #include "PictographSymbian.h" #include "FontCache.h" #include "FormFillController.h" #include "ResourceLoaderDelegate.h" -#include "WebKitLogger.h" -#include "BrCtlDefs.h" +#include "webkitLogger.h" +#include #include "WebIconDatabase.h" #include "WebSurface.h" #include "WebCursor.h" @@ -48,7 +48,7 @@ #include "SharedTimer.h" #include "TextEncoding.h" #include "TextEncodingRegistry.h" -#include "cssstyleselector.h" +#include "CSSStyleSelector.h" #include "RenderStyle.h" #include "Page.h" #include "Cache.h" @@ -59,18 +59,20 @@ #include "EventNames.h" #include "FontCache.h" #include "RenderThemeSymbian.h" -#include "QualifiedName.h" +#include "qualifiedname.h" #include "XMLTokenizer.h" #include "Document.h" #include "StyleElement.h" #include "bidi.h" #include "RenderBox.h" #include "FontCache.h" -#include "MimeTypeRegistry.h" +#include "MIMETypeRegistry.h" #include "ResourceHandleManagerSymbian.h" #include "TextBreakIteratorSymbian.h" #include "ImageSymbian.h" #include "HTMLElementFactory.h" +#include "GCController.h" +#include "bitmap\AnimationDecoderWrapped.h" #include #include "WidgetEngineBridge.h" @@ -128,9 +130,11 @@ StaticObjectsContainer::~StaticObjectsContainer() { - // Run KJS collector to cleanup any remaining references - // This must be run before Cache::deleteStaticCache to properly free resources - KJS::Collector::collect(); + // Instruct garbage collect for destruction in progress and to stop garbage collection + gcController().startedExit(true); + KJS::Collector::startedExit(true); + CAnimationDecoderWrapped::closeSyncDecodeThread(); + delete m_oomHandler; delete m_oomStopper; FontCache::deleteFontDataCache(); @@ -337,5 +341,10 @@ m_symbianTheme = new RenderThemeSymbian(); return m_symbianTheme; } + +void StaticObjectsContainer::setIconDatabaseEnabled(bool enabled) +{ + m_icondatabase->setEnabled(enabled); +} } // END OF FILE