# HG changeset patch # User William Roberts # Date 1272490356 -3600 # Node ID 70fc30f96c9469d94497f6807d673272257f97f9 # Parent 2ab528493d70b03f317c8afb914f5b9d074553be# Parent de3d5b6102ac9db52df891d8fb024016dbada14d Merged in another Nokia drop, also called "Revision 201013" diff -r 2ab528493d70 -r 70fc30f96c94 graphicstest/graphicstestharness/automation/h4/tests_05a.txt --- a/graphicstest/graphicstestharness/automation/h4/tests_05a.txt Tue Apr 27 15:34:53 2010 +0100 +++ b/graphicstest/graphicstestharness/automation/h4/tests_05a.txt Wed Apr 28 22:32:36 2010 +0100 @@ -1,5 +1,5 @@ # tests_05a.txt -# Copyright (c) 1995-2009 Nokia Corporation and/or its subsidiary(-ies). +# Copyright (c) 1995-2010 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" @@ -17,5 +17,5 @@ # program,log,commdb,script,timeout,release,pre cmd,post cmd # UI_Bench -# TESTEXECUTE, \logs\testexecute\te_uibench.htm, , z:\uibench\te_uibench.Script, 80000 +TESTEXECUTE, \logs\testexecute\te_uibench.htm, , z:\uibench\te_uibench.Script, 80000 diff -r 2ab528493d70 -r 70fc30f96c94 graphicstest/uibench/group/te_uibench.iby --- a/graphicstest/uibench/group/te_uibench.iby Tue Apr 27 15:34:53 2010 +0100 +++ b/graphicstest/uibench/group/te_uibench.iby Wed Apr 28 22:32:36 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-2010 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" @@ -23,7 +23,6 @@ // MCL profiler is not built for SMP #include #endif -#include #ifdef SYMBIAN_GRAPHICS_USE_GCE #include #include @@ -61,6 +60,10 @@ REM test font files for fbsfonthandleperf.cpp data=DATAZ_\PlatTest\Graphics\TestData\ceurope.gdr \PlatTest\Graphics\TestData\ceurope.gdr +data=DATAZ_\PlatTest\Graphics\TestData\dummy_fonts\dummyFont \PlatTest\Graphics\TestData\dummy_fonts\dummyFont +data=DATAZ_\PlatTest\Graphics\TestData\dummy_fonts\dummyFont_b \PlatTest\Graphics\TestData\dummy_fonts\dummyFont_b +data=DATAZ_\PlatTest\Graphics\TestData\dummy_fonts\dummyFont_i \PlatTest\Graphics\TestData\dummy_fonts\dummyFont_i +data=DATAZ_\PlatTest\Graphics\TestData\dummy_fonts\dummyFont_bi \PlatTest\Graphics\TestData\dummy_fonts\dummyFont_bi REM sprite animation dll file for sprite performance tests file=ABI_DIR\DEBUG_DIR\te_spriteanimdll.dll system\libs\te_spriteanimdll.dll diff -r 2ab528493d70 -r 70fc30f96c94 graphicstest/uibench/src/tfbsfonthandleperf.cpp --- a/graphicstest/uibench/src/tfbsfonthandleperf.cpp Tue Apr 27 15:34:53 2010 +0100 +++ b/graphicstest/uibench/src/tfbsfonthandleperf.cpp Wed Apr 28 22:32:36 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2005-2010 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" @@ -790,6 +790,7 @@ SetTestStepID(_L("GRAPHICS-UI-BENCH-0140")); AliasedFontCreationL(); RecordTestResultL(); + CloseTMSGraphicsStep(); return TestStepResult(); } @@ -857,46 +858,24 @@ CleanupStack::PushL(dummyRasterizer); fontStore->InstallRasterizerL(dummyRasterizer); CleanupStack::Pop(); - + + // Check font files exist before testing + TRAPD(err, DoAddAndRemoveFilesL(aTestOpenFont, fontStore)); + if (err != KErrNone) + { + _LIT(KLog,"Failed to load font files. Error code: %d"); + INFO_PRINTF2(KLog,err); + User::Leave(err); + } + + // Perform the iterations to test iProfiler->InitResults(); for(TInt count=KIterationsToTest; count>=0; --count) { - if (aTestOpenFont) - { - //Add font files to fontstore - TUid id1 = fontStore->AddFileL(KFontDummy); - TUid id2 = fontStore->AddFileL(KFontDummy_b); - TUid id3 = fontStore->AddFileL(KFontDummy_i); - TUid id4 = fontStore->AddFileL(KFontDummy_bi); - //Remove font files from fontstore - fontStore->RemoveFile(id1); - fontStore->RemoveFile(id2); - fontStore->RemoveFile(id3); - fontStore->RemoveFile(id4); - } - else - { - //Add & remove font file to fontstore - TUid id1=TUid::Null(); - TRAPD(err,id1=fontStore->AddFileL(KBitmapFont)); - if (err!=KErrNone) - { - _LIT(KLog,"Loading font file %S gave error %d"); - INFO_PRINTF3(KLog,&KBitmapFont,err); - User::Leave(err); - } - fontStore->RemoveFile(id1); - // total of 4 times, for comparison with Open Font test - TUid id2 = fontStore->AddFileL(KBitmapFont); - fontStore->RemoveFile(id2); - TUid id3 = fontStore->AddFileL(KBitmapFont); - fontStore->RemoveFile(id3); - TUid id4 = fontStore->AddFileL(KBitmapFont); - fontStore->RemoveFile(id4); - } - + DoAddAndRemoveFilesL(aTestOpenFont, fontStore); iProfiler->MarkResultSetL(); } + TInt64 duration=iProfiler->GetTrimedMean(); if (aTestOpenFont) { @@ -911,6 +890,36 @@ heap->Close(); } +// Do the add and removing files. +void CTFbsFontHandlePerf::DoAddAndRemoveFilesL(TBool aTestOpenFont, CFontStore* aFontStore) + { + if (aTestOpenFont) + { + //Add font files to fontstore + TUid id1 = aFontStore->AddFileL(KFontDummy); + TUid id2 = aFontStore->AddFileL(KFontDummy_b); + TUid id3 = aFontStore->AddFileL(KFontDummy_i); + TUid id4 = aFontStore->AddFileL(KFontDummy_bi); + //Remove font files from fontstore + aFontStore->RemoveFile(id1); + aFontStore->RemoveFile(id2); + aFontStore->RemoveFile(id3); + aFontStore->RemoveFile(id4); + } + else + { + //Add & remove font file to fontstore a total of 4 times, for comparison with Open Font test + TUid id1 = aFontStore->AddFileL(KBitmapFont); + aFontStore->RemoveFile(id1); + TUid id2 = aFontStore->AddFileL(KBitmapFont); + aFontStore->RemoveFile(id2); + TUid id3 = aFontStore->AddFileL(KBitmapFont); + aFontStore->RemoveFile(id3); + TUid id4 = aFontStore->AddFileL(KBitmapFont); + aFontStore->RemoveFile(id4); + } + } + // Add fontfile that is already opened. void CTFbsFontHandlePerf::AddingOpenedFontFilesL(TBool aTestOpenFont) { diff -r 2ab528493d70 -r 70fc30f96c94 graphicstest/uibench/src/tfbsfonthandleperf.h --- a/graphicstest/uibench/src/tfbsfonthandleperf.h Tue Apr 27 15:34:53 2010 +0100 +++ b/graphicstest/uibench/src/tfbsfonthandleperf.h Wed Apr 28 22:32:36 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2005-2010 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" @@ -80,6 +80,7 @@ void FontDuplicateL(); void FontGetNearestFontToDesignHeightInPixelsL(const TDesC& aFontName, const TDesC& aTestName); void AddAndRemoveFilesL(TBool aTestOpenFont); + void DoAddAndRemoveFilesL(TBool aTestOpenFont, CFontStore* aFontStore); void AddingOpenedFontFilesL(TBool aTestOpenFont); void FontDrawTextGlyphCacheL(const TDesC& aFontName, const TDesC& aTestName, const TDesC& aOutputText); void FontDrawStringWithoutGlyphCacheL(const TDesC& aFontName, const TDesC& aTestName, TInt aFontHeight,const TDesC& aOutputString); diff -r 2ab528493d70 -r 70fc30f96c94 graphicstools/bitmapfonttools/group/BLD.INF --- a/graphicstools/bitmapfonttools/group/BLD.INF Tue Apr 27 15:34:53 2010 +0100 +++ b/graphicstools/bitmapfonttools/group/BLD.INF Wed Apr 28 22:32:36 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 1999-2010 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" @@ -61,7 +61,9 @@ #ifdef SYMBIAN_OLD_EXPORT_LOCATION ../inc/FNTREADR.H #endif -../inc/PDRRECRD.H SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(PDRRECRD.H) +#ifdef SYMBIAN_OLD_EXPORT_LOCATION +../inc/PDRRECRD.H +#endif #ifdef SYMBIAN_OLD_EXPORT_LOCATION ../inc/PDRREADR.H #endif diff -r 2ab528493d70 -r 70fc30f96c94 printingservices/printerdriversupport/inc/pdrtext.h --- a/printingservices/printerdriversupport/inc/pdrtext.h Tue Apr 27 15:34:53 2010 +0100 +++ b/printingservices/printerdriversupport/inc/pdrtext.h Wed Apr 28 22:32:36 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1997-2010 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" @@ -34,6 +34,8 @@ class CInfoFont; class CTypefaceFonts; class TTextFormat; +class CPdrControl; +class CFbsFont; class CPdrResources : public CBase diff -r 2ab528493d70 -r 70fc30f96c94 windowing/windowserver/group/openwfc/BLD.INF --- a/windowing/windowserver/group/openwfc/BLD.INF Tue Apr 27 15:34:53 2010 +0100 +++ b/windowing/windowserver/group/openwfc/BLD.INF Wed Apr 28 22:32:36 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1998-2010 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" @@ -34,6 +34,7 @@ ../../inc/sizemode.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(sizemode.h) ../../inc/pointerevent.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(pointerevent.h) ../../inc/advancedpointerevent.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(advancedpointerevent.h) +../../inc/advancedpointerevent.inl SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(advancedpointerevent.inl) ../../inc/textcursor.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(textcursor.h) #ifndef SYMBIAN_ENABLE_SPLIT_HEADERS #ifdef SYMBIAN_OLD_EXPORT_LOCATION diff -r 2ab528493d70 -r 70fc30f96c94 windowing/windowserver/inc/advancedpointerevent.h --- a/windowing/windowserver/inc/advancedpointerevent.h Tue Apr 27 15:34:53 2010 +0100 +++ b/windowing/windowserver/inc/advancedpointerevent.h Wed Apr 28 22:32:36 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 1994-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1994-2010 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" @@ -16,6 +16,17 @@ #ifndef ADVANCEDPOINTEREVENT_H #define ADVANCEDPOINTEREVENT_H +#ifndef __E32STD_H__ +#include +#endif +#ifndef __E32KEYS_H__ +#include +#endif +#ifndef POINTEREVENT_H +#include +#endif + + /** Subclass of TPointerEvent created in order to maintain binary compatibility while extending TPointerEvent with new data: (1) pointer number of the pointer whose state change is described by the event, @@ -140,4 +151,7 @@ { return (iModifiers&EModifierAdvancedPointerEvent ? static_cast(this) : NULL); } + +#include "advancedpointerevent.inl" + #endif /* ADVANCEDPOINTEREVENT_H */ diff -r 2ab528493d70 -r 70fc30f96c94 windowing/windowserver/inc/advancedpointerevent.inl --- a/windowing/windowserver/inc/advancedpointerevent.inl Tue Apr 27 15:34:53 2010 +0100 +++ b/windowing/windowserver/inc/advancedpointerevent.inl Wed Apr 28 22:32:36 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-2010 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" @@ -18,7 +18,6 @@ #ifndef ADVANCEDPOINTEREVENT_INL_ #define ADVANCEDPOINTEREVENT_INL_ -#include /** Does basic initialisation of a TAdvancedPointerEvent @internalTechnology */ diff -r 2ab528493d70 -r 70fc30f96c94 windowing/windowserver/nga/CLIENT/advancedpointerevent.cpp --- a/windowing/windowserver/nga/CLIENT/advancedpointerevent.cpp Tue Apr 27 15:34:53 2010 +0100 +++ b/windowing/windowserver/nga/CLIENT/advancedpointerevent.cpp Wed Apr 28 22:32:36 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-2010 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" @@ -17,7 +17,7 @@ // #include "W32STD.H" -#include "advancedpointerevent.inl" + EXPORT_C TInt TAdvancedPointerEvent::DoGetPointerNumber() const /** Gets the pointer number for the event diff -r 2ab528493d70 -r 70fc30f96c94 windowing/windowserver/nga/SERVER/advancedpointereventhelper.cpp --- a/windowing/windowserver/nga/SERVER/advancedpointereventhelper.cpp Tue Apr 27 15:34:53 2010 +0100 +++ b/windowing/windowserver/nga/SERVER/advancedpointereventhelper.cpp Wed Apr 28 22:32:36 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-2010 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" @@ -16,7 +16,7 @@ // #include "advancedpointereventhelper.h" -#include "advancedpointerevent.inl" + void TAdvancedPointerEventHelper::InitAdvancedPointerEvent(TWsEvent& aEvent, TPointerEvent::TType aType, TUint aModifiers, const TPoint3D &aPoint3D, TUint8 aPointerNumber) {