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) 1996-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:
// Common client side class
//
//
#include <e32std.h>
#include "../SERVER/w32cmd.h"
#include "CLIENT.H"
MWsClientClass::MWsClientClass() : iWsHandle(0), iBuffer(NULL)
{
}
MWsClientClass::MWsClientClass(RWsBuffer *aBuffer) : iWsHandle(0), iBuffer(aBuffer)
{
}
void MWsClientClass::Write(const TAny *aData1, TInt aLength1,const TAny *aData2, TInt aLength2,TUint aOpcode) const
{
iBuffer->Write(iWsHandle,aOpcode,aData1,aLength1,aData2,aLength2);
}
void MWsClientClass::Write(const TAny *aData1, TInt aLength1,TUint aOpcode) const
{
iBuffer->Write(iWsHandle,aOpcode,aData1,aLength1);
}
void MWsClientClass::Write(TUint aOpcode) const
{
iBuffer->Write(iWsHandle,aOpcode);
}
void MWsClientClass::WriteInt(TInt aInt, TUint aOpcode) const
{
iBuffer->Write(iWsHandle,aOpcode,&aInt,sizeof(TInt));
}
void MWsClientClass::WriteRect(const TRect &aRect, TUint aOpcode) const
{
Write(&aRect,sizeof(aRect),aOpcode);
}
void MWsClientClass::WritePoint(const TPoint &aPoint, TUint aOpcode) const
{
Write(&aPoint,sizeof(aPoint),aOpcode);
}
void MWsClientClass::WriteSize(const TSize &aSize, TUint aOpcode) const
{
Write(&aSize,sizeof(aSize),aOpcode);
}
TInt MWsClientClass::WriteReply(TUint aOpcode,const TIpcArgs* aIpcArgs) const
{
return(iBuffer->WriteReply(iWsHandle,aOpcode,aIpcArgs));
}
TInt MWsClientClass::WriteReplyInt(TInt aInt, TUint aOpcode,const TIpcArgs* aIpcArgs) const
{
return(iBuffer->WriteReply(iWsHandle,aOpcode,&aInt,sizeof(TInt),aIpcArgs));
}
TInt MWsClientClass::WriteReply(const TAny *aData1, TInt aLength1,TUint aOpcode,const TIpcArgs* aIpcArgs) const
{
return(iBuffer->WriteReply(iWsHandle,aOpcode,aData1,aLength1,aIpcArgs));
}
TInt MWsClientClass::WriteReply(const TAny *aData1, TInt aLength1,const TAny *aData2, TInt aLength2,TUint aOpcode,const TIpcArgs* aIpcArgs) const
{
return(iBuffer->WriteReply(iWsHandle,aOpcode,aData1,aLength1,aData2,aLength2,aIpcArgs));
}
TInt MWsClientClass::WriteReplyP(const TWriteDescriptorType& aReplyPackage,TUint aOpcode) const
{
return(iBuffer->WriteReplyP(iWsHandle,aOpcode,aReplyPackage));
}
TInt MWsClientClass::WriteReplyIntP(TInt aInt, const TWriteDescriptorType& aReplyPackage,TUint aOpcode) const
{
return(iBuffer->WriteReplyP(iWsHandle,aOpcode,&aInt,sizeof(aInt),aReplyPackage));
}
TInt MWsClientClass::WriteReplyP(const TAny *aData1, TInt aLength1, const TWriteDescriptorType& aReplyPackage,TUint aOpcode) const
{
return(iBuffer->WriteReplyP(iWsHandle,aOpcode,aData1,aLength1,aReplyPackage));
}
TInt MWsClientClass::WriteReplyP(const TAny *aData1, TInt aLength1,const TAny *aData2, TInt aLength2, const TWriteDescriptorType& aReplyPackage,TUint aOpcode) const
{
return(iBuffer->WriteReplyP(iWsHandle,aOpcode,aData1,aLength1,aData2,aLength2,aReplyPackage));
}
TInt MWsClientClass::WriteReplyByProvidingRemoteReadAccess(const TAny* aBuf, TInt aBufLen,const TReadDescriptorType& aRemoteReadBuffer, TUint aOpcode) const
{
return(iBuffer->WriteReplyByProvidingRemoteReadAccess(iWsHandle,aOpcode,aBuf,aBufLen,aRemoteReadBuffer));
}
void MWsClientClass::AddToBitmapArray(const TInt aBitmapHandle)const
{
iBuffer->AddToBitmapArray(aBitmapHandle);
}
void MWsClientClass::AsyncRequest(TRequestStatus& aStatus, TUint aOpcode) const
{
iBuffer->AsyncRequest(iWsHandle, aOpcode, aStatus);
}
TBool MWsClientClass::WindowSizeCacheEnabled() const
{
return iBuffer->WindowSizeCacheEnabled();
}
void MWsClientClass::MarkWindowSizeCacheDirty()
{
iBuffer->MarkWindowSizeCacheDirty(iWsHandle);
}
void MWsClientClass::RefreshWindowSizeCache(const TSize& aNewSize) const
{
iBuffer->RefreshWindowSizeCache(iWsHandle,aNewSize);
}
TInt MWsClientClass::CachedWindowSize(TSize& aSize) const
{
return iBuffer->CachedWindowSize(iWsHandle, aSize);
}
void MWsClientClass::DestroyWindowSizeCacheEntry()
{
iBuffer->DestroyWindowSizeCacheEntry(iWsHandle);
}
#ifdef SYMBIAN_GRAPHICS_FIXNATIVEORIENTATION
void MWsClientClass::EnableWindowNativeSizeCacheL()
{
return iBuffer->EnableWindowNativeSizeCacheL();
}
TBool MWsClientClass::WindowNativeSizeCacheEnabled() const
{
return iBuffer->WindowNativeSizeCacheEnabled();
}
TInt MWsClientClass::SetWindowNativeSize(const TSize& aNativeSize) const
{
return iBuffer->SetWindowNativeSize(iWsHandle,aNativeSize);
}
TInt MWsClientClass::WindowNativeSize(TSize& aSize) const
{
return iBuffer->WindowNativeSize(iWsHandle, aSize);
}
void MWsClientClass::DestroyWindowNativeSizeCacheEntry()
{
iBuffer->DestroyWindowNativeSizeCacheEntry(iWsHandle);
}
#endif // SYMBIAN_GRAPHICS_FIXNATIVEORIENTATION