# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1263842418 -7200 # Node ID 6297cdf663322e81c911e21e3f2e8afc35dd6cec # Parent cb62a4f66ebed5be5a6aa6213a54092b9d23e2bc Revision: 201001 Kit: 201003 diff -r cb62a4f66ebe -r 6297cdf66332 browserutilities/connectionmanager/Inc/ConnManActiveConnector.h --- a/browserutilities/connectionmanager/Inc/ConnManActiveConnector.h Thu Jan 07 13:31:38 2010 +0200 +++ b/browserutilities/connectionmanager/Inc/ConnManActiveConnector.h Mon Jan 18 21:20:18 2010 +0200 @@ -83,6 +83,7 @@ TRequestStatus* iExternalRequestStatus; RConnection& iConnection; + TBool iWait; }; diff -r cb62a4f66ebe -r 6297cdf66332 browserutilities/connectionmanager/Src/ConnManActiveConnector.cpp --- a/browserutilities/connectionmanager/Src/ConnManActiveConnector.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/browserutilities/connectionmanager/Src/ConnManActiveConnector.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -34,6 +34,7 @@ : CActive( aPriority ) , iConnection( aConnection ) { + iWait = EFalse; CLOG_CREATE; CActiveScheduler::Add( this );//inserting this into the queue } @@ -43,6 +44,7 @@ //-------------------------------------------------------------------------- CConnManActiveConnector::~CConnManActiveConnector() { + iWait = EFalse; Cancel();//The standard way of destroying an Active object CLOG_CLOSE; } @@ -101,8 +103,11 @@ void CConnManActiveConnector::DoCancel() { CLOG_WRITE( "CConnManActiveConnector: DoCancel called"); - iConnection.Close(); - User::RequestComplete( iExternalRequestStatus, KErrCancel );//completing user req + if(iWait) + { + iConnection.Close(); + User::RequestComplete( iExternalRequestStatus, KErrCancel );//completing user req + } CLOG_WRITE( "CConnManActiveConnector: DoCancel returned"); } @@ -111,6 +116,7 @@ //-------------------------------------------------------------------------- void CConnManActiveConnector::RunL() { + iWait = ETrue; CLOG_WRITE_1( "CConnManAct::RunL(): %d", iStatus.Int() ); User::RequestComplete( iExternalRequestStatus, iStatus.Int() ); } @@ -194,9 +200,10 @@ //-------------------------------------------------------------------------- void CActiveConnectorSyncWrapper::DoCancel() { - - iActiveConnector->Cancel(); - + if(iActiveConnector->IsActive()) + { + iActiveConnector->Cancel(); + } if(iWait.IsStarted()) { iWait.AsyncStop(); diff -r cb62a4f66ebe -r 6297cdf66332 browserutilities/connectionmanager/Src/InternetConnectionManager.cpp --- a/browserutilities/connectionmanager/Src/InternetConnectionManager.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/browserutilities/connectionmanager/Src/InternetConnectionManager.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -641,7 +641,7 @@ EXPORT_C void CInternetConnectionManager::StopConnectionL() { CLOG_ENTERFN( "StopConnectionL()" ); - + CancelConnection(); StopConnectionObserving(); iConnection.Close(); // iServ.Close(); diff -r cb62a4f66ebe -r 6297cdf66332 browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClntSubSession.cpp --- a/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClntSubSession.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClntSubSession.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -252,7 +252,7 @@ // EDlAttrPausable TBool iPausable; // EDlAttrDestRemovable - TBool iRemovableDest; + TInt32 iDestMemType; // EDlAttrState THttpDownloadState TInt32 iDlState; @@ -400,7 +400,7 @@ case EDlAttrDestRemovable: { - iRemovableDest = aValue; + iDestMemType = (aValue) ? KDriveAttRemovable : KDriveAttLocal; } default: @@ -473,6 +473,11 @@ } break; + case EDlAttrDestRemovable: + { + iDestMemType = aValue; + } + default: break; } @@ -667,7 +672,7 @@ case EDlAttrDestRemovable: { - aValue = iRemovableDest ; + aValue = (KDriveAttRemovable == iDestMemType) ? ETrue : EFalse ; } break; default: @@ -726,7 +731,7 @@ case EDlAttrDestRemovable: { - aValue = mediaData->DesRemovable(); + aValue = ( KDriveAttRemovable == mediaData->DesRemovable()) ? ETrue : EFalse ; } break; @@ -805,6 +810,12 @@ } break; + case EDlAttrDestRemovable: + { + aValue = iDestMemType ; + } + break; + default: { ret = KErrNotFound; @@ -883,6 +894,12 @@ aValue = mediaData->Method(); } break; + + case EDlAttrDestRemovable: + { + aValue = mediaData->DesRemovable(); + } + break; default: { @@ -1991,9 +2008,9 @@ GetBoolAttribute(EDlAttrPausable, bPausable); iDlExtension->SetBoolAttribute( EDlAttrPausable, bPausable ); - TBool bRemovableDest; - GetBoolAttribute(EDlAttrDestRemovable, bRemovableDest); - iDlExtension->SetBoolAttribute( EDlAttrDestRemovable, bRemovableDest ); + TInt32 removableDestStatus; + GetIntAttribute(EDlAttrDestRemovable, removableDestStatus); + iDlExtension->SetIntAttribute( EDlAttrDestRemovable, removableDestStatus ); // diff -r cb62a4f66ebe -r 6297cdf66332 browserutilities/downloadmgr/DownloadMgrServEng/Inc/DownloadDataServ.h --- a/browserutilities/downloadmgr/DownloadMgrServEng/Inc/DownloadDataServ.h Thu Jan 07 13:31:38 2010 +0200 +++ b/browserutilities/downloadmgr/DownloadMgrServEng/Inc/DownloadDataServ.h Mon Jan 18 21:20:18 2010 +0200 @@ -183,7 +183,7 @@ * Set destination removable attribute. * @param aDesRemovable Whether removable media drive. */ - void SetDesRemovable( TBool aDesRemovable ); + void SetDesRemovable( TInt32 aDesRemovable ); /** * Set last error id attribute. diff -r cb62a4f66ebe -r 6297cdf66332 browserutilities/downloadmgr/DownloadMgrServEng/Inc/HttpStorage.h --- a/browserutilities/downloadmgr/DownloadMgrServEng/Inc/HttpStorage.h Thu Jan 07 13:31:38 2010 +0200 +++ b/browserutilities/downloadmgr/DownloadMgrServEng/Inc/HttpStorage.h Mon Jan 18 21:20:18 2010 +0200 @@ -212,7 +212,7 @@ HBufC* DestFilename()const { return iDestFilename; }; HBufC* DdFileName()const { return iDdFilename; }; TBool DestFNameSet()const { return iDestFNameSet; }; - TBool RemovableDest()const { return iRemovableDest; }; + TInt32 RemovableDest()const { return iRemovableStatus; }; TBool ProgressiveDownload()const { return iProgressiveDownload; } TInt32 Length()const { return iLength; }; TInt32 DownloadedSize()const { return iDownloadedSize; }; @@ -221,7 +221,7 @@ void SetLength( TInt32 aLength ){ iLength = aLength; }; void SetDownloadedSize( TInt32 aSize ){ iDownloadedSize = aSize; iBufferedSize = aSize; }; - void SetRemovableDest( TBool aRemovable ){ iRemovableDest = aRemovable; }; + void SetRemovableDest( TInt32 aRemovable ){ iRemovableStatus = aRemovable; }; void SetLocalFilenameL(const TDesC16& aValue); void SetPartialContentLength( TInt32 aLength ){ iPartialLength = aLength; }; void SetMoDownloadedSize( TInt32 aMoSize ){ iMoDownloadedSize = aMoSize ;}; @@ -279,7 +279,8 @@ TBool iProgressiveDownload; // EDlAttrProgressive - TBool iRemovableDest; + TInt32 iRemovableStatus; + HBufC* iDestFilename; // EDlAttrDestFilename TBool iDestFNameSet; // iDestFilename is set by client app -> // do not delete it in Reset() diff -r cb62a4f66ebe -r 6297cdf66332 browserutilities/downloadmgr/DownloadMgrServEng/Src/DownloadDataServ.cpp --- a/browserutilities/downloadmgr/DownloadMgrServEng/Src/DownloadDataServ.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/browserutilities/downloadmgr/DownloadMgrServEng/Src/DownloadDataServ.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -252,10 +252,10 @@ // CMediaDataServ::SetDesRemovable() // --------------------------------------------------------- // -void CMediaDataServ::SetDesRemovable( TBool aDesRemovable ) - { - iDesRemovable = aDesRemovable; - } +void CMediaDataServ::SetDesRemovable( TInt32 aDesRemovable ) + { + iDesRemovableStatus = aDesRemovable; + } // --------------------------------------------------------- // CMediaDataServ::SetLastErrorId() @@ -376,7 +376,7 @@ iRedirected = aStream.ReadInt32L(); iDestFilename = HBufC::NewL(aStream, KMaxFileName); iDownloadedSize = aStream.ReadInt32L(); - iDesRemovable = aStream.ReadInt32L(); + iDesRemovableStatus = aStream.ReadInt32L(); iLastErrorId = aStream.ReadInt32L(); iGlobalErrorId = aStream.ReadInt32L(); iPausable = aStream.ReadInt32L(); diff -r cb62a4f66ebe -r 6297cdf66332 browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpDownload.cpp --- a/browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpDownload.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpDownload.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -1099,7 +1099,13 @@ { aValue = iActivePlayedDownload; } - break; + break; + + case EDlAttrDestRemovable: + { + aValue = iStorage->RemovableDest(); + } + break; default: { @@ -1195,6 +1201,12 @@ aValue = mediaData->Method(); } break; + + case EDlAttrDestRemovable: + { + aValue = mediaData->DesRemovable(); + } + break; default: { @@ -1295,7 +1307,7 @@ case EDlAttrDestRemovable: { - aValue = iStorage->RemovableDest(); + aValue = (KDriveAttRemovable == iStorage->RemovableDest()) ? ETrue : EFalse ; } break; @@ -1368,7 +1380,7 @@ case EDlAttrDestRemovable: { - aValue = mediaData->DesRemovable(); + aValue = (KDriveAttRemovable == mediaData->DesRemovable()) ? ETrue : EFalse ; } break; @@ -2325,6 +2337,23 @@ } break; + + case EDlAttrDestRemovable: + { + if( iCodDownload ) + { + iStorage->SetRemovableDest( aValue ); + + if (iCodDlData) + { + // Update for Active media object. + TInt active = iActiveDownload; + CMediaDataBase* mediaData = (*iCodDlData)[active]; + mediaData->SetDesRemovable( aValue ); + } + } + } + break; default: { #ifdef __WINS__ @@ -2487,14 +2516,16 @@ { if( iCodDownload ) { - iStorage->SetRemovableDest( aValue ); + TInt32 removableDestStatus = (aValue) ? KDriveAttRemovable : KDriveAttLocal ; + + iStorage->SetRemovableDest( removableDestStatus ); if (iCodDlData) { // Update for Active media object. TInt active = iActiveDownload; CMediaDataBase* mediaData = (*iCodDlData)[active]; - mediaData->SetDesRemovable( aValue ); + mediaData->SetDesRemovable( removableDestStatus ); } } } diff -r cb62a4f66ebe -r 6297cdf66332 browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpStorage.cpp --- a/browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpStorage.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpStorage.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -696,19 +696,26 @@ } CleanupStack::PopAndDestroy( drivesDynList ); CLOG_WRITE_2( "Saving content to %d Drive with %d B free space", driveSpaceMax, freeSpaceMax ); - - TDriveInfo driveInfo; - - if( !iDownload->ClientApp()->Engine()->Fs().Drive( driveInfo, driveSpaceMax) ) - { - iRemovableDest = (driveInfo.iDriveAtt & KDriveAttRemovable); - CLOG_WRITE_1( "Removable: [%d]", iRemovableDest ); - CLOG_WRITE_1( "driveInfo.iDriveAtt: [%d]", driveInfo.iDriveAtt ); - } - else - { - CLOG_WRITE("DriveInfo failed"); - } + TUint aStatus ; + + if( KErrNone == DriveInfo::GetDriveStatus( iDownload->ClientApp()->Engine()->Fs(), driveSpaceMax , aStatus )) + { + iRemovableStatus = (aStatus & DriveInfo::EDriveExternallyMountable) ? aStatus : 0 ; + if( iRemovableStatus ) + { + iRemovableStatus = (aStatus & DriveInfo::EDriveRemovable) ? KDriveAttRemovable : KDriveAttInternal ; + } + else + { + iRemovableStatus = KDriveAttLocal ; + } + CLOG_WRITE_1( "Removable: [%d]", iRemovableStatus ); + CLOG_WRITE_1( "DriveInfo Status [%d]", aStatus ); + } + else + { + CLOG_WRITE("DriveStatus failed"); + } return driveSpaceMax; #else @@ -722,6 +729,7 @@ ( &fs, bytesToWrite ); ) if(!mmcOk) { + iRemovableStatus = TDownloadUiData::EDriveInternal ; CLOG_WRITE( "no MMC present" ); return EDriveC; } @@ -732,7 +740,9 @@ fs.Volume(volInfoE,EDriveE); TInt64 freeC = volInfoC.iFree;//free memory available in that drive TInt64 freeE = volInfoE.iFree; - return freeC>=freeE?EDriveC:EDriveE;//put the file in which ever drive has more memory + freeC>=freeE?EDriveC:EDriveE;//put the file in which ever drive has more memory + iRemovableStatus = (EDriveC == freeC) ? TDownloadUiData::EDriveInternal : ( TDownloadUiData::EDriveExternallyMountable | TDownloadUiData::EDriveRemovable ) ; + return freeC; #endif } @@ -823,18 +833,45 @@ #endif } +#ifdef RD_MULTIPLE_DRIVE + TUint aStatus ; + + if( KErrNone == DriveInfo::GetDriveStatus( iDownload->ClientApp()->Engine()->Fs(), drive , aStatus )) + { + iRemovableStatus = (aStatus & DriveInfo::EDriveExternallyMountable) ? aStatus : 0 ; + if( iRemovableStatus ) + { + iRemovableStatus = (aStatus & DriveInfo::EDriveRemovable) ? KDriveAttRemovable : KDriveAttInternal ; + } + else + { + iRemovableStatus = KDriveAttLocal ; + } + CLOG_WRITE_1( "Removable: [%d]", iRemovableStatus ); + CLOG_WRITE_1( "DriveInfo Status [%d]", aStatus ); + } + else + { + CLOG_WRITE("DriveStatus failed"); + } + +#else TDriveInfo driveInfo; if( !iDownload->ClientApp()->Engine()->Fs().Drive( driveInfo, drive) ) { - iRemovableDest = (driveInfo.iDriveAtt & KDriveAttRemovable); - CLOG_WRITE_1( "Removable: [%d]", iRemovableDest ); + if (driveInfo.iDriveAtt & KDriveAttRemovable) + iRemovableStatus = ( TDownloadUiData::EDriveExternallyMountable | TDownloadUiData::EDriveRemovable ) ; + else + iRemovableStatus = TDownloadUiData::EDriveInternal ; + CLOG_WRITE_1( "Removable: [%d]", iRemovableStatus ); } else - { + { CLOG_WRITE("DriveInfo failed"); } - +#endif + if( err || !isSpace ) { CLOG_WRITE8( "OOD1" ); @@ -1007,16 +1044,44 @@ TInt drive; if( !iDownload->ClientApp()->Engine()->Fs().CharToDrive((*iDestFilename)[0], drive) ) { - TDriveInfo driveInfo; - if( !iDownload->ClientApp()->Engine()->Fs().Drive( driveInfo, drive) ) +#ifdef RD_MULTIPLE_DRIVE + TUint aStatus ; + + if( KErrNone == DriveInfo::GetDriveStatus( iDownload->ClientApp()->Engine()->Fs(), drive , aStatus )) { - iRemovableDest = (driveInfo.iDriveAtt & KDriveAttRemovable); - CLOG_WRITE_1( "Removable: [%d]", iRemovableDest ); + iRemovableStatus = (aStatus & DriveInfo::EDriveExternallyMountable) ? aStatus : 0 ; + if( iRemovableStatus ) + { + iRemovableStatus = (aStatus & DriveInfo::EDriveRemovable) ? KDriveAttRemovable : KDriveAttInternal ; + } + else + { + iRemovableStatus = KDriveAttLocal ; + } + CLOG_WRITE_1( "Removable: [%d]", iRemovableStatus ); + CLOG_WRITE_1( "DriveInfo Status [%d]", aStatus ); } else { + CLOG_WRITE("DriveStatus failed"); + } + +#else + TDriveInfo driveInfo; + + if( !iDownload->ClientApp()->Engine()->Fs().Drive( driveInfo, drive) ) + { + if (driveInfo.iDriveAtt & KDriveAttRemovable) + iRemovableStatus = ( TDownloadUiData::EDriveExternallyMountable | TDownloadUiData::EDriveRemovable ) ; + else + iRemovableStatus = TDownloadUiData::EDriveInternal ; + CLOG_WRITE_1( "Removable: [%d]", iRemovableStatus ); + } + else + { CLOG_WRITE("DriveInfo failed"); - } + } +#endif } else { @@ -1043,7 +1108,7 @@ APPEND_BUF_INT( aBuf, iDownloadedSize); AppendBufL( aBuf, iDdFilename ); APPEND_BUF_INT( aBuf, iDownload->iMoLength ); - APPEND_BUF_INT( aBuf, iRemovableDest ); + APPEND_BUF_INT( aBuf, iRemovableStatus ); } @@ -1065,7 +1130,7 @@ READ_INT_L( aInFile, iDownloadedSize ); ReadHBufCL( aInFile, iDdFilename ); READ_INT_L( aInFile, iDownload->iMoLength ); - READ_INT_L( aInFile, iRemovableDest ); + READ_INT_L( aInFile, iRemovableStatus ); } diff -r cb62a4f66ebe -r 6297cdf66332 browserutilities/downloadmgr/DownloadMgrUiLib/Group/Bld.inf --- a/browserutilities/downloadmgr/DownloadMgrUiLib/Group/Bld.inf Thu Jan 07 13:31:38 2010 +0200 +++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Group/Bld.inf Mon Jan 18 21:20:18 2010 +0200 @@ -39,7 +39,7 @@ START EXTENSION s60/mifconv OPTION TARGETFILE downloadmgruilib.mif OPTION HEADERFILE downloadmgruilib.mbg -OPTION SOURCES -c8,1 qgn_menu_unknown_lst -c8,1 qgn_indi_paused -c8,1 qgn_indi_browser_mmc_add +OPTION SOURCES -c8,1 qgn_menu_unknown_lst -c8,1 qgn_indi_paused -c8,1 qgn_indi_browser_mmc_add -c8,1 qgn_prop_memc_ms_tab END PRJ_MMPFILES diff -r cb62a4f66ebe -r 6297cdf66332 browserutilities/downloadmgr/DownloadMgrUiLib/Group/DownloadMgrUiLibIconsdc.mk --- a/browserutilities/downloadmgr/DownloadMgrUiLib/Group/DownloadMgrUiLibIconsdc.mk Thu Jan 07 13:31:38 2010 +0200 +++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Group/DownloadMgrUiLibIconsdc.mk Mon Jan 18 21:20:18 2010 +0200 @@ -62,7 +62,8 @@ mifconv $(ICONTARGETFILENAME) /h$(HEADERFILENAME) \ /c8,1 qgn_menu_unknown_lst.bmp \ /c8,1 qgn_indi_paused.bmp \ - /c8,1 qgn_indi_browser_mmc_add.bmp + /c8,1 qgn_indi_browser_mmc_add.bmp \ + /c8,1 qgn_prop_memc_ms_tab.bmp FREEZE : do_nothing diff -r cb62a4f66ebe -r 6297cdf66332 browserutilities/downloadmgr/DownloadMgrUiLib/Inc/CDownloadsListArray.h --- a/browserutilities/downloadmgr/DownloadMgrUiLib/Inc/CDownloadsListArray.h Thu Jan 07 13:31:38 2010 +0200 +++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Inc/CDownloadsListArray.h Mon Jan 18 21:20:18 2010 +0200 @@ -60,10 +60,10 @@ TInt32 iDownloadedSize; TInt iIconIndex; TBool iPausable; - TBool iIsOnExternalMemory; TInt32 iProgressState; TInt32 iNumMediaObjects; TInt32 iActiveMoIndex; + TInt32 iExternalMemoryStatus; }; /// Array of UI data T objects. typedef CArrayFixFlat< TDownloadUiData > CDownloadUiDataArray; @@ -206,8 +206,9 @@ /** Temp storage. Should be long enough to hold R_DMUL_DOWNLOAD_COMPLETE localized string or the progress info (max 14). */ TBuf iProgressInfoRes; - TInt iPausedIconIndex; ///< Default icon index in list box model - TInt iExternalMemoryIconIndex; ///< Default icon index in list box model + TInt iPausedIconIndex; ///< Pause icon index in list box model + TInt iExternalMemoryIconIndex; ///< MMC icon index in list box model + TInt iInternalMassMemoryIconIndex; ///< Mass Memory icon index in list box model HBufC* iCompletedString; ///< Owned. HBufC* iSavedToGalleryString; ///< Owned. diff -r cb62a4f66ebe -r 6297cdf66332 browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiDownloadsList.cpp --- a/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiDownloadsList.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiDownloadsList.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -1110,12 +1110,12 @@ CLOG_WRITE_FORMAT(" EDlAttrPausable: %d",dlData->iPausable); // Is the download on an external/removable memory (like MMC)? - err = aDownload.GetBoolAttribute - ( EDlAttrDestRemovable, dlData->iIsOnExternalMemory ); + err = aDownload.GetIntAttribute + ( EDlAttrDestRemovable, dlData->iExternalMemoryStatus ); CLOG_WRITE_FORMAT(" EDlAttrDestRemovable err: %d",err); // 'err' is ignored. - CLOG_WRITE_FORMAT(" EDlAttrDestRemovable: %d",dlData->iIsOnExternalMemory); - + CLOG_WRITE_FORMAT(" EDlAttrDestRemovable: %d",dlData->iExternalMemoryStatus); + // Currently active media object's index (in album)? err = aDownload.GetIntAttribute ( EDlAttrActiveDownload, dlData->iActiveMoIndex ); @@ -1281,13 +1281,12 @@ CLOG_WRITE(" Redirection"); } else if ( aEvent.iProgressState == EHttpProgResponseHeaderReceived ) - { - // Is the download on an external/removable memory (like MMC)? - aDownload.GetBoolAttribute - ( EDlAttrDestRemovable, dlData.iIsOnExternalMemory ); - // Return value is ignored. - CLOG_WRITE_FORMAT(" EDlAttrDestRemovable: %d",dlData.iIsOnExternalMemory); - } + { + // Is the download on an external/removable memory (like MMC)? + // Return value is ignored. + aDownload.GetIntAttribute( EDlAttrDestRemovable, dlData.iExternalMemoryStatus ); + CLOG_WRITE_FORMAT(" EDlAttrDestRemovable: %d",dlData.iExternalMemoryStatus); + } else if ( aEvent.iProgressState == EHttpProgDlNameChanged ) { CLOG_WRITE(" EHttpProgDlNameChanged"); diff -r cb62a4f66ebe -r 6297cdf66332 browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadsListArray.cpp --- a/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadsListArray.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadsListArray.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -66,7 +66,7 @@ iDownloadedSize( KErrNotFound ), iIconIndex( KErrNotFound ), iPausable( EFalse ), - iIsOnExternalMemory( EFalse ), + iExternalMemoryStatus( KDriveAttLocal ), iProgressState( KErrNotFound ), iNumMediaObjects( KErrNotFound ) { @@ -465,11 +465,14 @@ } newItemTextPtr.Append( KCharTab ); // - if ( aDownloadUiData.iIsOnExternalMemory ) + if ( KDriveAttLocal != aDownloadUiData.iExternalMemoryStatus ) { // Add an "External memory" icon. iTempBuf.Zero(); - iTempBuf.Num( iExternalMemoryIconIndex ); + if ( KDriveAttRemovable == aDownloadUiData.iExternalMemoryStatus ) + iTempBuf.Num( iExternalMemoryIconIndex ); + else + iTempBuf.Num( iInternalMassMemoryIconIndex ); newItemTextPtr.Append( iTempBuf ); // iExternalMemoryIconIndex in literal form } } @@ -568,10 +571,13 @@ // ret += KCharTab().Length(); // - if ( aDownloadUiData.iIsOnExternalMemory ) + if ( KDriveAttLocal != aDownloadUiData.iExternalMemoryStatus ) { iTempBuf.Zero(); - iTempBuf.Num( iExternalMemoryIconIndex ); + if ( KDriveAttRemovable == aDownloadUiData.iExternalMemoryStatus ) + iTempBuf.Num( iExternalMemoryIconIndex ); + else + iTempBuf.Num( iInternalMassMemoryIconIndex ); ret += iTempBuf.Length(); } @@ -614,6 +620,19 @@ CleanupStack::Pop( gulIcon2 ); // gulIcon2 + // iInternalMassMemoryIconIndex + TAknsItemID id3 = KAknsIIDQgnPropMemcMsTab; + CGulIcon* gulIcon3 = AknsUtils::CreateGulIconL( skins, id3, + *iMbmResourceFileName, + EMbmDownloadmgruilibQgn_prop_memc_ms_tab, + EMbmDownloadmgruilibQgn_prop_memc_ms_tab_mask ); + CleanupStack::PushL( gulIcon3 ); + + iInternalMassMemoryIconIndex = AppendL( gulIcon3 ); + CLOG_WRITE_FORMAT(" iExternalMemoryIconIndex: %d",iInternalMassMemoryIconIndex); + + CleanupStack::Pop( gulIcon3 ); // gulIcon3 + CLOG_LEAVEFN("CDownloadsListArray::AddDefaultIconsL"); } @@ -756,3 +775,4 @@ // End of file. + diff -r cb62a4f66ebe -r 6297cdf66332 browserutilities/webutils/conf/webutils.confml Binary file browserutilities/webutils/conf/webutils.confml has changed diff -r cb62a4f66ebe -r 6297cdf66332 codhandler/codeng/inc/CodEngBase.h --- a/codhandler/codeng/inc/CodEngBase.h Thu Jan 07 13:31:38 2010 +0200 +++ b/codhandler/codeng/inc/CodEngBase.h Mon Jan 18 21:20:18 2010 +0200 @@ -679,7 +679,7 @@ TBool iMmcOk; #endif /// Paths on removable media? - TBool iRemovableMedia; + TInt32 iRemovableMediaStatus; /// ROAP Data. Owned. CRoapData* iRoapData; /// Progress or NULL. Owned. diff -r cb62a4f66ebe -r 6297cdf66332 codhandler/codeng/inc/DownloadDataClient.h --- a/codhandler/codeng/inc/DownloadDataClient.h Thu Jan 07 13:31:38 2010 +0200 +++ b/codhandler/codeng/inc/DownloadDataClient.h Mon Jan 18 21:20:18 2010 +0200 @@ -200,7 +200,7 @@ * Set destination removable attribute. * @param aDesRemovable Whether removable media drive. */ - void SetDesRemovable( TBool aDesRemovable ); + void SetDesRemovable( TInt32 aDesRemovable ); /** * Set last error id attribute. diff -r cb62a4f66ebe -r 6297cdf66332 codhandler/codeng/src/CodEngBase.cpp --- a/codhandler/codeng/src/CodEngBase.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/codhandler/codeng/src/CodEngBase.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -482,7 +482,7 @@ // EXPORT_C TBool CCodEngBase::RemovableMedia() const { - return iRemovableMedia; + return ( KDriveAttRemovable == iRemovableMediaStatus ) ? ETrue : EFalse ; } // --------------------------------------------------------- @@ -580,7 +580,7 @@ iPhoneMemoryOk( EFalse ), iMmcOk( EFalse ), #endif - iRemovableMedia( EFalse ), + iRemovableMediaStatus( KDriveAttLocal ), iStatusCode( KHttp902UserCancelled ), iResult( KErrGeneral ), iContentTypeCheck ( EFalse ), @@ -2008,16 +2008,39 @@ (*iData)[iData->ActiveDownload()]->iTempPath.Append(rootPath.Drive()); (*iData)[iData->ActiveDownload()]->iTempPath.Append(tempBuf); - TDriveInfo info; + TDriveUnit unit( rootPath.Drive() ); - User::LeaveIfError( iFs.Drive( info, unit ) ); - // Create the temp directory earlier in case it's not created yet - iFs.MkDirAll( (*iData)[iData->ActiveDownload()]->iTempPath ); + +#ifdef RD_MULTIPLE_DRIVE + TUint aStatus ; + + if( KErrNone == DriveInfo::GetDriveStatus( iFs, unit , aStatus )) + { + iRemovableMediaStatus = (aStatus & DriveInfo::EDriveExternallyMountable) ? aStatus : 0 ; + if( iRemovableMediaStatus ) + { + iRemovableMediaStatus = (aStatus & DriveInfo::EDriveRemovable) ? KDriveAttRemovable : KDriveAttInternal ; + } + else + { + iRemovableMediaStatus = KDriveAttLocal ; + } + } +#else + TDriveInfo info; + User::LeaveIfError( iFs.Drive( info, unit ) ); if ( info.iDriveAtt & KDriveAttRemovable ) { - iRemovableMedia = ETrue; + iRemovableMediaStatus = KDriveAttRemovable; } - + else + { + iRemovableMediaStatus = KDriveAttLocal; + } +#endif + // Create the temp directory earlier in case it's not created yet + iFs.MkDirAll( (*iData)[iData->ActiveDownload()]->iTempPath ); + CLOG(( ECodEng, 2, _L("<- CCodEngBase::SetPathsL root<%S> temp<%S>"), \ &(*iData)[iData->ActiveDownload()]->iRootPath, &(*iData)[iData->ActiveDownload()]->iTempPath )); } @@ -2038,7 +2061,8 @@ #endif //(*iData)[iData->ActiveDownload()]->iTempPath = KNullDesC; //(*iData)[iData->ActiveDownload()]->iRootPath = KNullDesC; - iRemovableMedia = EFalse; + + iRemovableMediaStatus = KDriveAttLocal; } #ifdef RD_MULTIPLE_DRIVE diff -r cb62a4f66ebe -r 6297cdf66332 codhandler/codeng/src/DownloadDataClient.cpp --- a/codhandler/codeng/src/DownloadDataClient.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/codhandler/codeng/src/DownloadDataClient.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -105,7 +105,7 @@ bytes += sizeof(iRedirected); bytes += iDestFilename->Size(); bytes += sizeof(iDownloadedSize); - bytes += sizeof(iDesRemovable); + bytes += sizeof(iDesRemovableStatus); bytes += sizeof(iLastErrorId); bytes += sizeof(iGlobalErrorId); bytes += sizeof(iPausable); @@ -304,10 +304,10 @@ // CMediaDataClient::SetDesRemovable() // --------------------------------------------------------- // -void CMediaDataClient::SetDesRemovable( TBool aDesRemovable ) - { - iDesRemovable = aDesRemovable; - } +void CMediaDataClient::SetDesRemovable( TInt32 aDesRemovable ) + { + iDesRemovableStatus = aDesRemovable; + } // --------------------------------------------------------- // CMediaDataClient::SetLastErrorId() @@ -499,7 +499,7 @@ aStream.WriteInt32L(iDownloadedSize); // iDesRemovable - aStream.WriteInt32L(iDesRemovable); + aStream.WriteInt32L(iDesRemovableStatus); // iLastErrorId aStream.WriteInt32L(iLastErrorId); diff -r cb62a4f66ebe -r 6297cdf66332 web_plat/browser_platform_api/inc/Browser_platform_variant.hrh --- a/web_plat/browser_platform_api/inc/Browser_platform_variant.hrh Thu Jan 07 13:31:38 2010 +0200 +++ b/web_plat/browser_platform_api/inc/Browser_platform_variant.hrh Mon Jan 18 21:20:18 2010 +0200 @@ -158,12 +158,17 @@ // Flag for Multiple Font Support(Times New Roman,Arial and Courier).This feature is available only for TB9.2 #define BRDO_BROWSER_MULTIPLE_FONT_SUPPORT +//To provide WidgetSIDChecker support +#define APP_SID_CHECK_SUPPORT_FF + /* * =================== * S60 3.23 * =================== */ #if defined(__PLATFORM_VERSION_32__) +//To provide WidgetSIDChecker support +#undef APP_SID_CHECK_SUPPORT_FF // Flag for Multiple Font Support(Times New Roman,Arial and Courier).This feature is available only for TB9.2 #undef BRDO_BROWSER_MULTIPLE_FONT_SUPPORT @@ -229,6 +234,9 @@ */ #elif defined(__PLATFORM_VERSION_50_TUBE__) +//To provide WidgetSIDChecker support +#undef APP_SID_CHECK_SUPPORT_FF + // Flag for Multiple Font Support(Times New Roman,Arial and Courier).This feature is available only for TB9.2 #undef BRDO_BROWSER_MULTIPLE_FONT_SUPPORT @@ -278,6 +286,9 @@ */ #elif defined(__PLATFORM_VERSION_50__) +//To provide WidgetSIDChecker support +#undef APP_SID_CHECK_SUPPORT_FF + // Flag for Multiple Font Support(Times New Roman,Arial and Courier).This feature is available only for TB9.2 #undef BRDO_BROWSER_MULTIPLE_FONT_SUPPORT @@ -310,6 +321,9 @@ */ #elif defined(__PLATFORM_VERSION_51__) +//To provide WidgetSIDChecker support +#undef APP_SID_CHECK_SUPPORT_FF + // Flag for Multiple Font Support(Times New Roman,Arial and Courier).This feature is available only for TB9.2 #undef BRDO_BROWSER_MULTIPLE_FONT_SUPPORT @@ -359,6 +373,10 @@ // Static data initializtion on start up in E32Main() #define BRDO_STATIC_DATA_CLEANUP_SUPPORT_FF + +//To provide WidgetSIDChecker support +#define APP_SID_CHECK_SUPPORT_FF + #endif // PLATFORM VERSION ID's // Generic run-time definitions -- see WmlBrowserBuild.h for similar feature related definitions diff -r cb62a4f66ebe -r 6297cdf66332 web_plat/cod_handler_api/inc/HttpDownloadData.h --- a/web_plat/cod_handler_api/inc/HttpDownloadData.h Thu Jan 07 13:31:38 2010 +0200 +++ b/web_plat/cod_handler_api/inc/HttpDownloadData.h Mon Jan 18 21:20:18 2010 +0200 @@ -222,9 +222,9 @@ /** * Get Destination Removable. - * @return iDesRemovable. + * @return iDesRemovableStatus. */ - inline TBool DesRemovable() const { return iDesRemovable; } + inline TBool DesRemovable() const { return ( KDriveAttRemovable == iDesRemovableStatus ) ? ETrue : EFalse ; } /** * Get Last Error Id. @@ -386,7 +386,7 @@ * Set destination removable attribute. * @param aDesRemovable Whether removable media drive. */ - virtual void SetDesRemovable( TBool aDesRemovable ) = 0; + virtual void SetDesRemovable( TInt32 aDesRemovable ) = 0; /** * Set last error id attribute. @@ -428,7 +428,7 @@ TBool iRedirected; ///< Is Redirected? HBufC* iDestFilename; ///< Media Destination Filename. TInt iDownloadedSize; /// #include "favouritesenginetest.h" diff -r cb62a4f66ebe -r 6297cdf66332 web_pub/favourites_engine_api/tsrc/src/FavouritesItemTestCases.cpp --- a/web_pub/favourites_engine_api/tsrc/src/FavouritesItemTestCases.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesItemTestCases.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -1,23 +1,26 @@ /* -* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* ============================================================================ +* Name: FavouritesItemTestCases.cpp +* Part of: FavouritesEngineTest class member functions +* +* Description: +* +* Version: 1.0 * -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: +* Copyright (C) 2008 Nokia Corporation. +* This material, including documentation and any related +* computer programs, is protected by copyright controlled by +* Nokia Corporation. All rights are reserved. Copying, +* including reproducing, storing, adapting or translating, any +* or all of this material requires the prior written consent of +* Nokia Corporation. This material also contains confidential +* information which may not be disclosed to others without the +* prior written consent of Nokia Corporation. * -* Description: -* -* +* ============================================================================ */ - // INCLUDE FILES #include #include "favouritesenginetest.h" diff -r cb62a4f66ebe -r 6297cdf66332 web_pub/favourites_engine_api/tsrc/src/FavouritesWapApTestCases.cpp --- a/web_pub/favourites_engine_api/tsrc/src/FavouritesWapApTestCases.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesWapApTestCases.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -1,23 +1,26 @@ /* -* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* ============================================================================ +* Name: FavouritesWapApTestCases.cpp +* Part of: FavouritesEngineTest class member functions +* +* Description: +* +* Version: 0.5 * -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: +* Copyright (C) 2002 Nokia Corporation. +* This material, including documentation and any related +* computer programs, is protected by copyright controlled by +* Nokia Corporation. All rights are reserved. Copying, +* including reproducing, storing, adapting or translating, any +* or all of this material requires the prior written consent of +* Nokia Corporation. This material also contains confidential +* information which may not be disclosed to others without the +* prior written consent of Nokia Corporation. * -* Description: -* -* +* ============================================================================ */ - // INCLUDE FILES #include #include "favouritesenginetest.h" diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/DerivedSources/JavaScriptCore/chartables.c --- a/webengine/osswebengine/DerivedSources/JavaScriptCore/chartables.c Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/DerivedSources/JavaScriptCore/chartables.c Mon Jan 18 21:20:18 2010 +0200 @@ -1,19 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ /************************************************* * Perl-Compatible Regular Expressions * *************************************************/ diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/DerivedSources/WebCore/CSSPropertyNames.c --- a/webengine/osswebengine/DerivedSources/WebCore/CSSPropertyNames.c Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/DerivedSources/WebCore/CSSPropertyNames.c Mon Jan 18 21:20:18 2010 +0200 @@ -1,19 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ /* ANSI-C code produced by gperf version 2.7.2 */ /* Command-line: gperf -a -L ANSI-C -E -C -c -o -t -k '*' -NfindProp -Hhash_prop -Wwordlist_prop -D -s 2 CSSPropertyNames.gperf */ /* This file is automatically generated from CSSPropertyNames.in by makeprop, do not edit */ diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/DerivedSources/WebCore/CSSValueKeywords.c --- a/webengine/osswebengine/DerivedSources/WebCore/CSSValueKeywords.c Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/DerivedSources/WebCore/CSSValueKeywords.c Mon Jan 18 21:20:18 2010 +0200 @@ -1,19 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ /* ANSI-C code produced by gperf version 3.0.3 */ /* Command-line: gperf -L ANSI-C -E -C -n -o -t -k '*' -NfindValue -Hhash_val -Wwordlist_value -D CSSValueKeywords.gperf */ diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/DerivedSources/WebCore/ColorData.c --- a/webengine/osswebengine/DerivedSources/WebCore/ColorData.c Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/DerivedSources/WebCore/ColorData.c Mon Jan 18 21:20:18 2010 +0200 @@ -1,19 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ /* ANSI-C code produced by gperf version 2.7.2 */ /* Command-line: gperf -CDEot -L ANSI-C -k '*' -N findColor -D -s 2 /cygdrive/x/tot/WebCore/platform/ColorData.gperf */ struct NamedColor { const char *name; int RGBValue; }; diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/DerivedSources/WebCore/DocTypeStrings.cpp --- a/webengine/osswebengine/DerivedSources/WebCore/DocTypeStrings.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/DerivedSources/WebCore/DocTypeStrings.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -1,19 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ /* ANSI-C code produced by gperf version 2.7.2 */ /* Command-line: gperf -CEot -L ANSI-C -k '*' -N findDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards /cygdrive/x/tot/WebCore/html/DocTypeStrings.gperf */ struct PubIDInfo { diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/DerivedSources/WebCore/SVGElementFactory.cpp --- a/webengine/osswebengine/DerivedSources/WebCore/SVGElementFactory.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/DerivedSources/WebCore/SVGElementFactory.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/DerivedSources/WebCore/SVGNames.cpp --- a/webengine/osswebengine/DerivedSources/WebCore/SVGNames.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/DerivedSources/WebCore/SVGNames.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/DerivedSources/WebCore/UserAgentStyleSheets.h --- a/webengine/osswebengine/DerivedSources/WebCore/UserAgentStyleSheets.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/DerivedSources/WebCore/UserAgentStyleSheets.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,20 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - namespace WebCore { extern const char html4UserAgentStyleSheet[8527]; extern const char quirksUserAgentStyleSheet[331]; diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/DerivedSources/WebCore/UserAgentStyleSheetsData.cpp --- a/webengine/osswebengine/DerivedSources/WebCore/UserAgentStyleSheetsData.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/DerivedSources/WebCore/UserAgentStyleSheetsData.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -1,20 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - namespace WebCore { extern const char html4UserAgentStyleSheet[8527] = { 64, 110, 97, 109, 101, 115, 112, 97, 99, 101, 32, 34, 104, 116, 116, 112, diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/DerivedSources/WebCore/XLinkNames.cpp --- a/webengine/osswebengine/DerivedSources/WebCore/XLinkNames.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/DerivedSources/WebCore/XLinkNames.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/DerivedSources/WebCore/ksvgcssproperties.h --- a/webengine/osswebengine/DerivedSources/WebCore/ksvgcssproperties.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/DerivedSources/WebCore/ksvgcssproperties.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/DerivedSources/WebCore/ksvgcssvalues.h --- a/webengine/osswebengine/DerivedSources/WebCore/ksvgcssvalues.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/DerivedSources/WebCore/ksvgcssvalues.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/APICast.h --- a/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/APICast.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/APICast.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSBase.h --- a/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSBase.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSBase.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSContextRef.h --- a/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSContextRef.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSContextRef.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSLock.h --- a/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSLock.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSLock.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSObjectRef.h --- a/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSObjectRef.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSObjectRef.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSStringRef.h --- a/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSStringRef.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSStringRef.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSStringRefCF.h --- a/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSStringRefCF.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSStringRefCF.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSValueRef.h --- a/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSValueRef.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSValueRef.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JavaScriptCore.h --- a/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JavaScriptCore.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JavaScriptCore.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptCore/JavaScriptCore.apolloproj/ForwardingSources/grammar.cpp --- a/webengine/osswebengine/JavaScriptCore/JavaScriptCore.apolloproj/ForwardingSources/grammar.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptCore/JavaScriptCore.apolloproj/ForwardingSources/grammar.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -1,19 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ // This file includes a derived source file from the build output tree. // Since the location of the derived sources depends on which configuration // we are building, we need to use the include path ( which can be diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/grammarWrapper.cpp --- a/webengine/osswebengine/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/grammarWrapper.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/grammarWrapper.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -1,19 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ // This file exists to work around a bug in Visual Studio 2005 // Occasionally on launch VS05 will fail to correctly find and // identify generated files, thereby excluding them from the build diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptCore/JavaScriptCorePrefix.h --- a/webengine/osswebengine/JavaScriptCore/JavaScriptCorePrefix.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptCore/JavaScriptCorePrefix.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,19 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ #ifdef __cplusplus #define new ("if you use new/delete make sure to include config.h at the top of the file"()) #define delete ("if you use new/delete make sure to include config.h at the top of the file"()) diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptCore/icu/unicode/utf_old.h --- a/webengine/osswebengine/JavaScriptCore/icu/unicode/utf_old.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptCore/icu/unicode/utf_old.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,17 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptCore/pcre/pcre-config.h --- a/webengine/osswebengine/JavaScriptCore/pcre/pcre-config.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptCore/pcre/pcre-config.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,19 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ /* On Unix systems config.in is converted by configure into config.h. PCRE is written in Standard C, but there are a few non-standard things it can cope with, allowing it to run on SunOS4 and other "close to standard" systems. diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptCore/pcre/ucp.h --- a/webengine/osswebengine/JavaScriptCore/pcre/ucp.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptCore/pcre/ucp.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,19 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ /************************************************* * libucp - Unicode Property Table handler * *************************************************/ diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptCore/pcre/ucpinternal.h --- a/webengine/osswebengine/JavaScriptCore/pcre/ucpinternal.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptCore/pcre/ucpinternal.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,19 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ /************************************************* * libucp - Unicode Property Table handler * *************************************************/ diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/kjs/ExecState.h --- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/kjs/ExecState.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/kjs/ExecState.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/AlwaysInline.h --- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/AlwaysInline.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/AlwaysInline.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Assertions.h --- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Assertions.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Assertions.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/FastMalloc.h --- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/FastMalloc.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/FastMalloc.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Forward.h --- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Forward.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Forward.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/HashCountedSet.h --- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/HashCountedSet.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/HashCountedSet.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/HashSet.h --- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/HashSet.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/HashSet.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Noncopyable.h --- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Noncopyable.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Noncopyable.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/OwnArrayPtr.h --- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/OwnArrayPtr.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/OwnArrayPtr.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/OwnPtr.h --- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/OwnPtr.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/OwnPtr.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/PassRefPtr.h --- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/PassRefPtr.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/PassRefPtr.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Platform.h --- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Platform.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Platform.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/RefPtr.h --- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/RefPtr.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/RefPtr.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Vector.h --- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Vector.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Vector.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/JavaScriptGlue/config.h --- a/webengine/osswebengine/JavaScriptGlue/config.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/JavaScriptGlue/config.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,20 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #ifndef DEPRECATED_IN_MAC_OS_X_VERSION_10_5_AND_LATER #define DEPRECATED_IN_MAC_OS_X_VERSION_10_5_AND_LATER #endif diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/MemoryManager/Group/MemManTest.mmp --- a/webengine/osswebengine/MemoryManager/Group/MemManTest.mmp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/MemoryManager/Group/MemManTest.mmp Mon Jan 18 21:20:18 2010 +0200 @@ -1,21 +1,44 @@ /* -* 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 the License "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* ============================================================================== +* Name : MemManTest.mmp +* Part of : MemMan tool +* Description : Project specification file +* Version : * -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: +* Copyright (c) 2006, Nokia Corporation +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions +* are met: +* +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in +* the documentation and/or other materials provided with the +* distribution. +* * Neither the name of the Nokia Corporation nor the names of its +* contributors may be used to endorse or promote products derived +* from this software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +* DAMAGE. +* * -* Description: Project specification file -* +* ============================================================================== */ - #include #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/bindings/NP_jsobject.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/NP_jsobject.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/NP_jsobject.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/bindings/npruntime.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/npruntime.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/npruntime.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/bindings/npruntime_impl.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/npruntime_impl.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/npruntime_impl.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/bindings/runtime.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/runtime.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/runtime.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/bindings/runtime_object.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/runtime_object.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/runtime_object.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/bindings/runtime_root.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/runtime_root.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/runtime_root.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/JSLock.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/JSLock.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/JSLock.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/SavedBuiltins.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/SavedBuiltins.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/SavedBuiltins.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/collector.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/collector.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/collector.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/dtoa.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/dtoa.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/dtoa.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/function.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/function.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/function.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/identifier.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/identifier.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/identifier.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/internal.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/internal.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/internal.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/interpreter.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/interpreter.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/interpreter.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/lookup.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/lookup.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/lookup.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/object.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/object.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/object.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/operations.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/operations.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/operations.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/property_map.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/property_map.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/property_map.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/protect.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/protect.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/protect.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/string_object.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/string_object.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/string_object.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/ustring.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/ustring.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/ustring.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/value.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/value.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/value.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/pcre/pcre.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/pcre/pcre.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/pcre/pcre.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/AlwaysInline.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/AlwaysInline.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/AlwaysInline.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Assertions.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Assertions.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Assertions.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/FastMalloc.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/FastMalloc.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/FastMalloc.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Forward.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Forward.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Forward.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/GetPtr.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/GetPtr.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/GetPtr.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashCountedSet.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashCountedSet.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashCountedSet.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashMap.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashMap.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashMap.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashSet.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashSet.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashSet.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashTable.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashTable.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashTable.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashTraits.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashTraits.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashTraits.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/ListHashSet.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/ListHashSet.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/ListHashSet.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/MathExtras.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/MathExtras.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/MathExtras.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Noncopyable.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Noncopyable.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Noncopyable.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/OwnArrayPtr.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/OwnArrayPtr.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/OwnArrayPtr.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/OwnPtr.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/OwnPtr.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/OwnPtr.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/PassRefPtr.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/PassRefPtr.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/PassRefPtr.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Platform.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Platform.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Platform.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/RefPtr.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/RefPtr.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/RefPtr.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/RetainPtr.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/RetainPtr.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/RetainPtr.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/StringExtras.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/StringExtras.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/StringExtras.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Vector.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Vector.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Vector.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/unicode/Unicode.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/unicode/Unicode.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/unicode/Unicode.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/unicode/icu/UnicodeIcu.h --- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/unicode/icu/UnicodeIcu.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/unicode/icu/UnicodeIcu.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/css/MediaQuery.cpp --- a/webengine/osswebengine/WebCore/css/MediaQuery.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/css/MediaQuery.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -1,20 +1,29 @@ /* -* Copyright (c) 2005, 2006 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - + * CSS Media Query + * + * Copyright (C) 2005, 2006 Kimmo Kinnunen . + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ #include "config.h" #include "MediaQuery.h" diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/css/MediaQuery.h --- a/webengine/osswebengine/WebCore/css/MediaQuery.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/css/MediaQuery.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,20 +1,29 @@ /* -* 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 the License "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: -* -*/ - + * CSS Media Query + * + * Copyright (C) 2006 Kimmo Kinnunen . + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ #ifndef MediaQuery_h #define MediaQuery_h diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/css/MediaQueryEvaluator.cpp --- a/webengine/osswebengine/WebCore/css/MediaQueryEvaluator.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/css/MediaQueryEvaluator.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -1,20 +1,29 @@ /* -* 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 the License "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: -* -*/ - + * CSS Media Query Evaluator + * + * Copyright (C) 2006 Kimmo Kinnunen . + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ #include "config.h" #include "MediaQueryEvaluator.h" diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/css/MediaQueryEvaluator.h --- a/webengine/osswebengine/WebCore/css/MediaQueryEvaluator.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/css/MediaQueryEvaluator.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,20 +1,29 @@ /* -* 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 the License "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: -* -*/ - + * CSS Media Query Evaluator + * + * Copyright (C) 2006 Kimmo Kinnunen . + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ #ifndef MediaQueryEvaluator_h #define MediaQueryEvaluator_h diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/css/MediaQueryExp.cpp --- a/webengine/osswebengine/WebCore/css/MediaQueryExp.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/css/MediaQueryExp.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -1,20 +1,29 @@ /* -* 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 the License "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: -* -*/ - + * CSS Media Query + * + * Copyright (C) 2006 Kimmo Kinnunen . + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ #include "config.h" #include "MediaQueryExp.h" diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/css/MediaQueryExp.h --- a/webengine/osswebengine/WebCore/css/MediaQueryExp.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/css/MediaQueryExp.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,20 +1,29 @@ /* -* 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 the License "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: -* -*/ - + * CSS Media Query + * + * Copyright (C) 2006 Kimmo Kinnunen . + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ #ifndef MediaQueryExp_h #define MediaQueryExp_h diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/dom/Document.cpp --- a/webengine/osswebengine/WebCore/dom/Document.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/dom/Document.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -25,6 +25,9 @@ #include "Document.h" #include "AXObjectCache.h" +#if PLATFORM(SYMBIAN) +#include "Brctl.h" +#endif #include "CDATASection.h" #include "CSSHelper.h" #include "CSSStyleSelector.h" @@ -1837,7 +1840,13 @@ } else if (equalIgnoringCase(equiv, "refresh")) { double delay; String url; + #if PLATFORM(SYMBIAN) + TUint autoRefresh = 1; + TRAP_IGNORE(autoRefresh = StaticObjectsContainer::instance()->brctl()->BrowserSettingL(TBrCtlDefs::ESettingsAutoRefresh)); + if (frame && autoRefresh && parseHTTPRefresh(content, true, delay, url)) { + #else if (frame && parseHTTPRefresh(content, true, delay, url)) { + #endif if (url.isEmpty()) url = frame->loader()->url().url(); else diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/html/HTMLLinkElement.cpp --- a/webengine/osswebengine/WebCore/html/HTMLLinkElement.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/html/HTMLLinkElement.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -192,8 +192,13 @@ // IE extension: location of small icon for locationbar / bookmarks // We'll record this URL per document, even if we later only use it in top level frames - if (m_isIcon && !m_url.isEmpty()) + if (m_isIcon && !m_url.isEmpty()) { document()->setIconURL(m_url, type); + if(document()->frame() && document()->frame()->loader()) { + // Notify frame loader to retry icon loading + document()->frame()->loader()->iconLoadDecisionAvailable(); + } + } // Stylesheet // This was buggy and would incorrectly match , which has a different specified meaning. -dwh diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/icu/unicode/utf_old.h --- a/webengine/osswebengine/WebCore/icu/unicode/utf_old.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/icu/unicode/utf_old.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,17 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/loader/FrameLoader.cpp --- a/webengine/osswebengine/WebCore/loader/FrameLoader.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/loader/FrameLoader.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -226,6 +226,7 @@ , m_wasUnloadEventEmitted(false) , m_isComplete(false) , m_isLoadingMainResource(false) + , m_mayLoadIconLater(false) , m_cancellingWithLoadInProgress(false) , m_needsClear(false) , m_receivedData(false) @@ -1043,11 +1044,17 @@ void FrameLoader::iconLoadDecisionAvailable() { - if (!m_mayLoadIconLater) - return; LOG(IconDatabase, "FrameLoader %p was told a load decision is available for its icon", this); - startIconLoader(); - m_mayLoadIconLater = false; + if (m_mayLoadIconLater) { + // Notfification came from iconDataBase to load the icon + startIconLoader(); + m_mayLoadIconLater = false; + } else { + // Icon was specified in tag with rel="icon" or rel="shortcut icon" property + if(m_iconLoader) + m_iconLoader->stopLoading(); // cancel previous loading state + startIconLoader(); + } } void FrameLoader::startIconLoader() @@ -1517,7 +1524,17 @@ rect = anchorNode->getRect(); } if (renderer) - renderer->enclosingLayer()->scrollRectToVisible(rect, RenderLayer::gAlignToEdgeIfNeeded, RenderLayer::gAlignTopAlways); + { + if(!anchorNode) + { + renderer->enclosingLayer()->scrollRectToVisible(rect, RenderLayer::gAlignToEdgeIfNeeded, RenderLayer::gAlignToEdgeIfNeeded); + } + else + { + renderer->enclosingLayer()->scrollRectToVisible(rect, RenderLayer::gAlignToEdgeIfNeeded, RenderLayer::gAlignTopAlways); + } + + } return true; } diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/loader/icon/IconLoader.cpp --- a/webengine/osswebengine/WebCore/loader/icon/IconLoader.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/loader/icon/IconLoader.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -95,9 +95,13 @@ int status = response.httpStatusCode(); LOG(IconDatabase, "IconLoader::didReceiveResponse() - Loader %p, response %i", resourceLoader, status); - if (status && (status < 200 || status > 299)) { - ResourceHandle* handle = resourceLoader->handle(); - finishLoading(handle ? handle->request().url() : KURL(), 0); + // It is possible that we are receiving the response for previous load request which is cancelled. + // Process down response of last resource loader only. Ignore if we can not remember other icon load requests. + if(resourceLoader == m_resourceLoader) { + if (status && (status < 200 || status > 299)) { + ResourceHandle* handle = resourceLoader->handle(); + finishLoading(handle ? handle->request().url() : KURL(), 0); + } } } @@ -114,8 +118,10 @@ // we need to be prepared to receive this call even after we've "finished loading" once. // After it is resolved, we can restore an assertion that the load is in progress if ::didFail() is called - if (m_loadIsInProgress) { - ASSERT(resourceLoader == m_resourceLoader); + // It is possible that we are receiving the response for previous load request which is cancelled. + // Process down response of last resource loader only. Ignore if we can not remember other icon load requests. + if (m_loadIsInProgress && (resourceLoader == m_resourceLoader)) { + //ASSERT(resourceLoader == m_resourceLoader); ResourceHandle* handle = resourceLoader->handle(); finishLoading(handle ? handle->request().url() : KURL(), 0); } @@ -129,8 +135,10 @@ // we need to be prepared to receive this call even after we've "finished loading" once. // After it is resolved, we can restore an assertion that the load is in progress if ::didFail() is called - if (m_loadIsInProgress) { - ASSERT(resourceLoader == m_resourceLoader); + // It is possible that we are receiving the response for previous load request which is cancelled. + // Process down response of last resource loader only. Ignore if we can not remember other icon load requests. + if (m_loadIsInProgress && (resourceLoader == m_resourceLoader)) { + //ASSERT(resourceLoader == m_resourceLoader); ResourceHandle* handle = resourceLoader->handle(); finishLoading(handle ? handle->request().url() : KURL(), m_resourceLoader->resourceData()); } diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/loader/icon/IconRecord.h --- a/webengine/osswebengine/WebCore/loader/icon/IconRecord.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/loader/icon/IconRecord.h Mon Jan 18 21:20:18 2010 +0200 @@ -63,7 +63,43 @@ int timestamp; RefPtr data; }; - + +/* To avoid deletion of icon bitmaps in Symbian */ +#if PLATFORM(SYMBIAN) +class IconImagePtr : Noncopyable { + typedef Image* PtrType; +public: + explicit IconImagePtr(PtrType ptr = 0) : m_ptr(ptr) { } + ~IconImagePtr() { /*deleteOwnedPtr(m_ptr);*/ } + + PtrType get() const { return m_ptr; } + PtrType release() { PtrType ptr = m_ptr; m_ptr = 0; return ptr; } + + void set(PtrType ptr) { ASSERT(!ptr || m_ptr != ptr); /*deleteOwnedPtr(m_ptr);*/ m_ptr = ptr; } + void clear() { /*deleteOwnedPtr(m_ptr);*/ m_ptr = 0; } + + Image& operator*() const { ASSERT(m_ptr); return *m_ptr; } + PtrType operator->() const { ASSERT(m_ptr); return m_ptr; } + + bool operator!() const { return !m_ptr; } + + // This conversion operator allows implicit conversion to bool but not to other integer types. + typedef PtrType (IconImagePtr::*UnspecifiedBoolType)() const; + operator UnspecifiedBoolType() const { return m_ptr ? &IconImagePtr::get : 0; } + + void swap(IconImagePtr& o) { std::swap(m_ptr, o.m_ptr); } + + private: + PtrType m_ptr; + }; + + inline void swap(IconImagePtr& a, IconImagePtr& b) { a.swap(b); } + inline Image* getPtr(const IconImagePtr& p) + { + return p.get(); + } +#endif + class IconRecord : public Shared { friend class PageURLRecord; public: @@ -88,7 +124,11 @@ private: String m_iconURL; time_t m_stamp; +#if PLATFORM(SYMBIAN) + IconImagePtr m_image; +#else OwnPtr m_image; +#endif HashSet m_retainingPageURLs; diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/platform/graphics/cairo/AffineTransformCairo.cpp --- a/webengine/osswebengine/WebCore/platform/graphics/cairo/AffineTransformCairo.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/platform/graphics/cairo/AffineTransformCairo.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -1,19 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ /* * * Redistribution and use in source and binary forms, with or without diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/platform/graphics/svg/SVGResourceListener.h --- a/webengine/osswebengine/WebCore/platform/graphics/svg/SVGResourceListener.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/platform/graphics/svg/SVGResourceListener.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,17 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/platform/image-decoders/zlib/crc32.h --- a/webengine/osswebengine/WebCore/platform/image-decoders/zlib/crc32.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/platform/image-decoders/zlib/crc32.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,19 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ /* crc32.h -- tables for rapid CRC calculation * Generated automatically by crc32.c */ diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/platform/image-decoders/zlib/inffixed.h --- a/webengine/osswebengine/WebCore/platform/image-decoders/zlib/inffixed.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/platform/image-decoders/zlib/inffixed.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,19 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ /* inffixed.h -- table for decoding fixed codes * Generated automatically by makefixed(). */ diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/platform/image-decoders/zlib/trees.h --- a/webengine/osswebengine/WebCore/platform/image-decoders/zlib/trees.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/platform/image-decoders/zlib/trees.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,19 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ /* header created automatically with -DGEN_TREES_H */ local const ct_data static_ltree[L_CODES+2] = { diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/platform/network/symbian/FileConnection.cpp --- a/webengine/osswebengine/WebCore/platform/network/symbian/FileConnection.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/platform/network/symbian/FileConnection.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -29,6 +29,7 @@ #include #include "brctl.h" #include "DeprecatedString.h" +#include const TInt KFileReadChunkSize = 23920; // bytes _LIT8( KResLoaderUCS2, "iso-10646-ucs-2" ); @@ -251,17 +252,41 @@ else if( extPtr.CompareF( KEcmaScriptExt() ) == 0 || extPtr.CompareF( KJavaScriptExt() ) == 0 ) { contentTypePtr.Set( _L8( "text/ecmascript" ) ); + } + else { + // Symbian/S60 may not be aware of the MIMEType for the given extension + // Need to query from Plugin handler if there exists a plugin which supports this extension. + return contentTypeFromPluginsL(); } - - // todo plugin is missing - // Check if it is a supported plugin - // CPluginHandler* pluginHandler = CPluginHandler::GetSingleton(); - // TUint16* mimeType16 = pluginHandler->GetPluginMimeTypeL(iFileName); } if( contentTypePtr.Length() ) { contentType = HBufC8::NewL( contentTypePtr.Length() ); contentType->Des().Copy( contentTypePtr ); } + return contentType; +} + +HBufC8* FileConnection::contentTypeFromPluginsL() +{ + HBufC8* contentType = NULL; + + // Get PluginHandler from StaticObjectsContainer + PluginHandler* plg = StaticObjectsContainer::instance()->pluginHandler(); + + // Convert filename16 to filename8 required for pluginMimeByExtention(TPtrC8&) + HBufC8* filename = HBufC8::NewLC(m_fileName->Length()); + filename->Des().Copy(m_fileName->Des()); + + // Query MIMEtype for an extension from PluginHandler + HBufC* mimeTypePtr = plg->pluginMimeByExtention(filename->Des()); + + CleanupStack::PopAndDestroy(); //filename + + if (mimeTypePtr) { + // Coversion from mimeType16 to mimeType8 + contentType = HBufC8::NewL(mimeTypePtr->Length()); + contentType->Des().Copy(mimeTypePtr->Des()); + } return contentType; } diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/platform/network/symbian/FileConnection.h --- a/webengine/osswebengine/WebCore/platform/network/symbian/FileConnection.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/platform/network/symbian/FileConnection.h Mon Jan 18 21:20:18 2010 +0200 @@ -65,6 +65,10 @@ * Determine the content type of the file. */ HBufC8* contentTypeL(); + /** + * Determine the content type of the file from PluginHandler. + */ + HBufC8* contentTypeFromPluginsL(); /** * Determine the content encoding of the file. diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/platform/network/symbian/HttpConnection.cpp --- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpConnection.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpConnection.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -916,7 +916,7 @@ break; } } - + m_isDone = ETrue; TRAP( ret, SendAuthRequestL( usernameVal, realmVal, isProxy, stale, passwordVal ) ); if (realmClose) { @@ -1034,7 +1034,7 @@ HttpSessionManager* httpSessionMgr = StaticObjectsContainer::instance()->resourceLoaderDelegate()->httpSessionManager(); httpSessionMgr->removeAuthRequest(this); httpSessionMgr->addRequest(this, m_handle); - + m_isDone = EFalse; switch (aError) { case KErrNone: diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/platform/symbian/Libxml2/Libxml2_modules.h --- a/webengine/osswebengine/WebCore/platform/symbian/Libxml2/Libxml2_modules.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/platform/symbian/Libxml2/Libxml2_modules.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,19 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ // All new configuration directives are in: #include "XmlEngconfig.h" diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/platform/symbian/Libxml2/Libxml2_xmlmemory.c --- a/webengine/osswebengine/WebCore/platform/symbian/Libxml2/Libxml2_xmlmemory.c Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/platform/symbian/Libxml2/Libxml2_xmlmemory.c Mon Jan 18 21:20:18 2010 +0200 @@ -1,19 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ /* * xmlmemory.c: libxml memory allocator wrapper. * diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/platform/symbian/Libxml2/Libxml2_xmlwriter.c --- a/webengine/osswebengine/WebCore/platform/symbian/Libxml2/Libxml2_xmlwriter.c Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/platform/symbian/Libxml2/Libxml2_xmlwriter.c Mon Jan 18 21:20:18 2010 +0200 @@ -1,19 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ /* * xmlwriter.c: XML text writer implementation diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/parser.h --- a/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/parser.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/parser.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,20 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include "libxml2/libxml2_parser.h" #include "libxml2/Libxml2_SAX2.h" #define xmlFree free diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/parserinternals.h --- a/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/parserinternals.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/parserinternals.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include "libxml2/libxml2_parserinternals.h" diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/tree.h --- a/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/tree.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/tree.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include "libxml2/Libxml2_tree.h" diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/xmlstring.h --- a/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/xmlstring.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/xmlstring.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include "libxml2/libxml2_xmlstring.h" diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/platform/symbian/OOMHandler.h --- a/webengine/osswebengine/WebCore/platform/symbian/OOMHandler.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/platform/symbian/OOMHandler.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,21 +1,45 @@ /* -* 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 the License "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* ============================================================================== +* Name : OOMHandler.h +* Part of : Webcore / Platform +* Interface : +* Description : +* Version : %Version% +* +* Copyright (c) 2006, Nokia Corporation +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions +* are met: * -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in +* the documentation and/or other materials provided with the +* distribution. +* * Neither the name of the Nokia Corporation nor the names of its +* contributors may be used to endorse or promote products derived +* from this software without specific prior written permission. * -* Description: +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +* DAMAGE. * +* +* ============================================================================== */ - #ifndef __OOMHANDLER_H__ #define __OOMHANDLER_H__ diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/platform/symbian/OOMStopper.h --- a/webengine/osswebengine/WebCore/platform/symbian/OOMStopper.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/platform/symbian/OOMStopper.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,21 +1,45 @@ /* -* 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 the License "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* ============================================================================== +* Name : OOMHandler.h +* Part of : Webcore / Platform +* Interface : +* Description : +* Version : %Version% +* +* Copyright (c) 2006, Nokia Corporation +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions +* are met: * -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in +* the documentation and/or other materials provided with the +* distribution. +* * Neither the name of the Nokia Corporation nor the names of its +* contributors may be used to endorse or promote products derived +* from this software without specific prior written permission. * -* Description: +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +* DAMAGE. * +* +* ============================================================================== */ - #ifndef __OOMSTOPPER_H__ #define __OOMSTOPPER_H__ diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/platform/symbian/StaticObjectsContainer.cpp --- a/webengine/osswebengine/WebCore/platform/symbian/StaticObjectsContainer.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/platform/symbian/StaticObjectsContainer.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -1,20 +1,30 @@ /* -* 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 the License "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: -* -*/ - + * Copyright (C) 2006 Nokia, Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ #include "config.h" #include <../bidi.h> // work around for multiple bidi.h files @@ -327,5 +337,10 @@ m_symbianTheme = new RenderThemeSymbian(); return m_symbianTheme; } + +void StaticObjectsContainer::setIconDatabaseEnabled(bool enabled) +{ + m_icondatabase->setEnabled(enabled); +} } // END OF FILE diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/platform/symbian/StaticObjectsContainer.h --- a/webengine/osswebengine/WebCore/platform/symbian/StaticObjectsContainer.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/platform/symbian/StaticObjectsContainer.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,20 +1,30 @@ /* -* 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 the License "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: -* -*/ - + * Copyright (C) 2006 Nokia, Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ #ifndef __STATICOBJECTCONTAINER_H__ #define __STATICOBJECTCONTAINER_H__ @@ -90,6 +100,7 @@ const Vector& activeBrowserControls() const; void setFullScreenMode(bool mode); bool fullScreenMode(void); + void setIconDatabaseEnabled(bool enabled); private: static StaticObjectsContainer* gInstance; diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoder.cpp --- a/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoder.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoder.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -1,21 +1,38 @@ /* -* 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 the License "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* ============================================================================== +* Copyright (c) 2006, Nokia Corporation +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions +* are met: * -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in +* the documentation and/or other materials provided with the +* distribution. +* * Neither the name of the Nokia Corporation nor the names of its +* contributors may be used to endorse or promote products derived +* from this software without specific prior written permission. * -* Description: +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +* DAMAGE. * +* ============================================================================== */ - /* * This class is a proxy for CAnimationDecoderWrapped * diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoder.h --- a/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoder.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoder.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,21 +1,38 @@ /* -* 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 the License "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* ============================================================================== +* Copyright (c) 2006, Nokia Corporation +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions +* are met: * -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in +* the documentation and/or other materials provided with the +* distribution. +* * Neither the name of the Nokia Corporation nor the names of its +* contributors may be used to endorse or promote products derived +* from this software without specific prior written permission. * -* Description: +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +* DAMAGE. * +* ============================================================================== */ - #ifndef ANIMATIONDECODER_H #define ANIMATIONDECODER_H diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoderWrapped.cpp --- a/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoderWrapped.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoderWrapped.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -1,21 +1,38 @@ /* -* 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 the License "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* ============================================================================== +* Copyright (c) 2006, Nokia Corporation +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions +* are met: * -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in +* the documentation and/or other materials provided with the +* distribution. +* * Neither the name of the Nokia Corporation nor the names of its +* contributors may be used to endorse or promote products derived +* from this software without specific prior written permission. * -* Description: +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +* DAMAGE. * +* ============================================================================== */ - /* * This class is wrapped by a proxy CAnimationDecoder * @@ -66,8 +83,8 @@ , iObserver(aObs) , iLoopCount( -1 ) , iCurLoopCount( -1 ) - , iSyncBitmapHandle(-1) - , iSyncMaskHandle(-1) + , iSyncBitmapHandle(0) + , iSyncMaskHandle(0) , iDecodeInProgress(ETrue) , iIsInvalid(EFalse) , iCanBeDeleted(ETrue) @@ -158,17 +175,25 @@ return iDestination; } - if (iSyncBitmapHandle != -1 && iSyncMaskHandle != -1) { + if (iSyncBitmapHandle || iSyncMaskHandle) { CFbsBitmap* bitmap = new CFbsBitmap(); - bitmap->Duplicate(iSyncBitmapHandle); - CFbsBitmap* mask = new CFbsBitmap(); - mask->Duplicate(iSyncMaskHandle); + TInt errBmp = bitmap->Duplicate(iSyncBitmapHandle); + + CFbsBitmap* mask = NULL; + TInt errMask = KErrNone; + if(iSyncMaskHandle) { + CFbsBitmap* mask = new CFbsBitmap(); + errMask = mask->Duplicate(iSyncMaskHandle); + } + + if(errBmp==KErrNone && errMask==KErrNone) { + iDestination = new CMaskedBitmap(bitmap, mask); + iDestination->SetFrameIndex(0); + iDestination->SetFrameDelay(0); + } - iDestination = new CMaskedBitmap(bitmap, mask); - iDestination->SetFrameIndex(0); - iDestination->SetFrameDelay(0); - iSyncBitmapHandle = -1; - iSyncMaskHandle = -1; + iSyncBitmapHandle = 0; + iSyncMaskHandle = 0; } return iDestination; diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoderWrapped.h --- a/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoderWrapped.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoderWrapped.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,21 +1,38 @@ /* -* 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 the License "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* ============================================================================== +* Copyright (c) 2006, Nokia Corporation +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions +* are met: * -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in +* the documentation and/or other materials provided with the +* distribution. +* * Neither the name of the Nokia Corporation nor the names of its +* contributors may be used to endorse or promote products derived +* from this software without specific prior written permission. * -* Description: +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +* DAMAGE. * +* ============================================================================== */ - /* * This class is wrapped by a proxy CAnimationDecoder * diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/platform/symbian/bitmap/MaskedBitmap.cpp --- a/webengine/osswebengine/WebCore/platform/symbian/bitmap/MaskedBitmap.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/platform/symbian/bitmap/MaskedBitmap.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -34,6 +34,7 @@ // ----------------------------------------------------------------------------- TInt BitmapUtil::CopyBitmap( const CFbsBitmap& aSource, CFbsBitmap& aDestination ) { + // TODO - how to check if source or destination is null reference TSize size( aSource.SizeInPixels() ); TDisplayMode displayMode( aSource.DisplayMode() ); TInt err( aDestination.Create( size, displayMode ) ); @@ -54,6 +55,7 @@ TInt BitmapUtil::CopyBitmapData( const CFbsBitmap& aSource, CFbsBitmap& aDestination, const TSize& aSize, const TDisplayMode& aDisplayMode ) { + // TODO - how to check if source or destination is null reference HBufC8* scanLine = HBufC8::New( aSource.ScanLineLength( aSize.iWidth, aDisplayMode ) ); if( scanLine ) { @@ -215,7 +217,7 @@ } } - if( !err && maskHandle ) + if( !err && maskHandle && iMask) { if( aDuplicate ) { @@ -247,7 +249,7 @@ void CMaskedBitmap::Reset() { iBitmap->Reset(); - iMask->Reset(); + if(iMask) iMask->Reset(); } @@ -272,7 +274,7 @@ // ----------------------------------------------------------------------------- TBool CMaskedBitmap::HasMask() const { - return ( iMask->Handle() != 0 ); + return (iMask && iMask->Handle()!=0 ); } // ----------------------------------------------------------------------------- @@ -295,7 +297,7 @@ } if( iBitmap->Handle() ) { - if( iMask->Handle() ) + if( HasMask() ) { aContext.BitBltMasked( aPoint, iBitmap, s, iMask, iInvertMask ); } @@ -317,7 +319,7 @@ } if( iBitmap->Handle() ) { - if( iMask->Handle() ) + if( HasMask() ) { aContext.BitBltMasked( aPoint, iBitmap, aSource, iMask, iInvertMask ); @@ -342,7 +344,7 @@ if( iBitmap->Handle() ) { // ### FIXME DrawBitmapMasked is too buggy to use 2.8/week52, so no transparency with scaling - if( iMask->Handle() ) + if( HasMask() ) { aContext.DrawBitmapMasked( aTarget, iBitmap, s, iMask, iInvertMask ); } @@ -365,7 +367,7 @@ if( iBitmap->Handle() ) { // ### FIXME DrawBitmapMasked is too buggy to use 2.8/week52, so no transparency with scaling - if( iMask->Handle() ) + if( HasMask() ) { aContext.DrawBitmapMasked( aTarget, iBitmap, aSource, iMask, iInvertMask ); } @@ -441,10 +443,8 @@ void CMaskedBitmap::Resize(TSize aSize) { iBitmap->Resize(aSize); - if (iMask) - { + if (HasMask()) iMask->Resize(aSize); - } } // ----------------------------------------------------------------------------- @@ -589,10 +589,8 @@ TBool CMaskedBitmap::IsFullyTransparent() { - if (!iMask || !iMask->Handle()) - { + if (!HasMask()) return EFalse; - } if( iMask->DisplayMode() != EGray2 ) { @@ -630,7 +628,7 @@ if ( iBitmap && iBitmap->Handle() ) iBitmap->CompressInBackground(); - if ( iMask && iMask->Handle() ) + if ( HasMask() ) iMask->CompressInBackground(); } diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebCore/platform/symbian/bitmap/SyncDecodeThread.cpp --- a/webengine/osswebengine/WebCore/platform/symbian/bitmap/SyncDecodeThread.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebCore/platform/symbian/bitmap/SyncDecodeThread.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -119,6 +119,10 @@ // ----------------------------------------------------------------------------- void CSynDecoder::Open(const TDesC8& aData, TRequestStatus *status) { + // FbsSession is needed for parent thread if it doesn't have already + if(!RFbsSession::GetSession()) + RFbsSession::Connect(); + iElem.iRequestStatus = status; iElem.iData.Set(aData); iElem.iParentThreadId = RThread().Id(); diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKit/ForwardingHeaders/wtf/unicode/Unicode.h --- a/webengine/osswebengine/WebKit/ForwardingHeaders/wtf/unicode/Unicode.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKit/ForwardingHeaders/wtf/unicode/Unicode.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKit/ForwardingHeaders/wtf/unicode/icu/UnicodeIcu.h --- a/webengine/osswebengine/WebKit/ForwardingHeaders/wtf/unicode/icu/UnicodeIcu.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKit/ForwardingHeaders/wtf/unicode/icu/UnicodeIcu.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,1 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKit/s60/group/webcore/html/html.mmp --- a/webengine/osswebengine/WebKit/s60/group/webcore/html/html.mmp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKit/s60/group/webcore/html/html.mmp Mon Jan 18 21:20:18 2010 +0200 @@ -107,4 +107,4 @@ SOURCE HTMLTokenizer.cpp SOURCE HTMLUListElement.cpp SOURCE HTMLViewSourceDocument.cpp -SOURCE PreLoadScanner.cpp \ No newline at end of file +SOURCE PreLoadScanner.cpp diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKit/s60/misc/WebIconDatabase.cpp --- a/webengine/osswebengine/WebKit/s60/misc/WebIconDatabase.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKit/s60/misc/WebIconDatabase.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -68,16 +68,24 @@ return NULL; CGulIcon* icon = NULL; CFbsBitmap* bitmap = new CFbsBitmap(); - CFbsBitmap* mask = new CFbsBitmap(); - + CFbsBitmap* mask = new CFbsBitmap();; + int errMask = KErrNone; + int errBmp = KErrNone; if (bitmap && mask) { - int err( BitmapUtil::CopyBitmap(maskedBitmap->Bitmap(), *bitmap)); - int errMask( BitmapUtil::CopyBitmap(maskedBitmap->Mask(), *mask)); - if (err == KErrNone && errMask == KErrNone) { + errBmp = BitmapUtil::CopyBitmap(maskedBitmap->Bitmap(), *bitmap); + if(maskedBitmap->HasMask()) { + errMask = BitmapUtil::CopyBitmap(maskedBitmap->Mask(), *mask); + }else { + delete mask; + mask = NULL; + } + + if (errBmp == KErrNone && errMask == KErrNone) { TRAP_IGNORE(icon = CGulIcon::NewL()); if (icon) { icon->SetBitmap( bitmap ); - icon->SetMask( mask ); + if(mask) + icon->SetMask( mask ); } } } @@ -96,4 +104,7 @@ iconDatabase()->releaseIconForPageURL(String(url)); } - +void WebIconDatabase::setEnabled(bool enabled) +{ + iconDatabase()->setEnabled(enabled); +} diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKit/s60/misc/WebIconDatabase.h --- a/webengine/osswebengine/WebKit/s60/misc/WebIconDatabase.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKit/s60/misc/WebIconDatabase.h Mon Jan 18 21:20:18 2010 +0200 @@ -33,6 +33,7 @@ CGulIcon* iconForPageURL(const TDesC8& url); void retainIconForURL(const TDesC8& url); void releaseIconForURL(const TDesC8& url); + void setEnabled(bool enabled); private: diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKit/s60/plugins/PluginSkin.cpp --- a/webengine/osswebengine/WebKit/s60/plugins/PluginSkin.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKit/s60/plugins/PluginSkin.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -98,10 +98,13 @@ // return an absolute url that results from refUrl being resolved against // baseUrl. // ---------------------------------------------------------------------------- -HBufC8* makeAbsoluteUrlL(const TDesC8& baseUrl, const TDesC8& refUrl) +HBufC8* makeAbsoluteUrlL(const TDesC8* baseUrl,const TDesC8* docUrl, const TDesC8& refUrl) { TUriParser8 baseUrlparser; - baseUrlparser.Parse(baseUrl); + if(baseUrl == NULL) + baseUrlparser.Parse(*docUrl); + else + baseUrlparser.Parse(*baseUrl); TUriParser8 refUrlparser; refUrlparser.Parse(refUrl); @@ -819,7 +822,9 @@ } // make sure it is an absolute URL - HBufC8* absoluteUrl = makeAbsoluteUrlL(*m_url, url); + HBufC8* docUrl = HBufC8::NewLC(core(m_frame)->document()->baseURI().length()); + docUrl->Des().Copy(core(m_frame)->document()->baseURI()); + HBufC8* absoluteUrl = makeAbsoluteUrlL(m_url, docUrl, url); CleanupStack::PushL(absoluteUrl); if( (loadmode == ELoadModePlugin ) || (url.FindF(KSwfExtn)!= KErrNotFound) ){ @@ -847,7 +852,7 @@ CleanupStack::PopAndDestroy(windowType); } - CleanupStack::PopAndDestroy(absoluteUrl); + CleanupStack::PopAndDestroy(2); return KErrNone; } @@ -855,7 +860,9 @@ int PluginSkin::postRequestL(const TDesC8& url,const TDesC& buffer, bool fromfile, bool notify, void* notifydata,const TDesC* aWindowType) { // make sure it is an absolute URL - HBufC8* absoluteUrl = makeAbsoluteUrlL(*m_url, url); + HBufC8* docUrl = HBufC8::NewLC(core(m_frame)->document()->baseURI().length()); + docUrl->Des().Copy(core(m_frame)->document()->baseURI()); + HBufC8* absoluteUrl = makeAbsoluteUrlL(m_url, docUrl, url); CleanupStack::PushL(absoluteUrl); TPluginLoadMode loadmode = GetLoadMode(aWindowType); @@ -938,7 +945,7 @@ } - CleanupStack::PopAndDestroy(absoluteUrl); + CleanupStack::PopAndDestroy(2); return KErrNone; } @@ -1000,6 +1007,25 @@ return (void *)0; } +TBool validateDataScheme(const TPtrC8& url) +{ + // Check if body part of "data:" exists = data:[][;base64],. RFC-2397 : http://www.faqs.org/rfcs/rfc2397 + TPtrC8 urlPtr8 = url; + + if(url.Length() <= 0 ) + return EFalse; + + TInt commaPos( urlPtr8.Locate( ',' ) ); + if (commaPos == KErrNotFound ) + return EFalse; + + TPtrC8 datapart (urlPtr8.Mid(commaPos + 1)); + if (datapart.Length() <= 0) + return EFalse; + + return ETrue; +} + TBool PluginSkin::isBrowserScheme(const TPtrC8& url) { TBool supported(EFalse); @@ -1007,9 +1033,13 @@ if( parser.Parse( url ) == KErrNone ) { TPtrC8 scheme = parser.Extract( EUriScheme ); if (scheme.CompareF( _L8("http" ) ) == 0 || scheme.CompareF( _L8("https" ) ) == 0 - || scheme.Length() == 1 || scheme.CompareF( _L8("file") ) == 0 || scheme.CompareF( _L8("data") ) == 0) { + || scheme.Length() == 1 || scheme.CompareF( _L8("file") ) == 0) { supported = ETrue; } + else if(scheme.CompareF( _L8("data") ) == 0) { + // if the scheme is "data", check its validity according to RFC-2397 : http://www.faqs.org/rfcs/rfc2397 + supported = validateDataScheme(url); + } } return supported; } diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKit/s60/webcoresupport/WebEditorClient.cpp --- a/webengine/osswebengine/WebKit/s60/webcoresupport/WebEditorClient.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKit/s60/webcoresupport/WebEditorClient.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -506,9 +506,11 @@ //----------------------------------------------------------------------------- // WebEditorClient::handleInputMethodKeypress //----------------------------------------------------------------------------- -void WebEditorClient::handleInputMethodKeypress(KeyboardEvent*) +void WebEditorClient::handleInputMethodKeypress(KeyboardEvent* event) { - notImplemented(); + const PlatformKeyboardEvent* kevent = event->keyEvent(); + if(kevent->isKeyDown()) + handleKeypress(event); } //----------------------------------------------------------------------------- diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKit/s60/webview/BrCtlSoftkeysObserverImpl.h --- a/webengine/osswebengine/WebKit/s60/webview/BrCtlSoftkeysObserverImpl.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKit/s60/webview/BrCtlSoftkeysObserverImpl.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,22 +1,46 @@ /* -* 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 the License "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* ============================================================================== +* Name : BrCtlBrCtlSoftkeysObserverImpl.h +* Part of : WebKit \ BrowserControl +* Interface : Browser Control API +* Description : Handle softkeys updates +* Version : %Version% * -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Handle softkeys updates -* +* Copyright (c) 2006, Nokia Corporation +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions +* are met: +* +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in +* the documentation and/or other materials provided with the +* distribution. +* * Neither the name of the Nokia Corporation nor the names of its +* contributors may be used to endorse or promote products derived +* from this software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +* DAMAGE. +* +* Please see file patentlicense.txt for further grants. +* ============================================================================== */ - #ifndef CRCTLSOFTKEYSOBSERVERIMPL_H #define CRCTLSOFTKEYSOBSERVERIMPL_H diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKit/s60/webview/BrCtlSpecialLoadObserverImpl.h --- a/webengine/osswebengine/WebKit/s60/webview/BrCtlSpecialLoadObserverImpl.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKit/s60/webview/BrCtlSpecialLoadObserverImpl.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,22 +1,46 @@ /* -* 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 the License "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* ============================================================================== +* Name : BrCtlSpecialLoadObserverImpl.h +* Part of : WebKit \ BrowserControl +* Interface : Browser Control API +* Description : Handle special load events such as network connection, deal with non-http or non-html requests +* Version : %Version% * -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Handle special load events such as network connection, deal with non-http or non-html requests -* +* Copyright (c) 2006, Nokia Corporation +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions +* are met: +* +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in +* the documentation and/or other materials provided with the +* distribution. +* * Neither the name of the Nokia Corporation nor the names of its +* contributors may be used to endorse or promote products derived +* from this software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +* DAMAGE. +* +* Please see file patentlicense.txt for further grants. +* ============================================================================== */ - #ifndef BRCTLSPECIALLOADOBSERVERIMPL_H #define BRCTLSPECIALLOADOBSERVERIMPL_H diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKit/s60/webview/BrCtlWindowObserverImpl.h --- a/webengine/osswebengine/WebKit/s60/webview/BrCtlWindowObserverImpl.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKit/s60/webview/BrCtlWindowObserverImpl.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,22 +1,46 @@ /* -* 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 the License "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* ============================================================================== +* Name : BrCtlWinowObserverImpl.h +* Part of : WebKit \ BrowserControl +* Interface : Browser Control API +* Description : Handle special load events such as network connection, deal with non-http or non-html requests +* Version : %Version% * -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Handle special load events such as network connection, deal with non-http or non-html requests -* +* Copyright (c) 2006, Nokia Corporation +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions +* are met: +* +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in +* the documentation and/or other materials provided with the +* distribution. +* * Neither the name of the Nokia Corporation nor the names of its +* contributors may be used to endorse or promote products derived +* from this software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +* DAMAGE. +* +* Please see file patentlicense.txt for further grants. +* ============================================================================== */ - #ifndef BRCTLWINDOWOBSERVERIMPL_H #define BRCTLWINDOWOBSERVERIMPL_H diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKit/s60/webview/SettingsContainer.cpp --- a/webengine/osswebengine/WebKit/s60/webview/SettingsContainer.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKit/s60/webview/SettingsContainer.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -142,7 +142,10 @@ break; case TBrCtlDefs::ESettingsCurrentZoomLevelIndex: m_webView->setZoomLevel(brctlSettings[setting]); - break; + break; + case TBrCtlDefs::ESettingsAutoRefresh: + brctlSetting(TBrCtlDefs::ESettingsAutoRefresh); + break; } } diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKit/s60/webview/WebFepTextEditor.cpp --- a/webengine/osswebengine/WebKit/s60/webview/WebFepTextEditor.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKit/s60/webview/WebFepTextEditor.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -75,7 +75,8 @@ CWebFepTextEditor::CWebFepTextEditor(WebView* aView) : m_webView(aView), m_textFormatMask(NULL), - m_inlineEditText(NULL) + m_inlineEditText(NULL), + m_longKeyPress(EFalse) { // Set up the extended capabilities TRAP_IGNORE( @@ -195,6 +196,8 @@ delete m_inlineEditText; m_inlineEditText = NULL; + + m_longKeyPress = EFalse ; UpdateInputModeState(EAknEditorNullInputMode, EAknEditorAllInputModes,EAknEditorStandardNumberModeKeymap); UpdateFlagsState(EAknEditorFlagDefault); @@ -409,6 +412,9 @@ if ( m_textFormatMask && m_textFormatMask->getMultitude() > 0 ) length = m_textFormatMask->getMultitude(); + if (IsLongKeyPress() && + (KMaxTInt != length)) + length += 1 ; // TextArea node has no member function maxLength(), so return KMaxTInt return length; } @@ -585,6 +591,8 @@ //delete the m_inlineEditText since text is commited delete m_inlineEditText; m_inlineEditText = NULL; + + m_longKeyPress = EFalse; HandleUpdateCursor(); UpdateEditingMode(); @@ -656,6 +664,7 @@ { aSetToTrue=ETrue; SetCursorSelectionForFepL(aCursorSelection); + m_longKeyPress = ETrue ; StartFepInlineEditL(aInitialInlineText, aPositionOfInsertionPointInInlineText, aCursorVisibility, aCustomDraw, aInlineTextFormatRetriever, aPointerEventHandlerDuringInlineEdit); } @@ -934,6 +943,10 @@ style->setProperty(CSS_PROP_COLOR, "red", false, ec); return false; } + else if ( m_textFormatMask->acceptAll() ) + { + return true; + } else { style->setProperty(CSS_PROP_COLOR, m_inputTextColor, false, ec); @@ -1470,4 +1483,13 @@ CancelEditingMode(); } +// ----------------------------------------------------------------------------- +// IsLongKeyPress +// +// Called to know the status of the key pressed +// ----------------------------------------------------------------------------- +TBool CWebFepTextEditor::IsLongKeyPress() const + { + return m_longKeyPress ; + } diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKit/s60/webview/WebFepTextEditor.h --- a/webengine/osswebengine/WebKit/s60/webview/WebFepTextEditor.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKit/s60/webview/WebFepTextEditor.h Mon Jan 18 21:20:18 2010 +0200 @@ -116,6 +116,7 @@ bool validateTextFormat(); TBool IsDirectionRTL(); + TBool IsLongKeyPress() const; #if defined(BRDO_BROWSER_50_FF) void SetAlignment(CAknExtendedInputCapabilities::TInputCapabilities aAlignment); @@ -146,6 +147,7 @@ String m_inputTextColor; CAknExtendedInputCapabilities* m_ExtendedInputCapabilities; CAknCcpuSupport* m_CcpuSupport; + TBool m_longKeyPress; }; #endif diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKit/s60/webview/WebPointerEventHandler.cpp --- a/webengine/osswebengine/WebKit/s60/webview/WebPointerEventHandler.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKit/s60/webview/WebPointerEventHandler.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -151,6 +151,8 @@ PluginSkin* plugin = m_webview->mainFrame()->focusedPlugin(); if (plugin && plugin->pluginWin()) { if (plugin->pluginWin()->HandleGesture(aEvent)) { + if(!plugin->isActive()) + plugin->activate(); return; } } diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKit/s60/webview/WebPolicyManager.cpp --- a/webengine/osswebengine/WebKit/s60/webview/WebPolicyManager.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKit/s60/webview/WebPolicyManager.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -46,6 +46,8 @@ const char* typeSvg = "svg"; _LIT(KPathBegin,""); +_LIT8(KFileSchema, "file://"); +_LIT8(KFileSchemaUnixStyle, "file:///"); WebPolicyManager::WebPolicyManager(WebFrameLoaderClient* webFrameLoaderClient) : m_webFrameLoaderClient(webFrameLoaderClient) @@ -179,8 +181,19 @@ else if( MIMEType == typeTextPlain || MIMEType == typeApplicationOctetStream ) { TPtrC8 url = (core(m_webFrameLoaderClient->webFrame()))->loader()->activeDocumentLoader()->responseURL().des(); + //Converting TPtrC8 to TPtr8 as Delete() is supported in TPtr8. + HBufC8* lUrl = HBufC8::NewLC(url.Length()); + lUrl->Des().Copy( url ); + TPtr8 tempurl = lUrl->Des(); + //Truncate file:// or file:///(Unix style) from the URI as the path + //file:\\c:\\...\\... is not recognised as a valid path by TUriParser + if(url.FindF(KFileSchema)!= KErrNotFound) + tempurl.Delete(0,KFileSchema().Length()); + else if(url.FindF(KFileSchemaUnixStyle)!= KErrNotFound) + tempurl.Delete(0,KFileSchemaUnixStyle().Length()); + TUriParser8 parser; - if( parser.Parse(url) == KErrNone ) { + if( parser.Parse(tempurl) == KErrNone ) { TPtrC8 path = parser.Extract( EUriPath ); // path == 1 means only / (no filename) if( path.Length() > 1 ) { @@ -192,6 +205,7 @@ path.Find(_L8(".txt")) != KErrNotFound); } } + CleanupStack::PopAndDestroy(lUrl); } // tot:fixme defaultcontenthandler is only for selfdownloadable, go through the list return found; diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKit/s60/webview/WebTextFormatMask.cpp --- a/webengine/osswebengine/WebKit/s60/webview/WebTextFormatMask.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKit/s60/webview/WebTextFormatMask.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -276,6 +276,11 @@ return true; } +bool WebTextFormatMask::acceptAll() + { + return m_acceptAll; + } + MaskComposite::MaskComposite(TInputFormatMaskType t, int mul) : MaskSingle(t), m_offset(0), m_length(mul) { diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKit/s60/webview/WebTextFormatMask.h --- a/webengine/osswebengine/WebKit/s60/webview/WebTextFormatMask.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKit/s60/webview/WebTextFormatMask.h Mon Jan 18 21:20:18 2010 +0200 @@ -121,6 +121,7 @@ bool checkText(const WebCore::String&, ErrorBlock&); MaskBase* getMask(int aOffset); + bool acceptAll(); public: int getMultitude(); diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKit/s60/webview/WebView.cpp --- a/webengine/osswebengine/WebKit/s60/webview/WebView.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKit/s60/webview/WebView.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -1083,6 +1083,7 @@ bool downEventConsumed = false; bool consumed = false; bool tabbedNavigation = (m_brctl->settings()->getNavigationType() == SettingsContainer::NavigationTypeTabbed); + bool navigationNone = (m_brctl->settings()->getNavigationType() == SettingsContainer::NavigationTypeNone); /* * For each platform keyDown event EventHandler::keEvent() generates * keydown and keypress. @@ -1091,8 +1092,11 @@ * and send it here. */ if (eventcode == EEventKeyDown){ - downEventConsumed = sendKeyEventToEngine(keyevent, EEventKeyDown, frame); + downEventConsumed = sendKeyEventToEngine(keyevent, EEventKeyDown, frame) || + ((m_focusedElementType == TBrCtlDefs::EElementActivatedInputBox && // style of input box + page()->chrome()->client()->elementVisibilityChanged())); } + /* * downEventConsumed will be true if JavaScript consumes key event * If we are not in the widget mode we want to deactivate input box @@ -1104,7 +1108,11 @@ if (!widgetDownEventConsumed && needDeactivateEditable(keyevent, eventcode, frame, downEventConsumed)) { deactivateEditable(); } - + if(!navigationNone) + if(frame->document()->focusedNode() != NULL && IS_DOWN_KEY(keyevent) && frame->document()->focusedNode()->changed()) + { + deactivateEditable(); + } if (tabbedNavigation) { consumed = downEventConsumed || handleTabbedNavigation(m_currentEventKey, m_currentEventCode); } @@ -1376,7 +1384,7 @@ (keyevent.iScanCode == EStdKeyEnter) ) { // pass it to webcore - if (( m_focusedElementType == TBrCtlDefs::EElementInputBox || + if (( m_focusedElementType == TBrCtlDefs::EElementActivatedInputBox || m_focusedElementType == TBrCtlDefs::EElementTextAreaBox) && m_brctl->settings()->getNavigationType() == SettingsContainer::NavigationTypeTabbed ) { if (!m_prevEditMode) { @@ -2557,6 +2565,7 @@ #if USE(LOW_BANDWIDTH_DISPLAY) m_page->mainFrame()->loader()->setUseLowBandwidthDisplay(false); #endif + StaticObjectsContainer::instance()->setIconDatabaseEnabled(false); } //Widgets dont need memory cache for dead objects. hence set it to 0 diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/BrCtl.h --- a/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/BrCtl.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/BrCtl.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,22 +1,46 @@ /* -* 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 the License "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* ============================================================================== +* Name : BrCtl.h +* Part of : WebKit \ BrowserControl +* Interface : Browser Control API +* Description : Implementation of the Browser Control +* Version : 3.1 +* +* Copyright (c) 2006, Nokia Corporation +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions +* are met: * -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in +* the documentation and/or other materials provided with the +* distribution. +* * Neither the name of the Nokia Corporation nor the names of its +* contributors may be used to endorse or promote products derived +* from this software without specific prior written permission. * -* Description: Implementation of the Browser Control +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +* DAMAGE. * +* Please see file patentlicense.txt for further grants. +* ============================================================================== */ - #ifndef BRCTL_H #define BRCTL_H diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/WebView.h --- a/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/WebView.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/WebView.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,21 +1,45 @@ /* -* 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 the License "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* ============================================================================== +* Name : WebKitView.h +* Part of : WEBKIT / Browser View +* Interface : Implemetation of CWebKitView +* Description : +* Version : 3.1 +* +* Copyright (c) 2006, Nokia Corporation +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions +* are met: * -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in +* the documentation and/or other materials provided with the +* distribution. +* * Neither the name of the Nokia Corporation nor the names of its +* contributors may be used to endorse or promote products derived +* from this software without specific prior written permission. * -* Description: +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +* DAMAGE. * +* Please see file patentlicense.txt for further grants. +* ============================================================================== */ - #ifndef WEBKITVIEW_H #define WEBKITVIEW_H diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/mock/inc/BrCtl.h --- a/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/mock/inc/BrCtl.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/mock/inc/BrCtl.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,21 +1,45 @@ /* -* 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 the License "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* ============================================================================== +* Name : BrCtl.h +* Part of : WebKit \ BrowserControl +* Interface : Browser Control API +* Description : Implementation of the Browser Control +* Version : 3.1 +* +* Copyright (c) 2006, Nokia Corporation +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions +* are met: * -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in +* the documentation and/or other materials provided with the +* distribution. +* * Neither the name of the Nokia Corporation nor the names of its +* contributors may be used to endorse or promote products derived +* from this software without specific prior written permission. * -* Description: Implementation of the Browser Control +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +* DAMAGE. * +* Please see file patentlicense.txt for further grants. +* ============================================================================== */ - #ifndef BRCTL_H #define BRCTL_H diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/mock/src/BrCtl.cpp --- a/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/mock/src/BrCtl.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/mock/src/BrCtl.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -1,20 +1,43 @@ /* -* 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 the License "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* ============================================================================== +* Name : BrCtl.cpp +* Part of : WebKit \ BrowserControl +* Description : Implementation of the Browser Control +* Version : 3.1 +* +* Copyright (c) 2006, Nokia Corporation +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions +* are met: * -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in +* the documentation and/or other materials provided with the +* distribution. +* * Neither the name of the Nokia Corporation nor the names of its +* contributors may be used to endorse or promote products derived +* from this software without specific prior written permission. * -* Description: Implementation of the Browser Control +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUHC +* DAMAGE. * +* Please see file patentlicense.txt for further grants. +* ============================================================================== */ - // INCLUDE FILES #include #include <../bidi.h> diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKit/win/WebKit.vcproj/resource.h --- a/webengine/osswebengine/WebKit/win/WebKit.vcproj/resource.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKit/win/WebKit.vcproj/resource.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,19 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. // Used by WebKit.rc diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKitTools/Drosera/win/resource.h --- a/webengine/osswebengine/WebKitTools/Drosera/win/resource.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKitTools/Drosera/win/resource.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,19 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. // Used by Drosera.rc diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.c --- a/webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.c Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.c Mon Jan 18 21:20:18 2010 +0200 @@ -1,19 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ /* IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc. ("Apple") in consideration of your agreement to the following terms, and your use, installation, diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.h --- a/webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,19 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ /* IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc. ("Apple") in consideration of your agreement to the following terms, and your use, installation, diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/TestObject.c --- a/webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/TestObject.c Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/TestObject.c Mon Jan 18 21:20:18 2010 +0200 @@ -1,19 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ /* IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc. ("Apple") in consideration of your agreement to the following terms, and your use, installation, diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/TestObject.h --- a/webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/TestObject.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/TestObject.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,19 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ /* IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc. ("Apple") in consideration of your agreement to the following terms, and your use, installation, diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/main.c --- a/webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/main.c Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/main.c Mon Jan 18 21:20:18 2010 +0200 @@ -1,19 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ /* IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc. ("Apple") in consideration of your agreement to the following terms, and your use, installation, diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro --- a/webengine/osswebengine/WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro Mon Jan 18 21:20:18 2010 +0200 @@ -1,19 +1,3 @@ -# -# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -# All rights reserved. -# This component and the accompanying materials are made available -# under the terms of the License "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: -# - TARGET = DumpRenderTree include(../../../WebKit.pri) diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/main.c --- a/webengine/osswebengine/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/main.c Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/main.c Mon Jan 18 21:20:18 2010 +0200 @@ -1,19 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ /* IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc. ("Apple") in consideration of your agreement to the following terms, and your use, installation, diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/resource.h --- a/webengine/osswebengine/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/resource.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/resource.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,19 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. // Used by TestNetscapePlugin.rc diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/cache/cache_check.pl --- a/webengine/osswebengine/cache/cache_check.pl Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/cache/cache_check.pl Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,3 @@ -# -# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -# All rights reserved. -# This component and the accompanying materials are made available -# under the terms of the License "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: -# #!/usr/bin/perl #use Encode; diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/cache/conf/httpcachemanager.confml Binary file webengine/osswebengine/cache/conf/httpcachemanager.confml has changed diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/cache/filter_emulator_output.bat --- a/webengine/osswebengine/cache/filter_emulator_output.bat Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/cache/filter_emulator_output.bat Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,2 @@ -@rem -@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -@rem All rights reserved. -@rem This component and the accompanying materials are made available -@rem under the terms of the License "Eclipse Public License v1.0" -@rem which accompanies this distribution, and is available -@rem at the URL "http://www.eclipse.org/legal/epl-v10.html". -@rem -@rem Initial Contributors: -@rem Nokia Corporation - initial contribution. -@rem -@rem Contributors: -@rem -@rem Description: -@rem - filter_log.pl %tmp%\epocwind.out log.txt" log.txt diff -r cb62a4f66ebe -r 6297cdf66332 webengine/osswebengine/cache/filter_log.pl --- a/webengine/osswebengine/cache/filter_log.pl Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/osswebengine/cache/filter_log.pl Mon Jan 18 21:20:18 2010 +0200 @@ -1,18 +1,3 @@ -# -# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -# All rights reserved. -# This component and the accompanying materials are made available -# under the terms of the License "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: -# #!/usr/bin/perl open INH,"<",$ARGV[0]; diff -r cb62a4f66ebe -r 6297cdf66332 webengine/webkitutils/SqliteSymbian/keywordhash.h --- a/webengine/webkitutils/SqliteSymbian/keywordhash.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/webkitutils/SqliteSymbian/keywordhash.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,19 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ /* Hash score: 159 */ static int keywordCode(const char *z, int n){ static const char zText[537] = diff -r cb62a4f66ebe -r 6297cdf66332 webengine/webkitutils/SqliteSymbian/parse.h --- a/webengine/webkitutils/SqliteSymbian/parse.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/webkitutils/SqliteSymbian/parse.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,20 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ - #define TK_SEMI 1 #define TK_EXPLAIN 2 #define TK_QUERY 3 diff -r cb62a4f66ebe -r 6297cdf66332 webengine/webkitutils/SqliteSymbian/printf.c --- a/webengine/webkitutils/SqliteSymbian/printf.c Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/webkitutils/SqliteSymbian/printf.c Mon Jan 18 21:20:18 2010 +0200 @@ -1,19 +1,3 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: -* -*/ /* ** The "printf" code that follows dates from the 1980's. It is in ** the public domain. The original comments are included here for diff -r cb62a4f66ebe -r 6297cdf66332 webengine/widgetengine/src/MenuClient.cpp --- a/webengine/widgetengine/src/MenuClient.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/widgetengine/src/MenuClient.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -298,7 +298,12 @@ m_jsmenu->leftKeyCallback()->InvokeCall(); return ETrue; } - + + if ( aCommandId == EAknSoftkeyOptions && m_jsmenu && m_jsmenu->onShowCallback() ) { + m_jsmenu->onShowCallback()->InvokeCall(); + return ETrue; + } + return EFalse; } diff -r cb62a4f66ebe -r 6297cdf66332 webengine/widgetinstaller/Inc/WidgetBackupRegistryXml.h --- a/webengine/widgetinstaller/Inc/WidgetBackupRegistryXml.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/widgetinstaller/Inc/WidgetBackupRegistryXml.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,23 +1,25 @@ /* -* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: This file contains the header file of the CWidgetBackupRegistryXml class. +* ============================================================================== +* Name : WidgetRegistryXml.h +* Part of : Widget Registry +* Interface : Widget Registry API +* Description : This file contains the header file of the CWidgetBackupRegistryXml class. * * This class processes persistent registry data in XML. +* Version : %version: % * +* Copyright © 2008 Nokia Corporation. +* This material, including documentation and any related +* computer programs, is protected by copyright controlled by +* Nokia Corporation. All rights are reserved. Copying, +* including reproducing, storing, adapting or translating, any +* or all of this material requires the prior written consent of +* Nokia Corporation. This material also contains confidential +* information which may not be disclosed to others without the +* prior written consent of Nokia Corporation. +* ============================================================================== */ - #ifndef WIDGETBACKUPREGISTRYXML_H #define WIDGETBACKUPREGISTRYXML_H diff -r cb62a4f66ebe -r 6297cdf66332 webengine/widgetinstaller/Src/WidgetBackupRegistryXml.cpp --- a/webengine/widgetinstaller/Src/WidgetBackupRegistryXml.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/widgetinstaller/Src/WidgetBackupRegistryXml.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -1,20 +1,24 @@ -/* -* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: Processes registry persistent data in XML. -* -*/ +// +// ============================================================================== +// Name : WidgetBackupRegistryXml.cpp +// Part of : WidgetRegistry +// Interface : +// Description : Processes registry persistent data in XML. +// Version : 5.0 +// +// Copyright © 2008 Nokia Corporation. +// This material, including documentation and any related +// computer programs, is protected by copyright controlled by +// Nokia Corporation. All rights are reserved. Copying, +// including reproducing, storing, adapting or translating, any +// or all of this material requires the prior written consent of +// Nokia Corporation. This material also contains confidential +// information which may not be disclosed to others without the +// prior written consent of Nokia Corporation. +// ============================================================================== +/// +// INCLUDE FILES #include #include diff -r cb62a4f66ebe -r 6297cdf66332 webengine/widgetregistry/Server/inc/WidgetMMCHandler.h --- a/webengine/widgetregistry/Server/inc/WidgetMMCHandler.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/widgetregistry/Server/inc/WidgetMMCHandler.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,21 +1,22 @@ /* -* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* ============================================================================ +* Name : WidgetMMCHandler.h +* Part of : Widget Registry +* Description : Acts on MMC card insertion/removal +* Version : 3.1 * -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Acts on MMC card insertion/removal -* +* Copyright © 2008 Nokia Corporation. +* This material, including documentation and any related +* computer programs, is protected by copyright controlled by +* Nokia Corporation. All rights are reserved. Copying, +* including reproducing, storing, adapting or translating, any +* or all of this material requires the prior written consent of +* Nokia Corporation. This material also contains confidential +* information which may not be disclosed to others without the +* prior written consent of Nokia Corporation. +* ============================================================================= */ - #ifndef WIDGETMMCHANDLER_H #define WIDGETMMCHANDLER_H diff -r cb62a4f66ebe -r 6297cdf66332 webengine/widgetregistry/Server/src/WidgetMMCHandler.cpp --- a/webengine/widgetregistry/Server/src/WidgetMMCHandler.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/widgetregistry/Server/src/WidgetMMCHandler.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -1,22 +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 the License "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: Handle notifications of MMC events. -* -* -* -*/ +// +// ============================================================================ +// Name : WidgetMMCHandler.cpp +// Part of : SW Installer UIs / WidgetInstallerUI +// +// Description: Handle notifications of MMC events. +// +// +// Version : 3.1 +// +// Copyright © 2006 Nokia Corporation. +// This material, including documentation and any related +// computer programs, is protected by copyright controlled by +// Nokia Corporation. All rights are reserved. Copying, +// including reproducing, storing, adapting or translating, any +// or all of this material requires the prior written consent of +// Nokia Corporation. This material also contains confidential +// information which may not be disclosed to others without the +// prior written consent of Nokia Corporation. +// ============================================================================== +/// +// INCLUDE FILES #include "WidgetMMCHandler.h" #include "WidgetRegistry.h" @@ -115,7 +119,13 @@ LOG_OPEN; LOG1( "MMC notification status %d", iStatus.Int() ); - if ( iStatus == KErrNone ) + TInt status = iStatus.Int(); + + // Request the notification before scanning + iFs.NotifyChange( ENotifyDisk, iStatus ); + SetActive(); + + if ( status == KErrNone ) { TInt driveFlags = 0; TInt deltaDriveFlags = 0; @@ -131,9 +141,6 @@ } LOG( "MMC notification done" ); LOG_CLOSE; - - iFs.NotifyChange( ENotifyDisk, iStatus ); - SetActive(); } // ============================================================================ diff -r cb62a4f66ebe -r 6297cdf66332 webengine/widgetregistry/Server/src/WidgetRegistryServer.cpp --- a/webengine/widgetregistry/Server/src/WidgetRegistryServer.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/widgetregistry/Server/src/WidgetRegistryServer.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -126,6 +126,9 @@ TRAP_IGNORE( apparcSession.RegisterNonNativeApplicationTypeL( KUidWidgetLauncher, KLauncherApp())); + + apparcSession.PrepareNonNativeApplicationsUpdatesL(); + apparcSession.ForceCommitNonNativeApplicationsUpdatesL(); apparcSession.Close(); } diff -r cb62a4f66ebe -r 6297cdf66332 webengine/wrtharvester/inc/wrtusbhandler.h --- a/webengine/wrtharvester/inc/wrtusbhandler.h Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/wrtharvester/inc/wrtusbhandler.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,21 +1,22 @@ /* -* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* ============================================================================ +* Name : WrtUsbHandler.h +* Part of : Widget Registry +* Description : Acts on MMC card insertion/removal +* Version : 3.1 * -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Acts on MMC card insertion/removal -* +* Copyright © 2008 Nokia Corporation. +* This material, including documentation and any related +* computer programs, is protected by copyright controlled by +* Nokia Corporation. All rights are reserved. Copying, +* including reproducing, storing, adapting or translating, any +* or all of this material requires the prior written consent of +* Nokia Corporation. This material also contains confidential +* information which may not be disclosed to others without the +* prior written consent of Nokia Corporation. +* ============================================================================= */ - #ifndef WIDGETMMCHANDLER_H #define WIDGETMMCHANDLER_H diff -r cb62a4f66ebe -r 6297cdf66332 webengine/wrtharvester/rom/wrtharvesterResources.iby --- a/webengine/wrtharvester/rom/wrtharvesterResources.iby Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/wrtharvester/rom/wrtharvesterResources.iby Mon Jan 18 21:20:18 2010 +0200 @@ -1,22 +1,22 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* ============================================================================= +* Name : wrtharvesterResources.iby +* Part of : +* Description : The resource iby file contains resource that needs to be +* localized for wrtharvester +* Version : %version: 1 % * -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: The resource iby file contains resource that needs to be -* localized for wrtharvester -* +* Copyright (c) 2009 Nokia. All rights reserved. +* This material, including documentation and any related computer +* programs, is protected by copyright controlled by Nokia. All +* rights are reserved. Copying, including reproducing, storing, +* adapting or translating, any or all of this material requires the +* prior written consent of Nokia. This material also contains +* confidential information which may not be disclosed to others +* without the prior written consent of Nokia. +* ============================================================================ */ - #ifndef WRTHARVESTERRESOURCES_IBY #define WRTHARVESTERRESOURCES_IBY diff -r cb62a4f66ebe -r 6297cdf66332 webengine/wrtharvester/src/wrtharvester.cpp --- a/webengine/wrtharvester/src/wrtharvester.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/wrtharvester/src/wrtharvester.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -49,6 +49,11 @@ // CONSTANTS _LIT( KResourceFileName, "\\resource\\wrtharvester.rsc" ); _LIT( KResourceDir, "Z:wrtharvester.rsc" ); +_LIT( KUid, "uid"); +_LIT( K0x, "0x"); +_LIT( KOpenPar, "("); +_LIT( KClosePar, ")"); +_LIT8( KWidgetIcon, "widget_icon"); /** * Utility class to show the prompt for platform security access. @@ -519,7 +524,17 @@ __UHEAP_MARK; TInt id( KErrNotFound ); if( iCPSInterface ) - { + { + TBuf<10> uid(wrtInfo.iUid.Name()); // [12345678] + uid.Delete(0,1); // 12345678] + uid.Delete( uid.Length()-1, 1); // 12345678 + TBuf<50> wrtuid; + wrtuid.Append(KUid); // uid + wrtuid.Append(KOpenPar); // uid( + wrtuid.Append(K0x); // uid(0x + wrtuid.Append(uid ); // uid(0x12345678 + wrtuid.Append(KClosePar); // uid(0x12345678) + CLiwGenericParamList* inparam( CLiwGenericParamList::NewLC() ); CLiwGenericParamList* outparam( CLiwGenericParamList::NewLC() ); @@ -533,21 +548,24 @@ cpdatamap->InsertL( KPublisherId, TLiwVariant( KWRTPublisher )); cpdatamap->InsertL( KContentType, TLiwVariant( KTemplatedWidget )); cpdatamap->InsertL( KContentId, TLiwVariant( wrtInfo.iBundleId )); - // Widget info map - CLiwDefaultMap* widgetInfo = CLiwDefaultMap::NewLC(); - widgetInfo->InsertL( KTemplateType, TLiwVariant( KTemplateName )); - widgetInfo->InsertL( KWidgetName, TLiwVariant( wrtInfo.iDisplayName )); - datamap->InsertL( KWidgetInfo , TLiwVariant( widgetInfo )); - CleanupStack::PopAndDestroy( widgetInfo ); - // Take dynamic menu items into use - if (networkAccess) - { - CLiwDefaultMap* mapMenu = CLiwDefaultMap::NewLC(); - mapMenu->InsertL( KItemOnlineOffline, TLiwVariant( KMyActionName )); - datamap->InsertL( KMenuItems, TLiwVariant( mapMenu )); - CleanupStack::PopAndDestroy(mapMenu); - } + // Widget info map + CLiwDefaultMap* widgetInfo = CLiwDefaultMap::NewLC(); + widgetInfo->InsertL( KTemplateType, TLiwVariant( KTemplateName )); + widgetInfo->InsertL( KWidgetName, TLiwVariant( wrtInfo.iDisplayName )); + widgetInfo->InsertL( KWidgetIcon, TLiwVariant( wrtuid)); // uid(0x12345678) This is the expected format + + datamap->InsertL( KWidgetInfo , TLiwVariant( widgetInfo )); + CleanupStack::PopAndDestroy( widgetInfo ); + + // Take dynamic menu items into use + if (networkAccess) + { + CLiwDefaultMap* mapMenu = CLiwDefaultMap::NewLC(); + mapMenu->InsertL( KItemOnlineOffline, TLiwVariant( KMyActionName )); + datamap->InsertL( KMenuItems, TLiwVariant( mapMenu )); + CleanupStack::PopAndDestroy(mapMenu); + } cpdatamap->InsertL( KDataMap, TLiwVariant(datamap) ); diff -r cb62a4f66ebe -r 6297cdf66332 webengine/wrtharvester/src/wrtusbhandler.cpp --- a/webengine/wrtharvester/src/wrtusbhandler.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/webengine/wrtharvester/src/wrtusbhandler.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -1,22 +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 the License "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: Handle notifications of MMC events. -* -* -* -*/ +// +// ============================================================================ +// Name : WidgetMMCHandler.cpp +// Part of : SW Installer UIs / WidgetInstallerUI +// +// Description: Handle notifications of MMC events. +// +// +// Version : 3.1 +// +// Copyright © 2006 Nokia Corporation. +// This material, including documentation and any related +// computer programs, is protected by copyright controlled by +// Nokia Corporation. All rights are reserved. Copying, +// including reproducing, storing, adapting or translating, any +// or all of this material requires the prior written consent of +// Nokia Corporation. This material also contains confidential +// information which may not be disclosed to others without the +// prior written consent of Nokia Corporation. +// ============================================================================== +/// +// INCLUDE FILES #include "wrtusbhandler.h" #include "wrtharvester.h" #include "wrtusbhandler.h" @@ -110,10 +114,15 @@ // ============================================================================ void CWrtUsbHandler::RunL() { - if ( iStatus == KErrNone ) - { - DoScanAndUpdate(); - } + TInt status = iStatus.Int(); + + // Restart NotifyChange + Start(); + + if ( status == KErrNone ) + { + DoScanAndUpdate(); + } } void CWrtUsbHandler::DoScanAndUpdate() @@ -128,20 +137,11 @@ } if ( deltaDriveFlags ) - { - //Unpluging USB from Mass storage . . . - if(iHarvester->IsInMSMode() == 1) - { - iHarvester->ClearAllOperations(); - iHarvester->SetRegistryAccess(EFalse); - iFs.NotifyChange( ENotifyDisk, iStatus ); - SetActive(); - return; - } - + { TVolumeInfo volInfo; TInt temp = deltaDriveFlags; TBool massMemAltered = EFalse; + TBool massMemAvailable = EFalse; for(TInt DriveNo = EDriveA+1 ; DriveNo<=EDriveY; DriveNo++ ) { temp = temp >> 1; @@ -152,17 +152,31 @@ if(!err && (status & DriveInfo::EDriveExternallyMountable) && (status & DriveInfo::EDriveInternal )) { //Internal Memory - massMemAltered = ETrue; + massMemAltered = ETrue; + // Check is the internal memory available or not + if(iDriveFlags & (1<SetMSMode(1); - } - } - iFs.NotifyChange( ENotifyDisk, iStatus ); - SetActive(); + if( massMemAltered ) + { + if(!massMemAvailable) + { + // Mass storage is plugged + iHarvester->SetMSMode(1); + } + else + { + // Mass storage was unplugged + if(iHarvester->IsInMSMode() == 1) + { + iHarvester->ClearAllOperations(); + iHarvester->SetRegistryAccess(EFalse); + } + } + } + } } diff -r cb62a4f66ebe -r 6297cdf66332 widgets/group/bld.inf --- a/widgets/group/bld.inf Thu Jan 07 13:31:38 2010 +0200 +++ b/widgets/group/bld.inf Mon Jan 18 21:20:18 2010 +0200 @@ -23,6 +23,9 @@ #include "../widgetinstaller/group/bld.inf" #include "../widgetlauncher/group/bld.inf" #include "../widgetapp/group/bld.inf" +#ifdef APP_SID_CHECK_SUPPORT_FF +#include "../widgetsidchecker/group/bld.inf" +#endif #ifdef RD_WIDGET_PREINSTALLER #include "../widgetpreinstaller/group/bld.inf" #include "../widgetstartup/group/bld.inf" diff -r cb62a4f66ebe -r 6297cdf66332 widgets/widgetapp/inc/WidgetUiNetworkListener.h --- a/widgets/widgetapp/inc/WidgetUiNetworkListener.h Thu Jan 07 13:31:38 2010 +0200 +++ b/widgets/widgetapp/inc/WidgetUiNetworkListener.h Mon Jan 18 21:20:18 2010 +0200 @@ -1,20 +1,22 @@ -/* -* 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 the License "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: -* -*/ - +// +//============================================================================== +// Name : WidgetUiNetworkListener.h +// Part of : WidgetUI +// Interface : +// Description : +// Version : %version: 5.1.1.3.3 % +// +// Copyright 2008, 2009 Nokia Corporation. +// This material, including documentation and any related +// computer programs, is protected by copyright controlled by +// Nokia Corporation. All rights are reserved. Copying, +// including reproducing, storing, adapting or translating, any +// or all of this material requires the prior written consent of +// Nokia Corporation. This material also contains confidential +// information which may not be disclosed to others without the +// prior written consent of Nokia Corporation. +//============================================================================== +// #ifndef WIDGETUINETWORKLISTENER_H_ #define WIDGETUINETWORKLISTENER_H_ diff -r cb62a4f66ebe -r 6297cdf66332 widgets/widgetapp/src/WidgetUiNetworkListener.cpp --- a/widgets/widgetapp/src/WidgetUiNetworkListener.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/widgets/widgetapp/src/WidgetUiNetworkListener.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -1,20 +1,22 @@ -/* -* 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 the License "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: -* -*/ - +// +//============================================================================== +// Name : WidgetUiNetworkListener.cpp +// Part of : WidgetUI +// Interface : +// Description : +// Version : %version: 5.1.1.3.3 % +// +// Copyright 2008, 2009 Nokia Corporation. +// This material, including documentation and any related +// computer programs, is protected by copyright controlled by +// Nokia Corporation. All rights are reserved. Copying, +// including reproducing, storing, adapting or translating, any +// or all of this material requires the prior written consent of +// Nokia Corporation. This material also contains confidential +// information which may not be disclosed to others without the +// prior written consent of Nokia Corporation. +//============================================================================== +// #include "WidgetUiNetworkListener.h" diff -r cb62a4f66ebe -r 6297cdf66332 widgets/widgetapp/src/WidgetUiWindow.cpp --- a/widgets/widgetapp/src/WidgetUiWindow.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/widgets/widgetapp/src/WidgetUiWindow.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -581,7 +581,17 @@ // reset the Right Softkey TRAP_IGNORE(iWidgetUiObserver->UpdateSoftkeyL(EKeyRight,KNullDesC,KDummyCommand,EChangeReasonLoad)); } - + if (iLeftSoftKeyLabel) + { + // restore the Left Softkey + TRAP_IGNORE(iWidgetUiObserver->UpdateSoftkeyL(EKeyLeft,*iLeftSoftKeyLabel,KDummyCommand,EChangeReasonLoad)); + } + else + { + // reset the Left Softkey + TRAP_IGNORE(iWidgetUiObserver->UpdateSoftkeyL(EKeyLeft,KNullDesC,KDummyCommand,EChangeReasonLoad)); + } + // restore state if ( !showSoftkeys ) { diff -r cb62a4f66ebe -r 6297cdf66332 widgets/widgetapp/src/WidgetUiWindowManager.cpp --- a/widgets/widgetapp/src/WidgetUiWindowManager.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/widgets/widgetapp/src/WidgetUiWindowManager.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -620,6 +620,7 @@ TBool CWidgetUiWindowManager::RemoveFromWindowList( CWidgetUiWindow* aWidgetWindow ) { __ASSERT_DEBUG( aWidgetWindow, User::Invariant() ); + TBool count(EFalse); if ( iDialogsProvider->IsDialogLaunched() ) { return EFalse; @@ -661,9 +662,27 @@ else { if(aWidgetWindow->CanBeDeleted()) + { + for ( TInt i = 0; i < iWindowList.Count(); ++i ) + { + CWidgetUiWindow* window( iWindowList[i] ); + if(window->WidgetMiniViewState() == EMiniViewEnabled || window->WidgetMiniViewState() == EMiniViewNotEnabled) + { + count = ETrue; + break; + } + } + if(!count && iNetworkMode == EOfflineMode){ + aWidgetWindow->Engine()->HandleCommandL( + (TInt)TBrCtlDefs::ECommandIdBase + + (TInt)TBrCtlDefs::ECommandDisconnect ); + iConnection->StopConnectionL(); + } delete aWidgetWindow; + } + return EFalse; } - return EFalse; + } // ============================================================================= diff -r cb62a4f66ebe -r 6297cdf66332 widgets/widgetapp/src/WidgetUiWindowView.cpp --- a/widgets/widgetapp/src/WidgetUiWindowView.cpp Thu Jan 07 13:31:38 2010 +0200 +++ b/widgets/widgetapp/src/WidgetUiWindowView.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -229,6 +229,18 @@ { if (!iWindowManager.ActiveWindow()) return; + #ifdef RD_SCALABLE_UI_V2 + if (PenEnabled()&&(Layout_Meta_Data::IsLandscapeOrientation())&& IsEditMode()) + { + TInt newResId = Cba()->IsVisible() ? + R_AVKON_WIDESCREEN_PANE_LAYOUT_USUAL_FLAT : + R_AVKON_WIDESCREEN_PANE_LAYOUT_USUAL_FLAT_NO_SOFTKEYS; + + StatusPane()->SwitchLayoutL(newResId); + StatusPane()->ApplyCurrentSettingsL(); + StatusPane()->MakeVisible(ETrue); + } + #endif CBrCtlInterface* engine = iWindowManager.ActiveWindow()->Engine(); if( engine && (aResourceId == R_WIDGETUI_MENU || aResourceId >= R_CASCADE_MENU_1) ) { @@ -306,7 +318,7 @@ if (resId != newResId) { StatusPane()->SwitchLayoutL(newResId); - } + } } else //Portrait { diff -r cb62a4f66ebe -r 6297cdf66332 widgets/widgetinstaller/group/bld.inf --- a/widgets/widgetinstaller/group/bld.inf Thu Jan 07 13:31:38 2010 +0200 +++ b/widgets/widgetinstaller/group/bld.inf Mon Jan 18 21:20:18 2010 +0200 @@ -33,4 +33,4 @@ ../conf/widgetinstaller_1028281F.crml MW_LAYER_CRML(widgetinstaller_1028281F.crml) PRJ_MMPFILES -WidgetInstallerUI.mmp \ No newline at end of file +WidgetInstallerUI.mmp diff -r cb62a4f66ebe -r 6297cdf66332 widgets/widgetlauncher/group/bld.inf --- a/widgets/widgetlauncher/group/bld.inf Thu Jan 07 13:31:38 2010 +0200 +++ b/widgets/widgetlauncher/group/bld.inf Mon Jan 18 21:20:18 2010 +0200 @@ -23,4 +23,4 @@ // If EKA2 Kernel Architecture is supported, assume S60 3rd Edition Platform PRJ_MMPFILES -WidgetLauncher.mmp \ No newline at end of file +WidgetLauncher.mmp diff -r cb62a4f66ebe -r 6297cdf66332 widgets/widgetrecognizer/group/bld.inf --- a/widgets/widgetrecognizer/group/bld.inf Thu Jan 07 13:31:38 2010 +0200 +++ b/widgets/widgetrecognizer/group/bld.inf Mon Jan 18 21:20:18 2010 +0200 @@ -22,4 +22,4 @@ PRJ_EXPORTS PRJ_MMPFILES -WidgetRecognizer.mmp \ No newline at end of file +WidgetRecognizer.mmp diff -r cb62a4f66ebe -r 6297cdf66332 widgets/widgetsidchecker/data/10281FC0.rss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/widgets/widgetsidchecker/data/10281FC0.rss Mon Jan 18 21:20:18 2010 +0200 @@ -0,0 +1,41 @@ +/* +* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of the License "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: ECOM registration for widgetsidchecking +* +*/ + +#include "registryinfo.rh" + +RESOURCE REGISTRY_INFO r_registry + { + dll_uid = 0x10281FC0; // must match the name of this file + interfaces = + { + INTERFACE_INFO + { + interface_uid = 0x20007D8C; + implementations = + { + IMPLEMENTATION_INFO + { + implementation_uid = 0x10281FC0; + version_no = 1; + display_name = "WidgetVerify"; + default_data = "[10282821]"; + opaque_data = ""; + } + }; + } + }; + } diff -r cb62a4f66ebe -r 6297cdf66332 widgets/widgetsidchecker/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/widgets/widgetsidchecker/group/bld.inf Mon Jan 18 21:20:18 2010 +0200 @@ -0,0 +1,32 @@ +/* +* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of the License "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 Active Space Operator Harvesting Plugin +* +*/ + +//#ifdef __PLATFORM_VERSION_52__ + +#include +#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh" + +#ifdef APP_SID_CHECK_SUPPORT_FF +PRJ_PLATFORMS +DEFAULT + +PRJ_EXPORTS +../rom/widgetsidchecker.iby CORE_MW_LAYER_IBY_EXPORT_PATH(widgetsidchecker.iby) + +PRJ_MMPFILES +widgetsidchecker.mmp +#endif diff -r cb62a4f66ebe -r 6297cdf66332 widgets/widgetsidchecker/group/widgetsidchecker.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/widgets/widgetsidchecker/group/widgetsidchecker.mmp Mon Jan 18 21:20:18 2010 +0200 @@ -0,0 +1,37 @@ +/* +* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of the License "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 for widgetsidchecker +* +*/ +TARGET widgetsidchecker.dll +CAPABILITY All -Tcb +TARGETTYPE plugin + +UID 0x10009d8d 0x10281FC0 + + +SOURCEPATH ../src +SOURCE widgetsidchecker.cpp + +USERINCLUDE ../inc + +SYSTEMINCLUDE /epoc32/include /epoc32/include/ecom /epoc32/include/platform/mw +START RESOURCE ../data/10281FC0.rss +target widgetsidchecker.rsc +end + +LIBRARY euser.lib aplist.lib ecom.lib efsrv.lib +LIBRARY ws32.lib apparc.lib +library apgrfx.lib +LIBRARY WidgetRegistryClient.lib diff -r cb62a4f66ebe -r 6297cdf66332 widgets/widgetsidchecker/inc/widgetsidchecker.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/widgets/widgetsidchecker/inc/widgetsidchecker.h Mon Jan 18 21:20:18 2010 +0200 @@ -0,0 +1,42 @@ +/* +* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of the License "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: +* +*/ +#ifndef __WIDGETSIDCHECKER_H__ +#define __WIDGETSIDCHECKER_H__ + +#include +#include + +class RWidgetRegistryClientSession; + +NONSHARABLE_CLASS(CWidgetSidChecker) : public CAppSidChecker + { +public: + static CWidgetSidChecker* NewL(); + ~CWidgetSidChecker(); + +public: + virtual TBool AppRegisteredAt(const TUid& aSid, TDriveUnit aDrive); + virtual void SetRescanCallBackL(const TCallBack &aCallback); + +private: + CWidgetSidChecker(); + TBool AppRegisteredAtL(TUid aSid ); + RWidgetRegistryClientSession iClientSession; + }; + +#endif + diff -r cb62a4f66ebe -r 6297cdf66332 widgets/widgetsidchecker/rom/widgetsidchecker.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/widgets/widgetsidchecker/rom/widgetsidchecker.iby Mon Jan 18 21:20:18 2010 +0200 @@ -0,0 +1,18 @@ +/* +* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of the License "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: IBY file +* +*/ + +ECOM_PLUGIN(widgetsidchecker.dll,10281FC0.rsc) \ No newline at end of file diff -r cb62a4f66ebe -r 6297cdf66332 widgets/widgetsidchecker/src/widgetsidchecker.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/widgets/widgetsidchecker/src/widgetsidchecker.cpp Mon Jan 18 21:20:18 2010 +0200 @@ -0,0 +1,109 @@ +/* +* Copyright (c) 2007, 2008 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of the License "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: +* +*/ +#include "widgetsidchecker.h" + +#include +#include +#include +#include +#include +#include +//#include +#include + +//WidgetRegistry.EXE[10282f06]0001 +//const TUid KWidgetRegistry = { 0x10282F06 }; +//0x10282F06 +//hb +//#include +////////////////////////////// +// ECOM Implementation Table +////////////////////////////// + + +TBool E32Dll() + { + return (ETrue); + } + +const TImplementationProxy ImplementationTable[] = + { + IMPLEMENTATION_PROXY_ENTRY(0x10281FC0, CWidgetSidChecker::NewL) + }; + +EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount) + { + aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy); + return ImplementationTable; + } + +////////////////////////////// +// CWidgetSidChecker +////////////////////////////// + +CWidgetSidChecker* CWidgetSidChecker::NewL() + { + CWidgetSidChecker* self = new(ELeave) CWidgetSidChecker(); + return self; + } + + CWidgetSidChecker::CWidgetSidChecker() + { + } + + +CWidgetSidChecker::~CWidgetSidChecker() + { + iClientSession.Close(); + } + +TBool CWidgetSidChecker::AppRegisteredAt(const TUid& aSid, TDriveUnit /*aDrive*/) + { + TFindProcess findProcess (_L("widgetregistry*")); + TFullName result; + if(findProcess.Next(result) == KErrNone ) + { + TBool res = AppRegisteredAtL(aSid); + return res; + } + return EFalse; + } + + +TBool CWidgetSidChecker::AppRegisteredAtL( TUid aSid ) + { + TBuf aWidgetBundleId; + TBool res = EFalse; + + User::LeaveIfError( iClientSession.Connect() ); + iClientSession.GetWidgetBundleId(aSid, aWidgetBundleId); + //check if the widget exists by querying to WidgetRegisrty return ETrue if exists else return EFalse + if(iClientSession.WidgetExistsL( aWidgetBundleId ) ) + res = ETrue; + else + res = EFalse; + + iClientSession.Disconnect(); + return res; + } + +void CWidgetSidChecker::SetRescanCallBackL(const TCallBack &/*aCallBack*/) + { + return; + } + +// End of file