--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/package_definition.xml Mon Aug 02 12:09:20 2010 +0300
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="uiaccelerator" name="UI Accelerator" levels="plugin framework server ex if">
+ <collection id="uiaccelerator_plat" name="UI Accelerator Platform Interfaces" level="if">
+ <component id="alf_core_toolkit_api" name="ALF Core Toolkit API" class="api" filter="s60">
+ <meta rel="Api" href="uiaccelerator_plat/alf_core_toolkit_api/alf_core_toolkit_api.metaxml"/>
+ <unit bldFile="uiaccelerator_plat/alf_core_toolkit_api/group" filter="!test"/>
+ <unit bldFile="uiaccelerator_plat/alf_core_toolkit_api/tsrc/group" filter="test,unit_test"/>
+ </component>
+ <component id="alf_visual_api" name="ALF Visual API" class="api" filter="s60">
+ <meta rel="Api" href="uiaccelerator_plat/alf_visual_api/alf_visual_api.metaxml"/>
+ <unit bldFile="uiaccelerator_plat/alf_visual_api/group" filter="!test"/>
+ <unit bldFile="uiaccelerator_plat/alf_visual_api/tsrc/group" filter="test,unit_test"/>
+ </component>
+ <component id="alf_extended_visual_api" name="ALF Extended Visual API" class="api" filter="s60">
+ <meta rel="Api" href="uiaccelerator_plat/alf_extended_visual_api/alf_extended_visual_api.metaxml"/>
+ <unit bldFile="uiaccelerator_plat/alf_extended_visual_api/group" filter="!test"/>
+ <unit bldFile="uiaccelerator_plat/alf_extended_visual_api/tsrc/group" filter="test,unit_test"/>
+ </component>
+ <component id="alf_extension_api" name="ALF Extension API" class="api" filter="s60">
+ <meta rel="Api" href="uiaccelerator_plat/alf_extension_api/alf_extension_api.metaxml"/>
+ <unit bldFile="uiaccelerator_plat/alf_extension_api/group"/>
+ </component>
+ <component id="alf_tracing_api" name="ALF Tracing API" class="api" filter="s60">
+ <meta rel="Api" href="uiaccelerator_plat/alf_tracing_api/alf_tracing_api.metaxml"/>
+ <unit bldFile="uiaccelerator_plat/alf_tracing_api/group"/>
+ </component>
+ <component id="alf_client_server_api" name="ALF Client Server API" class="api" filter="s60">
+ <meta rel="Api" href="uiaccelerator_plat/alf_client_server_api/alf_client_server_api.metaxml"/>
+ <unit bldFile="uiaccelerator_plat/alf_client_server_api/group"/>
+ </component>
+ </collection>
+ <collection id="uiacceltk" name="UI Accelerator Toolkit" level="framework">
+ <component id="hitchcock" filter="s60" name="Hitchcock">
+ <unit bldFile="uiacceltk/hitchcock/group"/>
+ </component>
+ <component id="uiacceltk_rom" filter="s60" name="UI Accelerator Toolkit ROM">
+ <unit bldFile="uiacceltk/rom"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/package_map.xml Mon Aug 02 12:09:20 2010 +0300
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="mw"/>
--- a/uiaccelerator_plat/alf_client_server_api/inc/alf/alfappsrvsessionbase.h Tue Jul 06 14:56:00 2010 +0300
+++ b/uiaccelerator_plat/alf_client_server_api/inc/alf/alfappsrvsessionbase.h Mon Aug 02 12:09:20 2010 +0300
@@ -288,6 +288,8 @@
// creates subsession
CAlfSrvSubSessionBase* CreateSubSessionLC(const RMessage2& aMessage);
+
+ TUint SecureId();
protected: // from baseclasses
--- a/uiacceltk/hitchcock/ServerCore/Src/alfappsrvsession.cpp Tue Jul 06 14:56:00 2010 +0300
+++ b/uiacceltk/hitchcock/ServerCore/Src/alfappsrvsession.cpp Mon Aug 02 12:09:20 2010 +0300
@@ -32,6 +32,10 @@
#include "alfclientserver.h"
#include "alfsrvtexturemanager.h"
#include "alfsrvscreenbuffermanager.h"
+#include "alfstreamerconsts.h"
+#include "alfdecoderserverclient.h"
+
+
#include <coemain.h>
@@ -292,20 +296,6 @@
iAnimatedTextures.operator[](index)->EnableAnimation(ETrue);
}
- if ( aDoTransitionEffect && AlfServer()->TransitionEffects()->IsEnabled() &&
- (display->DisplayType() != CHuiDisplay::EDisplayOffScreenBuffer))
- {
- ASSERT(AlfServer()->TransitionEffects() != NULL);
- AlfServer()->TransitionEffects()->StartPhase( MAlfTransEffectPlugin::EFirstPhase,
- aDoTransitionEffect, *iEffectEnv );
-
- iControlGroupOrder.Reset();
- }
- else
- {
-// ShowControlGroupsInOrderL(*display);
- }
-
// This is needed for Huitk BitBlit() to succeed
#ifdef SYMBIAN_BUILD_GCE
@@ -354,9 +344,6 @@
return didTransition;
}
-/*
-#ifdef HUI_FX
-*/
if (display->DisplayType() != CHuiDisplay::EDisplayOffScreenBuffer)
{
// Disable all animated textures for the session
@@ -371,40 +358,6 @@
// as the background will be visible if the effect does not cover full screen
// or is partially transparent.
}
-/*
-#else
- // Do not hide or set transparency if this is off-screen buffer
- if (display->DisplayType() != CHuiDisplay::EDisplayOffScreenBuffer)
- {
- // Disable all animated textures for the session
- for (TInt index = 0; index < iAnimatedTextures.Count(); index++)
- {
- iAnimatedTextures.operator[](index)->EnableAnimation(EFalse);
- }
-
- if ( aDoTransitionEffect && AlfServer()->TransitionEffects()->IsEnabled() )
- {
- StoreControlGroupOrderL(*display, EFalse ); // do not hide
- ASSERT(AlfServer()->TransitionEffects() != NULL);
- AlfServer()->TransitionEffects()->StartPhase( MAlfTransEffectPlugin::EFirstPhase,
- aDoTransitionEffect, *iEffectEnv );
- didTransition = ETrue;
- }
- // Hide control groups
- else
- {
- StoreControlGroupOrderL(*display, ETrue ); // hide as well
- }
-
-#ifdef SYMBIAN_BUILD_GCE
- // When alf application is not focused we dont draw background because it is
- // not visible as the alf application is not visible either (its controlgroups
- // were just hidden in the code above).
- display->SetClearBackgroundL(CHuiDisplay::EClearNone);
-#endif
- }
-#endif
-*/
return didTransition;
}
@@ -2737,6 +2690,17 @@
{
iTextureInfo.Remove( pos );
}
+
+ //Photos is never killed if it is excluded here. hence commenting
+ /*
+ if (!iTextureInfo.Count())
+ {
+ if (AlfAppUi()->BridgerClient())
+ {
+ AlfAppUi()->BridgerClient()->SendBlind(EAlfExcludeFromGoomTargets, TIpcArgs(SecureId(),ClientWindowGroup()));
+ }
+ }
+ */
}
TInt CAlfAppSrvSession::GetTextureSize(
@@ -2765,6 +2729,15 @@
aPriority = Max( 0, aPriority );
aPriority = Min( 1, aPriority );
+ if (!iTextureInfo.Count())
+ {
+ if (AlfAppUi()->BridgerClient())
+ {
+ AlfAppUi()->BridgerClient()->SendBlind(EAlfVolunteerForGoomTarget, TIpcArgs(SecureId(), ClientWindowGroup()));
+ }
+ }
+
+
TInt pos = FindTextureInfoById( aTextureId );
if ( pos != KErrNotFound )
{
--- a/uiacceltk/hitchcock/ServerCore/Src/alfappsrvsessionBase.cpp Tue Jul 06 14:56:00 2010 +0300
+++ b/uiacceltk/hitchcock/ServerCore/Src/alfappsrvsessionBase.cpp Mon Aug 02 12:09:20 2010 +0300
@@ -406,6 +406,7 @@
{
__ASSERT_DEBUG(iData, USER_INVARIANT());
iData->iClientWindowGroupId = aId;
+ //Adding this app to goom list - otherwise app like photos will never be killed
if (AlfAppUi()->BridgerClient())
{
AlfAppUi()->BridgerClient()->SendBlind(EAlfVolunteerForGoomTarget, TIpcArgs(iData->iSecureId, iData->iClientWindowGroupId));
@@ -1140,6 +1141,15 @@
CleanupStack::PopAndDestroy();
}
}
+
+TUint CAlfAppSrvSessionBase::SecureId()
+ {
+ if (iData)
+ {
+ return iData->iSecureId;
+ }
+ return 0;
+ }
// End of file
--- a/uiacceltk/hitchcock/goommonitor/data/goomconfig.xml Tue Jul 06 14:56:00 2010 +0300
+++ b/uiacceltk/hitchcock/goommonitor/data/goomconfig.xml Mon Aug 02 12:09:20 2010 +0300
@@ -47,7 +47,7 @@
<!-- The uid DEFAULT_APP refers to all applications, which priority is not specifically
defined in the conf file.
-->
- <close_app uid="DEFAULT_APP" priority="80" sync_mode="check" close_timeout="1000" wait_after_close="2000">
+ <close_app uid="DEFAULT_APP" priority="80" sync_mode="check" close_timeout="1000" wait_after_close="1000">
<app_close_idle_priority idle_time="900" priority="50"></app_close_idle_priority>
<app_close_idle_priority idle_time="43200" priority="20"></app_close_idle_priority>
</close_app>
@@ -79,9 +79,10 @@
defined in the conf file.
-->
<system_plugin uid="DEFAULT_PLUGIN" priority="10" sync_mode="check" sw_rend="not_supported"></system_plugin>
- <system_plugin uid="E4B6C988" priority="3" sync_mode="check" sw_rend="supported"></system_plugin> <!-- ALFOOGMPLUGIN -->
- <system_plugin uid="2002DC75" priority="4" sync_mode="check" sw_rend="supported"></system_plugin> <!-- HbThemeserverOOGMPLUGIN? -->
- <system_plugin uid="2002C30A" priority="5" sync_mode="continue"></system_plugin> <!-- FLASHOOGMPLUGIN -->
+ <system_plugin uid="2002DC75" priority="3" sync_mode="continue" sw_rend="not_supported"></system_plugin> <!-- HbThemeserverOOGMPLUGIN? -->
+ <system_plugin uid="E4B6C988" priority="4" sync_mode="check" sw_rend="supported"></system_plugin> <!-- ALFOOGMPLUGIN -->
+ <system_plugin uid="2002DC75" priority="5" sync_mode="continue" sw_rend="supported" ></system_plugin> <!-- HbThemeserverOOGMPLUGIN? -->
+ <system_plugin uid="2002C30A" priority="6" sync_mode="continue"></system_plugin> <!-- FLASHOOGMPLUGIN -->
</system_plugin_settings>
<!-- The priority of executing each application plugin is defined here.
--- a/uiacceltk/hitchcock/goommonitor/inc/goomrunpluginconfig.h Tue Jul 06 14:56:00 2010 +0300
+++ b/uiacceltk/hitchcock/goommonitor/inc/goomrunpluginconfig.h Mon Aug 02 12:09:20 2010 +0300
@@ -60,6 +60,8 @@
inline TBool IsSwRendSupported();
+ CGOomRunPluginConfig * iNextConfig;
+
private:
CGOomRunPluginConfig(TUint aPluginId, TGOomPluginType aPluginType);
--- a/uiacceltk/hitchcock/goommonitor/src/goomactionlist.cpp Tue Jul 06 14:56:00 2010 +0300
+++ b/uiacceltk/hitchcock/goommonitor/src/goomactionlist.cpp Mon Aug 02 12:09:20 2010 +0300
@@ -163,20 +163,6 @@
{
// Get the config for this plugin
CGOomRunPluginConfig& pluginConfig = aConfig.GetPluginConfig(iPluginList->Uid(pluginIndex));
- TInt priority = pluginConfig.CalculatePluginPriority(aWindowGroupList);
-
- TGOomSyncMode syncMode = pluginConfig.iSyncMode;
- TInt ramEstimate = pluginConfig.iRamEstimate;
-
- TActionRef::TActionType actionType;
-
- if (pluginConfig.PluginType() == EGOomAppPlugin)
- {
- actionType = TActionRef::EAppPlugin;
- }
- else
- actionType = TActionRef::ESystemPlugin;
-
//get skip plugin config for foreground app
TUint foregroundUid = iMonitor.ForegroundAppUid();
@@ -197,12 +183,27 @@
continue ; //skip this and continue with next plugin
}
}
-
- TActionRef ref = TActionRef(actionType, priority, syncMode, ramEstimate, *(iRunPluginActions[actionsIndex]), aWindowGroupList.GetIndexFromAppId(pluginConfig.TargetApp()));
- iAppsProtectedByPlugins.Append(pluginConfig.TargetApp());
- TRACES2("Creating Plugin Action Item %x , TargetAppId %x", iPluginList->Uid(pluginIndex), pluginConfig.TargetApp());
- //It is valid to have plugins with equal priority
- User::LeaveIfError(iActionRefs.InsertInOrderAllowRepeats(ref, ComparePriorities));
+
+ actionsIndex--;
+ CGOomRunPluginConfig * nextConfigForSamePlugin = &pluginConfig;
+ while(nextConfigForSamePlugin)
+ {
+ TInt priority = nextConfigForSamePlugin->CalculatePluginPriority(aWindowGroupList);
+ TGOomSyncMode syncMode = nextConfigForSamePlugin->iSyncMode;
+ TInt ramEstimate = nextConfigForSamePlugin->iRamEstimate;
+ TActionRef::TActionType actionType;
+ if (nextConfigForSamePlugin->PluginType() == EGOomAppPlugin)
+ actionType = TActionRef::EAppPlugin;
+ else
+ actionType = TActionRef::ESystemPlugin;
+
+ TActionRef ref = TActionRef(actionType, priority, syncMode, ramEstimate, *(iRunPluginActions[++actionsIndex]), aWindowGroupList.GetIndexFromAppId(nextConfigForSamePlugin->TargetApp()));
+ iAppsProtectedByPlugins.Append(nextConfigForSamePlugin->TargetApp());
+ TRACES2("Creating Plugin Action Item %x , TargetAppId %x", iPluginList->Uid(pluginIndex), nextConfigForSamePlugin->TargetApp());
+ //It is valid to have plugins with equal priority
+ User::LeaveIfError(iActionRefs.InsertInOrderAllowRepeats(ref, ComparePriorities));
+ nextConfigForSamePlugin = nextConfigForSamePlugin->iNextConfig;
+ }
actionsIndex++;
}
@@ -737,6 +738,7 @@
}
else
{
+ iMonitor.SwitchMemMode(CMemoryMonitor::EGOomLowMemMode);
TRACES1("CGOomActionList::StateChanged: All current Plugin actions complete, below good threshold, Time to kill bad guys. freeMemory=%d", freeMemory);
iRunningKillAppActions = ETrue;
iMonitor.RunCloseAppActions(iMaxPriority);
@@ -782,6 +784,14 @@
CGOomRunPlugin* action = CGOomRunPlugin::NewL(iPluginList->Uid(pluginIndex), pluginConfig, *this, iPluginList->Implementation(pluginIndex));
iRunPluginActions.AppendL(action);
+
+ CGOomRunPluginConfig * nextConfigForSamePlugin = pluginConfig.iNextConfig;
+ while(nextConfigForSamePlugin)
+ {
+ CGOomRunPlugin* action = CGOomRunPlugin::NewL(iPluginList->Uid(pluginIndex), *(nextConfigForSamePlugin), *this, iPluginList->Implementation(pluginIndex));
+ iRunPluginActions.AppendL(action);
+ nextConfigForSamePlugin = nextConfigForSamePlugin->iNextConfig;
+ }
}
//references to v2 plugin types removed as these are not yet used by GOOM
--- a/uiacceltk/hitchcock/goommonitor/src/goomconfig.cpp Tue Jul 06 14:56:00 2010 +0300
+++ b/uiacceltk/hitchcock/goommonitor/src/goomconfig.cpp Mon Aug 02 12:09:20 2010 +0300
@@ -75,7 +75,12 @@
CGOomRunPluginConfig** runPluginConfig = iPluginToConfigMapping.Find(aPluginConfig->Id());
if (runPluginConfig)
{
- GOomMonitorPanic(KPluginConfigAddedTwice);
+ //GOomMonitorPanic(KPluginConfigAddedTwice);
+ while((*runPluginConfig)->iNextConfig != NULL)
+ *runPluginConfig = (*runPluginConfig)->iNextConfig;
+
+ (*runPluginConfig)->iNextConfig = aPluginConfig;
+ return;
}
iPluginToConfigMapping.InsertL(aPluginConfig->Id(), aPluginConfig);
--- a/uiacceltk/hitchcock/goommonitor/src/goommemorymonitor.cpp Tue Jul 06 14:56:00 2010 +0300
+++ b/uiacceltk/hitchcock/goommonitor/src/goommemorymonitor.cpp Mon Aug 02 12:09:20 2010 +0300
@@ -253,7 +253,17 @@
{
return;
}
- iForegroundAppUid = aForegroundAppUid;
+
+ if(iForegroundAppUid != aForegroundAppUid)
+ {
+ iForegroundAppUid = aForegroundAppUid;
+ iForegroundAppHasChanged = ETrue;
+ iRendswitched = 0;
+ }
+ else
+ {
+ iForegroundAppHasChanged = EFalse;
+ }
// Refresh the low and good memory thresholds as they may have changed due to the new foreground application
RefreshThresholds(aForegroundAppUid);
@@ -325,31 +335,59 @@
// Run the memory freeing actions
iGOomActionList->FreeMemory(aMaxPriority);
- SwitchMemMode(EGOomLowMemMode);
}
void CMemoryMonitor::SwitchMemMode(TGOomMemMode aMemMode)
{
if(iMemMode == aMemMode)
+ {
+ if(iMemMode == EGOomGoodMemMode)
+ {
+ TRACES("CMemoryMonitor::SwitchMemMode NOT switching rendering mode. Already in GOOD Mode");
+ }
+ else
+ {
+ TRACES("CMemoryMonitor::SwitchMemMode NOT switching rendering mode. Already in LOW Mode");
+ }
return;
+ }
#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS
TWsEvent event;
if(aMemMode == EGOomLowMemMode)
{
+ if(iRendswitched < 3)
+ iRendswitched ++;
+ else
+ return;
+
iLowOnMemWgs.Reset();
iGOomWindowGroupList->GetListOfWindowGroupsWSurfaces(iLowOnMemWgs);
event.SetType(KGoomMemoryLowEvent);
+ TRACES("CMemoryMonitor::SwitchMemMode. Switching rendering mode to SW, Sending KGoomMemoryLowEvent");
}
else
{
+ if(iRendswitched > 0)
+ {
+ if(iRendswitched < 3)
+ iRendswitched ++;
+ else
+ {
+ TRACES("CMemoryMonitor::SwitchMemMode GOOM Detected SW-HW-SW looping. NOT switching to HW rendering mode");
+ return;
+ }
+ }
+
event.SetType(KGoomMemoryGoodEvent);
+ TRACES("CMemoryMonitor::SwitchMemMode. Switching rendering mode to HW, Sending KGoomMemoryGoodEvent");
}
for (TInt i = iLowOnMemWgs.Count()-1; i>=0; i--)
{
iWs.SendEventToWindowGroup(iLowOnMemWgs[i], event);
+ TRACES1("CMemoryMonitor::SwitchMemMode. Sending event to wg %d",iLowOnMemWgs[i]);
}
#endif
--- a/uiacceltk/hitchcock/goommonitor/src/goomrunplugin.cpp Tue Jul 06 14:56:00 2010 +0300
+++ b/uiacceltk/hitchcock/goommonitor/src/goomrunplugin.cpp Mon Aug 02 12:09:20 2010 +0300
@@ -53,10 +53,13 @@
TInt flags = KGOomUseSwRendering;
iPlugin.FreeRam(aBytesRequested, flags);
iFreeMemoryWithSwRenderingCalled = ETrue;
+ TRACES("CGOomRunPlugin::FreeMemory: UseSwRendering TRUE");
}
else
{
iPlugin.FreeRam(aBytesRequested, 0);
+ iFreeMemoryWithSwRenderingCalled = EFalse;
+ TRACES("CGOomRunPlugin::FreeMemory: UseSwRendering FALSE");
}
iFreeMemoryCalled = ETrue;
--- a/uiacceltk/hitchcock/goommonitor/src/goomrunpluginconfig.cpp Tue Jul 06 14:56:00 2010 +0300
+++ b/uiacceltk/hitchcock/goommonitor/src/goomrunpluginconfig.cpp Mon Aug 02 12:09:20 2010 +0300
@@ -42,6 +42,7 @@
CGOomRunPluginConfig::~CGOomRunPluginConfig()
{
FUNC_LOG;
+ delete iNextConfig;
}
--- a/uiacceltk/hitchcock/group/bld.inf Tue Jul 06 14:56:00 2010 +0300
+++ b/uiacceltk/hitchcock/group/bld.inf Mon Aug 02 12:09:20 2010 +0300
@@ -12,11 +12,15 @@
* Contributors:
*
* Description: Build information file for project alfappserver
-* Version : %version: tr1sido#128.1.10 %
+* Version : %version: tr1sido#128.1.12 %
*
*/
-
+#ifndef ALF_USE_OPENWF_COMPOSITION
+#ifdef SYMBIAN_GRAPHICS_BUILD_OPENWF_WSERV
+#define ALF_USE_OPENWF_COMPOSITION
+#endif
+#endif
PRJ_PLATFORMS
DEFAULT
--- a/uiacceltk/hitchcock/plugins/alfoogmplugin/src/alfoogmplugin.cpp Tue Jul 06 14:56:00 2010 +0300
+++ b/uiacceltk/hitchcock/plugins/alfoogmplugin/src/alfoogmplugin.cpp Mon Aug 02 12:09:20 2010 +0300
@@ -51,7 +51,7 @@
//
CAlfOogmMonitorPlugin::~CAlfOogmMonitorPlugin()
{
-
+ iAlfDirectClient.Disconnect();
}
// -----------------------------------------------------------------------------
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/uiacceltk/rom/bld.inf Mon Aug 02 12:09:20 2010 +0300
@@ -0,0 +1,26 @@
+/*
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Build information file for UI Accelerator Toolkit ROM
+*
+*/
+
+
+#include <bldvariant.hrh>
+#include <platform_paths.hrh>
+PRJ_EXPORTS
+../hitchcock/sis/uiaccelerator_stub.sis /epoc32/release/armv5/urel/uiaccelerator_stub.sis
+../../rom/alfred.iby CORE_MW_LAYER_IBY_EXPORT_PATH(alfred.iby)
+#ifndef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS
+../../rom/alftranseffectplugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH(alftranseffectplugin.iby)
+#endif // #ifndef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS
\ No newline at end of file