| author | William Roberts <williamr@symbian.org> |
| Thu, 22 Jul 2010 16:44:19 +0100 | |
| branch | GCC_SURGE |
| changeset 88 | cb5ac135d1df |
| parent 82 | 1c386166cb87 (diff) |
| parent 87 | a1c10d5ad3d9 (current diff) |
| child 89 | 184e728497f3 |
--- a/browserutilities/browsertelservice/group/BrowserTelService.mmp Mon Jul 19 16:50:41 2010 +0100 +++ b/browserutilities/browsertelservice/group/BrowserTelService.mmp Thu Jul 22 16:44:19 2010 +0100 @@ -96,7 +96,7 @@ LIBRARY estor.lib // RWriteStream, RFileBuf LIBRARY Centralrepository.lib -#if defined(ARMCC) +#if defined(EABI) DEFFILE ../EABI/BROWSERTELSERVICEU_EKA2.def #elif defined( WINSCW ) DEFFILE ../BWinsCw/BROWSERTELSERVICEU_EKA2.def
--- a/browserutilities/connectionmanager/Group/ConnectionManager.mmp Mon Jul 19 16:50:41 2010 +0100 +++ b/browserutilities/connectionmanager/Group/ConnectionManager.mmp Thu Jul 22 16:44:19 2010 +0100 @@ -79,7 +79,7 @@ LIBRARY cmmanager.lib DEBUGLIBRARY flogger.lib -#if defined(ARMCC) +#if defined(EABI) DEFFILE ../EABI/CONNECTIONMANAGERU_EKA2.def #else DEFFILE ../BWinsCw/CONNECTIONMANAGERU_EKA2.def
--- a/browserutilities/cxmllibrary/group/cXmlParser.mmp Mon Jul 19 16:50:41 2010 +0100 +++ b/browserutilities/cxmllibrary/group/cXmlParser.mmp Thu Jul 22 16:44:19 2010 +0100 @@ -20,10 +20,9 @@ TARGET cXmlParser.dll TARGETTYPE dll - +UID 0x1000008D 0x101F8710 -#if defined(ARMCC) -UID 0x1000008D 0x101F8710 +#if defined(EABI) deffile eabi/CXMLPARSER.DEF #elif defined( WINSCW ) deffile BWINSCW/CXMLPARSER.DEF
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/group/DownloadMgrClntSrv.mmp Mon Jul 19 16:50:41 2010 +0100 +++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/group/DownloadMgrClntSrv.mmp Thu Jul 22 16:44:19 2010 +0100 @@ -27,7 +27,7 @@ //MACRO _DEBUG //#define _DEBUG -#if defined(ARMCC) +#if defined(EABI) DEFFILE ../EABI/DOWNLOADMGRU_EKA2.def #else DEFFILE ../BWinsCw/DOWNLOADMGRU_EKA2.def
--- a/browserutilities/downloadmgr/DownloadMgrServEng/Group/HttpDMServEng.mmp Mon Jul 19 16:50:41 2010 +0100 +++ b/browserutilities/downloadmgr/DownloadMgrServEng/Group/HttpDMServEng.mmp Thu Jul 22 16:44:19 2010 +0100 @@ -31,7 +31,7 @@ //MACRO _DEBUG //#define _DEBUG -#if defined(ARMCC) +#if defined(EABI) DEFFILE ../EABI/HTTPDMSERVENGU_EKA2.def #else DEFFILE ../BWinsCw/HTTPDMSERVENGU_EKA2.def
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Group/DownloadMgrUiLib.mmp Mon Jul 19 16:50:41 2010 +0100 +++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Group/DownloadMgrUiLib.mmp Thu Jul 22 16:44:19 2010 +0100 @@ -43,7 +43,7 @@ END // RESOURCE -#if defined(ARMCC) +#if defined(EABI) DEFFILE ../EABI/DOWNLOADMGRUILIBU_EKA2.def #elif defined( WINSCW ) DEFFILE ../BWinsCw/DOWNLOADMGRUILIBU_EKA2.def
--- a/browserutilities/favouritesengine/ClientServer/group/FavouritesEngine.mmp Mon Jul 19 16:50:41 2010 +0100 +++ b/browserutilities/favouritesengine/ClientServer/group/FavouritesEngine.mmp Thu Jul 22 16:44:19 2010 +0100 @@ -85,7 +85,7 @@ DEBUGLIBRARY flogger.lib -#if defined(ARMCC) +#if defined(EABI) DEFFILE ../EABI/FavouritesEngine.DEF #elif defined( WINSCW ) DEFFILE ../BWinsCw/FAVOURITESENGINE.def
--- a/browserutilities/feedsengine/FeedsServer/Api/group/FeedsServerApi.mmp Mon Jul 19 16:50:41 2010 +0100 +++ b/browserutilities/feedsengine/FeedsServer/Api/group/FeedsServerApi.mmp Thu Jul 22 16:44:19 2010 +0100 @@ -29,7 +29,7 @@ #if defined(WINSCW) deffile Bwinscw/FeedsServerApi.def -#elif defined(ARMCC) +#elif defined(EABI) deffile EABI/FeedsServerApi.def #endif
--- a/browserutilities/feedsengine/group/FeedsServerClient.mmp Mon Jul 19 16:50:41 2010 +0100 +++ b/browserutilities/feedsengine/group/FeedsServerClient.mmp Thu Jul 22 16:44:19 2010 +0100 @@ -29,7 +29,7 @@ #if defined(WINSCW) deffile Bwinscw/FeedsServerClient.def -#elif defined(ARMCC) +#elif defined(EABI) deffile EABI/FeedsServerClient.def #endif
--- a/browserutilities/multipartparser/group/MultipartParser.mmp Mon Jul 19 16:50:41 2010 +0100 +++ b/browserutilities/multipartparser/group/MultipartParser.mmp Thu Jul 22 16:44:19 2010 +0100 @@ -27,7 +27,7 @@ CAPABILITY CAP_GENERAL_DLL VENDORID VID_DEFAULT -#if defined(ARMCC) +#if defined(EABI) deffile EABI/MULTIPARTPARSER.DEF #elif defined( WINSCW ) deffile Bwinscw/MULTIPARTPARSER.DEF
--- a/browserutilities/recenturlstore/group/RecentUrlStore.mmp Mon Jul 19 16:50:41 2010 +0100 +++ b/browserutilities/recenturlstore/group/RecentUrlStore.mmp Thu Jul 22 16:44:19 2010 +0100 @@ -26,7 +26,7 @@ CAPABILITY CAP_GENERAL_DLL EPOCALLOWDLLDATA -#if defined(ARMCC) +#if defined(EABI) DEFFILE ../EABI/RecentUrlStore.def #elif defined( WINSCW ) DEFFILE ../BWINSCW/RecentUrlStore.def
--- a/browserutilities/webutils/group/webutils.mmp Mon Jul 19 16:50:41 2010 +0100 +++ b/browserutilities/webutils/group/webutils.mmp Thu Jul 22 16:44:19 2010 +0100 @@ -61,7 +61,7 @@ #endif -#if defined(ARMCC) +#if defined(EABI) DEFFILE ../EABI/WebUtils_EKA2.DEF #elif defined( WINSCW ) DEFFILE ../BWINSCW/WEBUTILS_EKA2.DEF
--- a/browserutilities/xmlparser/group/XMLInterface.mmp Mon Jul 19 16:50:41 2010 +0100 +++ b/browserutilities/xmlparser/group/XMLInterface.mmp Thu Jul 22 16:44:19 2010 +0100 @@ -25,7 +25,7 @@ VENDORID VID_DEFAULT -#if defined(ARMCC) +#if defined(EABI) DEFFILE ../eabi/xmlinterface.def #elif defined(WINSCW) DEFFILE ../bwinscw/xmlinterface.def
--- a/web_pub/browser_plugin_api/inc/npapi.h Mon Jul 19 16:50:41 2010 +0100 +++ b/web_pub/browser_plugin_api/inc/npapi.h Thu Jul 22 16:44:19 2010 +0100 @@ -436,7 +436,7 @@ } NPN_GenericParam(const TDesC& aStrValue) - :strValue(aStrValue) + :strValue(&aStrValue) { } @@ -448,7 +448,7 @@ } int intValue; bool boolValue; - const TDesC& strValue; + const TDesC* strValue; void* voidValue; };
--- a/webengine/device/group/Device.mmp Mon Jul 19 16:50:41 2010 +0100 +++ b/webengine/device/group/Device.mmp Thu Jul 22 16:44:19 2010 +0100 @@ -45,7 +45,7 @@ #if defined(WINSCW) deffile ../BWINSCW/Device.def -#elif defined(ARMCC) +#elif defined(EABI) deffile ../EABI/Device.def #endif
--- a/webengine/osswebengine/JavaScriptCore/wtf/FastMalloc.h Mon Jul 19 16:50:41 2010 +0100 +++ b/webengine/osswebengine/JavaScriptCore/wtf/FastMalloc.h Thu Jul 22 16:44:19 2010 +0100 @@ -34,7 +34,7 @@ IMPORT void fastFree(void* p); IMPORT void *fastRealloc(void* p, size_t n); -#ifndef NDEBUG +#ifndef NDEBUG void fastMallocForbid(); void fastMallocAllow(); #endif @@ -46,7 +46,7 @@ using WTF::fastRealloc; using WTF::fastFree; -#ifndef NDEBUG +#ifndef NDEBUG using WTF::fastMallocForbid; using WTF::fastMallocAllow; #endif @@ -62,9 +62,9 @@ #ifndef _CRTDBG_MAP_ALLOC #if PLATFORM(SYMBIAN) -WTF_PRIVATE_INLINE void* operator new(size_t s) { return fastMalloc(s); } +WTF_PRIVATE_INLINE void* operator new(size_t s) __NO_THROW { return fastMalloc(s); } WTF_PRIVATE_INLINE void operator delete(void* p) __NO_THROW { fastFree(p); } -WTF_PRIVATE_INLINE void* operator new[](size_t s) { return fastMalloc(s); } +WTF_PRIVATE_INLINE void* operator new[](size_t s) __NO_THROW { return fastMalloc(s); } WTF_PRIVATE_INLINE void operator delete[](void* p) __NO_THROW { fastFree(p); } #else #if !defined(USE_SYSTEM_MALLOC) || !(USE_SYSTEM_MALLOC)
--- a/webengine/osswebengine/JavaScriptCore/wtf/symbian/snprintf.c Mon Jul 19 16:50:41 2010 +0100 +++ b/webengine/osswebengine/JavaScriptCore/wtf/symbian/snprintf.c Thu Jul 22 16:44:19 2010 +0100 @@ -153,8 +153,8 @@ } PrintfArgValue; -void flushbuffer(PrintfTarget *target); -int dopr(PrintfTarget *target, const char *format, va_list args); +static void flushbuffer(PrintfTarget *target); +static int dopr(PrintfTarget *target, const char *format, va_list args); EXPORT_C int
--- a/webengine/osswebengine/WebCore/platform/PlatformKeyboardEvent.h Mon Jul 19 16:50:41 2010 +0100 +++ b/webengine/osswebengine/WebCore/platform/PlatformKeyboardEvent.h Thu Jul 22 16:44:19 2010 +0100 @@ -20,7 +20,7 @@ * 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. + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef PlatformKeyboardEvent_h @@ -61,7 +61,7 @@ public: #if PLATFORM(SYMBIAN) String text() const; -#elif +#else String text() const { return m_text; } #endif //PLATFORM(SYMBIAN) String unmodifiedText() const { return m_unmodifiedText; } @@ -123,7 +123,7 @@ #endif #if PLATFORM(SYMBIAN) - TKeyEvent m_symbianEvent; + TKeyEvent m_symbianEvent; #endif };
--- a/webengine/osswebengine/WebCore/platform/graphics/symbian/ImageSymbian.cpp Mon Jul 19 16:50:41 2010 +0100 +++ b/webengine/osswebengine/WebCore/platform/graphics/symbian/ImageSymbian.cpp Thu Jul 22 16:44:19 2010 +0100 @@ -53,11 +53,7 @@ #include <AknsConstants.h> #include <eikenv.h> -#ifdef __GCCE__ -#include <WebKitIcons_gcce.mbg> -#else #include <WebKitIcons.mbg> -#endif namespace WebCore { @@ -101,7 +97,7 @@ } BitmapImage::BitmapImage(CMaskedBitmap* bitmap) - : m_currentFrame(0) + : m_currentFrame(0) , m_frameTimer(0) , m_repetitionCount(0) , m_repetitionsComplete(0) @@ -151,7 +147,7 @@ void BitmapImage::destroyDecodedData(bool) { - // Destroy the cached images and release them, + // Destroy the cached images and release them, // only cache one image in Symbian port. if (m_frames.size()) { m_frames.last().clear(); @@ -170,18 +166,18 @@ void BitmapImage::setMimeType(const String& mimeType) { - m_source.setMimeType(mimeType); + m_source.setMimeType(mimeType); } const String& BitmapImage::getMimeType() { - return m_source.getMimeType(); + return m_source.getMimeType(); } bool BitmapImage::dataChanged(bool allDataReceived) { destroyDecodedData(true); - + // Feed all the data we've seen so far to the image decoder. m_allDataReceived = allDataReceived; TRAPD(oomErr, m_source.setDataL(m_data.get(), allDataReceived)); @@ -284,7 +280,7 @@ return; m_currentFrame++; - m_repetitionCount = m_source.decoder()->getLoopCount(); + m_repetitionCount = m_source.decoder()->getLoopCount(); if(m_repetitionCount == -1) m_repetitionCount++; if (m_currentFrame >= frameCount()) { m_repetitionsComplete += 1; @@ -446,14 +442,14 @@ const FloatPoint& phase, CompositeOperator, const FloatRect& dstRect) { WebCoreGraphicsContext* context = ctxt->platformContext(); - + CMaskedBitmap* bm = frameAtIndex(m_currentFrame); - if(!bm || bm->IsFullyTransparent()) + if(!bm || bm->IsFullyTransparent()) return; IntSize intrinsicImageSize = size(); TSize scaledSize( xForm(TSize(srcRect.width(), srcRect.height())) ); - + scaledSize.iWidth = scaledSize.iWidth < 1 ? 1 : scaledSize.iWidth; scaledSize.iHeight = scaledSize.iHeight < 1 ? 1 : scaledSize.iHeight; @@ -464,7 +460,7 @@ if ( bm->SizeInPixels() == TSize(1,1) && !bm->HasMask() ) { checkForSolidColor(); } - + CFbsBitmap* dstBmp = context->contentBuffer(); if (dstBmp != NULL) { @@ -481,9 +477,9 @@ // start point in source image TPoint point( xForm(TPoint(phase.x(), phase.y())) ); TPoint off( point.iX%scaledSize.iWidth, point.iY%scaledSize.iHeight ); - off = TPoint( off.iX < 0 ? off.iX + scaledSize.iWidth : off.iX, + off = TPoint( off.iX < 0 ? off.iX + scaledSize.iWidth : off.iX, off.iY < 0 ? off.iY + scaledSize.iHeight : off.iY ); - + // transform coordinates to bitmap space TRect bmpRect( clip ); TPoint orig( context->origin() ); @@ -517,12 +513,12 @@ void BitmapImage::checkForSolidColor() { if ( m_source.decoder()->decodeInProgress() || m_isSolidColor ) return; - + CMaskedBitmap* bm = frameAtIndex(m_currentFrame); - - if(!bm) + + if(!bm) return; - + if ( frameCount() == 1 ) { TRgb bgColor; bm->Bitmap().GetPixel(bgColor, bm->SizeInPixels().AsPoint() );
--- a/webengine/osswebengine/WebCore/platform/symbian/FormFillController.cpp Mon Jul 19 16:50:41 2010 +0100 +++ b/webengine/osswebengine/WebCore/platform/symbian/FormFillController.cpp Thu Jul 22 16:44:19 2010 +0100 @@ -11,7 +11,7 @@ * * Contributors: * -* Description: +* Description: * */ @@ -40,7 +40,7 @@ static const double kSearchStartTimeout = 0.5f; -FormFillController::FormFillController() +FormFillController::FormFillController() : m_popup(0), m_callback(0), m_inputElement(0), m_formDB(0), m_passwdDB(0) { m_searchTimer = new Timer<FormFillController>(this, &FormFillController::fireSearch); @@ -100,7 +100,7 @@ m_popup->invalidate(); } else if(m_popup) { m_popup->clear(); - } + } } void FormFillController::setInputElement(MFormFillCallback* callback, HTMLInputElement* input) @@ -108,7 +108,7 @@ clearInputElement(); m_inputElement = input; m_callback = callback; - + startSearch(m_inputElement->name(), m_inputElement->value() ); } @@ -176,7 +176,7 @@ } void FormFillController::fillPasswordIfExists(HTMLInputElement* uNode) -{ +{ HTMLFormElement* form = uNode->form(); if (!m_passwdDB) m_passwdDB = new FormLoginStore(); @@ -188,7 +188,7 @@ // search if we have already stored the password String passwdValue; String realm = passwdRealm(uNode->document()->URL()); - if (!realm.isEmpty() && m_passwdDB->search(realm, uNode->name(), + if (!realm.isEmpty() && m_passwdDB->search(realm, uNode->name(), uNode->value(), passwd->name(), passwdValue)) { passwd->setValue(passwdValue); } @@ -216,14 +216,14 @@ if (current->hasTagName(HTMLNames::inputTag)) { HTMLInputElement* input = static_cast<HTMLInputElement*>(current); if (input->inputType() == HTMLInputElement::TEXT) { - if (input->autoComplete()) { - - bool ignorefield = false; + if (input->autoComplete()) { + + bool ignorefield = false; // find the matching password and save login data int passwdFields = 0; HTMLInputElement* passwd = NULL; - if (passwdFillEnabled) + if (passwdFillEnabled) passwd = searchPasswordFields(form, input, passwdFields); String realm = passwdRealm(input->document()->URL()); if (passwdFields == 1) { @@ -256,12 +256,12 @@ m_passwdDB->commit(); ignorefield = true; } else if (!ignorefield) { - // don't save this time, should delete previously-save + // don't save this time, should delete previously-save m_passwdDB->removePartial(realm, input->name(), input->value(), passwd->name()); m_passwdDB->commit(); - } + } - + } else if (passwdFields > 1) { // most likely this is a password change form, need to purge @@ -275,7 +275,7 @@ insertInputNameAndValue(input->name(), input->value()); } } - } + } } } @@ -297,7 +297,7 @@ continue; } else if (usernameIdx != -1 && input->inputType() == HTMLInputElement::TEXT) { - // current element is a text input element positioning between uNode and + // current element is a text input element positioning between uNode and // any possible successing password field. So uNode can't be a // usename field. break; @@ -314,7 +314,7 @@ } } } - + return passwd; }
--- a/webengine/osswebengine/WebKit/s60/group/JavaScriptCore/JavaScriptCore.mmp Mon Jul 19 16:50:41 2010 +0100 +++ b/webengine/osswebengine/WebKit/s60/group/JavaScriptCore/JavaScriptCore.mmp Thu Jul 22 16:44:19 2010 +0100 @@ -35,12 +35,12 @@ EPOCHEAPSIZE 0x5000 0x1000000 #if defined(__S60_32__) -#if defined(ARMCC) +#if defined(EABI) deffile ../EABI/JavaScriptCore_3_2.def #elif defined( WINSCW ) deffile ../Bwinscw/JavaScriptCore_3_2.def #endif -#elif defined(ARMCC) +#elif defined(EABI) deffile ../eabi/JavaScriptCore.def #elif defined( WINSCW ) deffile ../bwinscw/JavaScriptCore.def
--- a/webengine/osswebengine/WebKit/s60/group/browserengine/browserengine.mmp Mon Jul 19 16:50:41 2010 +0100 +++ b/webengine/osswebengine/WebKit/s60/group/browserengine/browserengine.mmp Thu Jul 22 16:44:19 2010 +0100 @@ -28,7 +28,7 @@ #if defined(WINSCW) deffile ../bwinscw/browserengine.def -#elif defined(ARMCC) +#elif defined(EABI) deffile ../eabi/browserengine.def #endif
--- a/webengine/osswebengine/WebKit/s60/plugins/NpnImplementation.cpp Mon Jul 19 16:50:41 2010 +0100 +++ b/webengine/osswebengine/WebKit/s60/plugins/NpnImplementation.cpp Thu Jul 22 16:44:19 2010 +0100 @@ -40,18 +40,18 @@ const TDesC* aWindowType, const TDesC& aBuf, TBool aFromFile, TBool aNotify, void* aNotifyData) { - + PluginWin* pluginWin = (PluginWin* )aInstance->ndata; if ( !pluginWin ) { return NPERR_INVALID_INSTANCE_ERROR; } TInt status = KErrNone; - + // Make the load request // convert to 8 bit HBufC8* url = HBufC8::NewLC(aUrl.Length()); - url->Des().Copy(aUrl); + url->Des().Copy(aUrl); if (aMethod==EUrlGet) { TRAP_IGNORE(status = pluginWin->pluginSkin()->getRequestL(*url, aNotify, aNotifyData, aWindowType)); } @@ -72,7 +72,7 @@ default: return NPERR_GENERIC_ERROR; } - + } // ----------------------------------------------------------------------------- @@ -161,7 +161,7 @@ // void NpnStatus(NPP aInstance, const TDesC& aMessage) { - // This function is not supported. + // This function is not supported. } // ----------------------------------------------------------------------------- @@ -172,7 +172,7 @@ // const TDesC* NpnUAgent(NPP /*aInstance*/) { - // Get User Agent String + // Get User Agent String CUserAgent* usrAgnt = CUserAgent::NewL(); CleanupStack::PushL( usrAgnt ); @@ -185,7 +185,7 @@ CleanupStack::PopAndDestroy(2); - return userAgent; + return userAgent; } // ----------------------------------------------------------------------------- @@ -199,7 +199,7 @@ if (aSize) { return User::Alloc(aSize); } - + return NULL; } @@ -275,7 +275,7 @@ TPtrC nullPtr(NULL, 0); return NpnUrlLoader(aInstance, aUrl, EUrlGet, aWindowType, nullPtr, EFalse, ETrue, aNotifyData); - + } // ----------------------------------------------------------------------------- @@ -302,15 +302,15 @@ NPError NpnGetValue(NPP aInstance, NPNVariable aVariable, void *aRetValue) { TInt err = NPERR_NO_ERROR; - + switch (aVariable) { - + case NPNVjavascriptEnabledBool: // Tells whether JavaScript is enabled; true=JavaScript enabled, false=not enabled // NEEDS IMPLEMENTATION // *((TBool*) aRetValue) = NW_Settings_GetEcmaScriptEnabled(); break; - case NPNVnetscapeWindow: { + case NPNVnetscapeWindow: { PluginWin* pluginWin = (PluginWin*)aInstance->ndata; if (pluginWin) { @@ -323,24 +323,24 @@ npWindow->height = rect.Height(); npWindow->type = pluginWin->Windowed() ? NPWindowTypeWindow : NPWindowTypeDrawable; npWindow->window = pluginWin->Windowed() ? NULL : (MPluginAdapter*) pluginWin; - + NPRect clipRect = {0,0,0,0}; npWindow->clipRect = clipRect; } } break; - + case NPNVPluginElementNPObject: { PluginWin* pluginWin = (PluginWin*)aInstance->ndata; WebCore::Element* pluginElement; if (pluginWin) { pluginElement = pluginWin->pluginSkin()->getElement(); } - + NPObject* pluginScriptObject = 0; if (pluginElement->hasTagName(appletTag) || pluginElement->hasTagName(embedTag) || pluginElement->hasTagName(objectTag)) pluginScriptObject = static_cast<WebCore::HTMLPlugInElement*>(pluginElement)->getNPObject(); - + if (pluginScriptObject) _NPN_RetainObject(pluginScriptObject); @@ -348,7 +348,7 @@ *v = pluginScriptObject; } break; - + case NPNVWindowNPObject: { PluginWin* pluginWin = (PluginWin*)aInstance->ndata; NPObject* windowObject = pluginWin->windowScriptNPObject(); @@ -368,17 +368,18 @@ // true=SmartUpdate enabled, false=not enabled case NPNVisOfflineBool: // Tells whether offline mode is enabled; // true=offline mode enabled, false=not enabled - - case NPNNetworkAccess: + + case NPNNetworkAccess: { PluginWin* pluginWin = (PluginWin*)aInstance->ndata; TInt apId = -1; if (pluginWin) { apId = pluginWin->pluginSkin()->handleNetworkAccess(); } *((TInt*) aRetValue) = apId; - break; - - case NPNVGenericParameter: { + } + break; + + case NPNVGenericParameter: { PluginWin* pluginWin = (PluginWin*)aInstance->ndata; if (pluginWin) { void **v = (void **)aRetValue; @@ -389,7 +390,7 @@ } } break; // for code consistency - + case NPNVSupportsWindowless:{ PluginWin* pluginWin = (PluginWin*)aInstance->ndata; if (pluginWin) { @@ -399,7 +400,7 @@ err = NPERR_GENERIC_ERROR; } } - break; + break; default: { *((TBool*) aRetValue) = EFalse; @@ -407,7 +408,7 @@ } break; } // end of switch - + return err; } @@ -442,9 +443,9 @@ if (isWindowed) pluginWin->setWindowedPlugin(*isWindowed); } - + } - break; + break; case NPPVpluginTransparentBool: { PluginWin* pluginWin = (PluginWin*)aInstance->ndata; @@ -452,7 +453,7 @@ NPBool* isTransparent = (NPBool*)aSetValue; if (isTransparent) pluginWin->setTransparentPlugin(*isTransparent); - } + } } break; case NPPVPluginFocusPosition: @@ -505,9 +506,9 @@ } default: break; - + } // end of switch - + return NPERR_NO_ERROR; }
--- a/webengine/osswebengine/cache/group/BrowserCache.mmp Mon Jul 19 16:50:41 2010 +0100 +++ b/webengine/osswebengine/cache/group/BrowserCache.mmp Thu Jul 22 16:44:19 2010 +0100 @@ -33,7 +33,7 @@ #if defined(WINSCW) deffile Bwinscw/BrowserCache.def -#elif defined(ARMCC) +#elif defined(EABI) deffile EABI/BrowserCache.def #endif
--- a/webengine/osswebengine/npscript/group/npscript.mmp Mon Jul 19 16:50:41 2010 +0100 +++ b/webengine/osswebengine/npscript/group/npscript.mmp Thu Jul 22 16:44:19 2010 +0100 @@ -30,7 +30,7 @@ #if defined(WINSCW) deffile Bwinscw/npscript.def -#elif defined(ARMCC) +#elif defined(EABI) deffile EABI/npscript.def #endif
--- a/webengine/webkitutils/group/WebKitUtils.mmp Mon Jul 19 16:50:41 2010 +0100 +++ b/webengine/webkitutils/group/WebKitUtils.mmp Thu Jul 22 16:44:19 2010 +0100 @@ -35,7 +35,7 @@ #if defined(WINSCW) deffile Bwinscw/WebKitUtils.def -#elif defined(ARMCC) +#elif defined(EABI) deffile EABI/WebKitUtils.def #endif
--- a/webengine/widgetengine/group/WidgetEngine.mmp Mon Jul 19 16:50:41 2010 +0100 +++ b/webengine/widgetengine/group/WidgetEngine.mmp Thu Jul 22 16:44:19 2010 +0100 @@ -85,7 +85,7 @@ #if defined(WINSCW) deffile ../BWINSCW/WidgetEngine.def -#elif defined(ARMCC) +#elif defined(EABI) deffile ../EABI/WidgetEngine.def #endif
--- a/webengine/widgetinstaller/Src/WidgetInstaller.cpp Mon Jul 19 16:50:41 2010 +0100 +++ b/webengine/widgetinstaller/Src/WidgetInstaller.cpp Thu Jul 22 16:44:19 2010 +0100 @@ -472,14 +472,16 @@ break; case EWidgetPropTypeInt: - TLex toInt( value->Des() ); - TInt k; - if ( KErrNone != toInt.Val( k ) ) - { - User::Leave( KErrCorrupt ); - } - if ( propId == EBlanketPermGranted ) - backupBlanketPerm = k; + { + TLex toInt( value->Des() ); + TInt k; + if ( KErrNone != toInt.Val( k ) ) + { + User::Leave( KErrCorrupt ); + } + if ( propId == EBlanketPermGranted ) + backupBlanketPerm = k; + } break; case EWidgetPropTypeString:
--- a/webengine/widgetregistry/group/WidgetRegistryClient.mmp Mon Jul 19 16:50:41 2010 +0100 +++ b/webengine/widgetregistry/group/WidgetRegistryClient.mmp Thu Jul 22 16:44:19 2010 +0100 @@ -31,7 +31,7 @@ #if defined(WINSCW) deffile ../BWINSCW/WidgetRegistryClient.def -#elif defined(ARMCC) +#elif defined(EABI) deffile ../EABI/WidgetRegistryClient.def #endif