FCL/sf/mw/hb: comparison src/hbservers/hbthemeserver/hbthemeserverutils.cpp

equal deleted inserted replaced

-:923ff622b8b9
+:4633027730f5
 #include "hbcssparser_p.h"
 #include "hbeffectfxmldata_p.h"
 #include "hbeffectxmlparser_p.h"
 #include "hbdeviceprofiledatabase_p.h"
 #include "hbthemeperf_p.h"
-#include "hbcache_p.h"
 #include "hbiconsource_p.h"
 #include "hbwidgetloader_p.h"
 #include "hbwidgetloaderactions_p.h"
 #include "hbthemeindex_p.h"
 // cache at the server side to maintain the offsets for
 // the filename,layout and section combination.
 typedef QHash<QString, int> ServerHashForLayoutDefs;
 Q_GLOBAL_STATIC(ServerHashForLayoutDefs, layoutDefsCache)
+// Offset for the cache of the missed CSS files for classes starting 'hb'
+static int missedHbCssFilesOffset = -1;
+static const QString HB_CLASSNAME_PREFIX("hb");
 static const int ICON_SOURCES_MAX_SIZE = 8;
 static QList<HbIconSource *> iconSources; // cache of recently used icon sources
 HbIconSource *HbThemeServerUtils::getIconSource(const QString &filename)
 {
 * \return offset of the shared style sheet in the shared memory, -1 if error
 *
 */
 int HbThemeServerUtils::getSharedStylesheet(const QString &fileName,
 HbLayeredStyleLoader::LayerPriority priority,
+bool &fileExists,
 bool *inSharedCache)
 {
-int cssOffset = -1;
+qptrdiff cssOffset = -1;
 HbSharedCache *sharedCache = 0;
 if (priority == HbLayeredStyleLoader::Priority_Core) {
 sharedCache = HbSharedCache::instance();
 cssOffset = sharedCache->offset(HbSharedCache::Stylesheet, fileName);
 if (inSharedCache) {
 #ifdef THEME_SERVER_TRACES
 qDebug() << "In " << Q_FUNC_INFO;
 #endif // THEME_SERVER_TRACES
 if (cssOffset < 0) {
-if (QFile::exists(fileName)) {
+HbCss::Parser parser;
-HbCss::Parser parser;
+if (!parseCssFile(parser, fileName, cssOffset, fileExists)) {
-if (!parseCssFile(parser, fileName, cssOffset)) {
+if (parser.errorCode == HbCss::Parser::OutOfMemoryError) {
-if (parser.errorCode == HbCss::Parser::OutOfMemoryError) {
+return OUT_OF_MEMORY_ERROR;
-return OUT_OF_MEMORY_ERROR;
-}
 }
 }
 if (sharedCache) { //sharedCache valid only when priority is Priority_Core
 sharedCache->add(HbSharedCache::Stylesheet, fileName, cssOffset);
 }
 }
 return cssOffset;
 }
+/*
+* Returns the offset of the missed CSS files for widgets starting with 'hb'
+*/
+int HbThemeServerUtils::getMissedHbCssFilesOffset()
+{
+if (missedHbCssFilesOffset < 0) {
+initMissedHbCssFilesList();
+}
+return missedHbCssFilesOffset;
+}
+void HbThemeServerUtils::initMissedHbCssFilesList()
+{
+GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
+int offset = -1;
+try {
+offset = manager->alloc(sizeof(HbVector<uint>));
+HbVector<uint> *list = new((char*)manager->base() + offset)
+HbVector<uint>(HbMemoryManager::SharedMemory);
+} catch (std::bad_alloc &) {
+if (offset >= 0) {
+manager->free(offset);
+offset = -1;
+}
+}
+missedHbCssFilesOffset = offset;
+}
 /**
 * HbThemeServerUtils::parseCssFile()
 *
 * Returns false in case Css file has some error or there is not enough memory
 */
 bool HbThemeServerUtils::parseCssFile(HbCss::Parser &parser, const QString &fileName,
-int &cssOffset)
+qptrdiff &cssOffset, bool &fileExists)
 {
 bool retVal = false;
 // 1. Create a styleSheet in shared memory
 GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory) ;
 HB_START_SHAREDMEMORY_PRINT("");
 cssOffset = -1;
 }
 return retVal;
 }
 // 2. Parse the required file into styleSheet.
-parser.init(fileName, true);
+fileExists = parser.init(fileName, true);
+if (!fileExists) {
+if (QFileInfo(fileName).fileName().startsWith(HB_CLASSNAME_PREFIX)) {
+HbVector<uint> *list = HbMemoryUtils::getAddress<HbVector<uint> >(
+HbMemoryManager::SharedMemory, getMissedHbCssFilesOffset());
+if (list) {
+list->append(qHash(fileName));
+}
+}
+if (cssOffset != -1) {
+manager->free(cssOffset);
+cssOffset = -1;
+}
+return retVal;
+}
 retVal = parser.parse(styleSheet);
 if (!retVal) {
 //parser::parse returns false in a number of scenarios
 // 1. css file has some error
 /*
 Returns of the offset for the given filename,layout and section name.
 */
 int HbThemeServerUtils::getSharedLayoutDefinition(const QString &fileName, const QString &layout,
-const QString &section)
+const QString &section, bool &fileExists)
 {
-int layoutDefOffset = -1;
+qptrdiff layoutDefOffset = -1;
 QStringRef nameKey(&fileName);
 if (nameKey.at(0) == ':') {
 //use only filename as a key.
 int index = fileName.lastIndexOf('/');
 if (index >= 0) {
 return layoutDefOffset;
 }
 HbWidgetLoader loader;
 QFile file(fileName);
-if (!file.open(QFile::ReadOnly | QFile::Text)) {
+fileExists = file.open(QFile::ReadOnly | QFile::Text);
+if (!fileExists) {
+#ifdef THEME_SERVER_TRACES
 qWarning("Unable to open file");
+#endif
 return -1;
 }
 #ifdef THEME_SERVER_TRACES
 qDebug() << "Trying to load: " << fileName << "::" << layout << "::" << section;
 #endif // THEME_SERVER_TRACES
 {
 #ifdef THEME_SERVER_TRACES
 qDebug() << "In " << Q_FUNC_INFO << fileName;
 #endif // THEME_SERVER_TRACES
-int effOffset = -1;
+qptrdiff effOffset = -1;
 if (effCache()->contains(fileName)) {
 effOffset = effCache()->value(fileName);
 #ifdef THEME_SERVER_TRACES
 qDebug() << "Got effect in cache: " << fileName << "offset=" << effOffset;
 #endif // THEME_SERVER_TRACES
 return effOffset;
 }
-/**
-* cleanupUnusedCss  function removes css-resources (stylesheets), whose reference count
-* is zero, it also releases the shared memory occupied by those resources.
-* \param cache server css-cache
-*
-*/
-void HbThemeServerUtils::cleanupUnusedCss(HbCache *cache)
-{
-QList<HbCacheItem*> list = cache->lruList();
-while (!list.isEmpty()) {
-HbCacheItem* itemToRemove = list.takeFirst();
-if (itemToRemove->offset != -1) {
-HbCss::StyleSheet *styleSheet =
-HbMemoryUtils::getAddress<HbCss::StyleSheet>(HbMemoryManager::SharedMemory,
-itemToRemove->offset);
-HbMemoryUtils::release<HbCss::StyleSheet>(styleSheet);
-itemToRemove->offset = -1;
-}
-//Since we are cleaning up css-resources whose ref-count is zero, these entries will be
-// removed from actual cache.
-delete cache->cacheHandle().take(itemToRemove->fileName);
-}
-}
 void HbThemeServerUtils::createThemeIndex(const QString &themePath, const HbThemeType &themetype)
 {
 #ifdef THEME_INDEX_TRACES
 qDebug() <<  "ThemeIndex: createThemeIndex" << themePath.toUtf8();
 #endif
 // Verify theme index contents if it is not located in ROM,
 // so that it does not have over-indexing offsets which might
 // crash all the clients trying to read from it.
-#ifdef Q_OS_SYMBIAN // ROM check only for Symbian - verify always in other platforms.
 if (themePath[0] != 'z' && themePath[0] != 'Z') {
-#endif
 #ifdef THEME_INDEX_TRACES
 qDebug() <<  "ThemeIndex: Validating themeindex for theme" << themeName.toUtf8();
 #endif
 HbThemeIndex index(address);
 indexOK = index.validateItems(byteSize);
 #ifdef THEME_INDEX_TRACES
 qDebug() <<  "ThemeIndex: Validating themeindex for theme" << themeName.toUtf8() << " done! Result: " << indexOK;
 #endif
-#ifdef Q_OS_SYMBIAN
 }
-#endif
 if (indexOK) {
 // Allocate theme path string from shared memory
 QByteArray themePathArray = themeBasePath.absolutePath().toLatin1();
 quint32 themePathOffset = manager->alloc(themePathArray.size()+1);
 memcpy(HbMemoryUtils::getAddress<char>(

changeset 21	4633027730f5
parent 5	627c4a0fd0e7
child 28	b7da29130b0e