Merge 1. Pull in cpp files in the performance enhanced Khronos RI OVG files which are newly added. I've ignored platform-specific cpp files for linux, macosx, and null operating systems because this local solution has its own platform glue (i.e. facility to target Bitmaps but no full windowing support). I've ignored sfEGLInterface.cpp because this is used as a bridge to go from EGL to Nokia's Platsim which offers an EGL service. That's not relevant to this implementation because this is ARM side code, not Intel side. I just left a comment to sfEGLInterface.cpp in case we need to pick up this later on. The current code compiles on winscw. Prior to this fix, the code works on winscw, and can launch the SVG tiger (tiger.exe). That takes about 20 seconds to render. I hope to always be able to show this icon on each commit, and the plan is for the render time to reduce with this series of submissions. On this commit, the tiger renders ok in 20 seconds.
// Copyright (c) 2008-2009 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:
//
/**
@file
@test
@internalComponent
*/
// User includes
#include "twservscreenconstructserver.h"
#include "twservscreenconstructstepload.h"
#include "twservscreenconstructconsts.h"
/**
* @return - Instance of the test server
* Same code for Secure and non-secure variants
* Called inside the MainL() function to create and start the
* CTestServer derived server.
*/
CTWServScreenConstructServer* CTWServScreenConstructServer::NewL()
{
CTWServScreenConstructServer* server = new(ELeave) CTWServScreenConstructServer();
CleanupStack::PushL(server);
server->ConstructL();
CleanupStack::Pop(server);
return server;
}
void CTWServScreenConstructServer::ConstructL()
{
RProcess handle = RProcess();
TParsePtrC serverName(handle.FileName());
CTestServer::ConstructL(serverName.Name());
}
/**
* Secure variant
* Much simpler, uses the new Rendezvous() call to sync with the client
*/
LOCAL_C void MainL()
{
#if (defined __DATA_CAGING__)
RProcess().DataCaging(RProcess::EDataCagingOn);
RProcess().SecureApi(RProcess::ESecureApiOn);
#endif
CActiveScheduler* sched=NULL;
sched=new(ELeave) CActiveScheduler;
CActiveScheduler::Install(sched);
CTWServScreenConstructServer* server = NULL;
// Create the CTestServer derived server
TRAPD(err,server = CTWServScreenConstructServer::NewL());
if(!err)
{
// Sync with the client and enter the active scheduler
RProcess::Rendezvous(KErrNone);
sched->Start();
}
delete server;
delete sched;
}
/**
* @return - Standard Epoc error code on process exit
* Secure variant only
* Process entry point. Called by client using RProcess Integ
*/
GLDEF_C TInt E32Main()
{
__UHEAP_MARK;
CTrapCleanup* cleanup = CTrapCleanup::New();
if(cleanup == NULL)
{
return KErrNoMemory;
}
#if (defined TRAP_IGNORE)
TRAP_IGNORE(MainL());
#else
TRAPD(err,MainL());
#endif
delete cleanup;
__UHEAP_MARKEND;
return KErrNone;
}
/**
* @return - A CTestStep derived instance
* Secure and non-secure variants
* Implementation of CTestServer pure virtual
*/
CTestStep* CTWServScreenConstructServer::CreateTestStep(const TDesC& aStepName)
{
CTestStep* testStep = NULL;
if ( aStepName==KTWServScreenConstructStepLoad )
{
testStep=new CTWServScreenConstructStepLoad();
}
return testStep;
}