FCL/sf/mw/hb: comparison src/hbservers/hbthemeserver/hbthemeserver

equal deleted inserted replaced

-:e6ad4ef83b23
+:b7da29130b0e
 : CServer2( aActiveObjectPriority ), iWatcher(0)
 {
 // Set up the listener to listen for Publish events
 TRAPD(err, iListener = CHbThemeChangeNotificationListener::NewL(*this));
 if (err) {
-qWarning( "HbThemeServerPrivate::HbThemeServerPrivate: CHbThemeChangeNotificationListener::NewL failed = %d", err );
+THEME_GENERIC_DEBUG() << Q_FUNC_INFO << "CHbThemeChangeNotificationListener::NewL failed. Error code:" << err;
 } else {
 TRAPD(err, iListener->startListeningL());
 if (err) {
-qWarning( "HbThemeServerPrivate::HbThemeServerPrivate: iListener->startListening failed = %d", err );
+THEME_GENERIC_DEBUG() << Q_FUNC_INFO << "iListener->startListening failed. Error code:" << err;
 }
 }
 }
 /**
 indexFileName.append(iCurrentThemePath);
 indexFileName.append("/index.theme");
 QFile currentIndexfile(indexFileName);
 if(!currentIndexfile.open(QIODevice::ReadOnly)) {
-qWarning()<< "HbSymbianThemeServer: No Index file found in the new theme, How did this happen ??";
+THEME_GENERIC_DEBUG()<< Q_FUNC_INFO << "No Index file found in the new theme.";
 return false;
 } else {
 currentIndexfile.close();
 if (!iWatcher) {
 // Set up the file watcher for active theme changes
 QDir path(cleanThemeName);
 iCurrentThemeName = path.dirName();
 iCurrentThemePath = path.absolutePath();
-#ifdef THEME_INDEX_TRACES
+THEME_INDEX_DEBUG() << Q_FUNC_INFO << "Theme change request, new theme =" << cleanThemeName.toUtf8();
-qDebug() << "ThemeIndex: theme change request, new theme =" << cleanThemeName.toUtf8();
-#endif
 // Clear cached icons and session data
 clearIconCache();
 iSessionIter.SetToFirst();
 while(iSessionIter) {
 /**
 Creates a new session with the server.
 */
 CSession2* HbThemeServerPrivate::NewSessionL(const TVersion& aVersion, const RMessage2& /*aMessage*/) const
 {
-#ifdef THEME_SERVER_TRACES
+THEME_GENERIC_DEBUG() << "entering" << Q_FUNC_INFO;
-qDebug() << "HbThemeServerPrivate::NewSessionL: entered";
-#endif
 // Check that the version is OK
 TVersion v(KThemeServerMajorVersionNumber, KThemeServerMinorVersionNumber, KThemeServerBuildVersionNumber);
 if (!User::QueryVersionSupported(v, aVersion))
 User::Leave(KErrNotSupported);
 // Create the session.
 /**
 Services a client request.
 */
 void HbThemeServerSession::ServiceL(const RMessage2& aMessage)
 {
-#ifdef THEME_SERVER_TRACES
+THEME_GENERIC_DEBUG() << "entered" << Q_FUNC_INFO << "with function:" << aMessage.Function();
-qDebug() << "Just entered HbThemeServerSession::ServiceL";
-#endif
 TRAPD(err, DispatchMessageL(aMessage));
 aMessage.Complete(err);
+THEME_GENERIC_DEBUG() << "completed" << Q_FUNC_INFO << "with error code" + err;
-#ifdef THEME_SERVER_TRACES
-QString er;
-er.setNum(err);
-qDebug() << "completed DispatchMessageL error code is " + er;
-#endif
 }
 /**
 Called by ServiceL()
 It tests the function code and then delegates to
 the appropriate function.
 */
 void HbThemeServerSession::DispatchMessageL(const RMessage2& aMessage)
 {
-#ifdef THEME_SERVER_TRACES
-qDebug() << "Just entered HbThemeServerSession::DispatchMessageL";
-#endif
 switch (aMessage.Function()) {
 case EStyleSheetLookup:
 HandleStyleSheetLookupL(aMessage);
 break;
 case EWidgetMLLookup:
 unloadMultiIcon(aMessage);
 break;
 case ENotifyForegroundLost:
 #if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON)
-freeClientGpuResources();
+freeIconResources();
 #endif
 break;
 //Debug Code for Test Purpose
 #ifdef HB_ICON_CACHE_DEBUG
 case ECacheIconCount: {
 iServer->setCurrentRenderingMode(ESWRendering );
 }
 iServer->FreeGpuRam(params.bytesToFree, params.useSwRendering);
 break;
 }
 case ERenderModeSwitch: {
 TInt mode = 0;
 TPckg<TInt> paramPckg(mode);
 aMessage.ReadL(0, paramPckg, 0);
 SwitchRenderingMode((HbRenderingMode)mode);
 int allocatedHeapMem = iServer->allocatedHeapMemory();
 TPckg<int> out(allocatedHeapMem);
 aMessage.WriteL(1, out);
 break;
 }
 case ETypefaceOffset: {
 HandleTypefaceReqL(aMessage);
 break;
 }
 case EMissedHbCssLookup: {
 HandleMissedHbCssLookupL(aMessage);
 break;
 }
-// This is an example of a request that we know about, but don't support.
-// We cause KErrNotSupported to be returned to the client.
 default:
 PanicClient(aMessage, EBadRequest);
 break;
 }
-#ifdef THEME_SERVER_TRACES
-qDebug() << "Leave HbThemeServerSession::DispatchMessageL";
-#endif
 }
 void HbThemeServerSession::SwitchRenderingMode(HbRenderingMode aRenderMode)
 {
 #if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON)
 * HandleStyleSheetLookupL
 */
 void HbThemeServerSession::HandleStyleSheetLookupL(const RMessage2& aMessage)
 {
 if (aMessage.GetDesLength(0) == 0) {
-#ifdef THEME_SERVER_TRACES
+THEME_GENERIC_DEBUG() << Q_FUNC_INFO << "no filename given.";
-qDebug() << "Empty Filename";
-#endif
 return;
 }
 TFileName fileName;
 aMessage.ReadL(0, fileName, 0);
 }
 #endif
 // create dshared pixmap info from HbIconCacheItem
 TPckg<HbSharedIconInfo> pixdata(data);
 aMessage.WriteL(1, pixdata);
-#ifdef THEME_SERVER_TRACES
-qDebug() << "Completed  aMessage.WriteL";
-#endif
 }
 /**
 * Panics the client
 */
 if (!format.isEmpty()) {
 // try search for icon in software mode if the icon is not of type nvg
 // currently only nvg type is used to create RSgImage
 if (format != HbIconCacheItemCreator::KNvg) {
 HbIconKey newKey(key);
-key.renderMode = ESWRendering;
+newKey.renderMode = ESWRendering;
 cacheItem = iServer->iconCacheItem(newKey);
 if (cacheItem) {
 key.renderMode = ESWRendering;
 }
 }
 }
 #endif
 }
 /**
+freeIconResources - unloads all the resources in the session
+Iterates all the keys in sessionData and then CleanUpSessionIConItem is called
+on that item, which will do the cleanup based on the reference count.
+*/
+void HbThemeServerSession::freeIconResources()
+{
+QList<HbIconKey> tempSessionData(sessionData);
+QList<HbIconKey>::const_iterator itEnd( tempSessionData.constEnd() );
+for ( QList<HbIconKey>::const_iterator iter = tempSessionData.constBegin();
+iter != itEnd;
+++iter ) {
+iServer->CleanupSessionIconItem(*iter);
+// remove the item in the session data.
+sessionData.removeOne(*iter);
+}
+}
+/**
 * HbThemeServerSession::ClearSessionData
 *
 * Clears the session data list. Items in the server should be deleted before clearing.
 */
 void HbThemeServerSession::ClearSessionData()

changeset 28	b7da29130b0e
parent 23	e6ad4ef83b23
child 30	80e4d18b72f5