--- a/webengine/osswebengine/WebKit/s60/misc/WebIconDatabase.cpp	Thu Aug 19 10:58:56 2010 +0300
+++ b/webengine/osswebengine/WebKit/s60/misc/WebIconDatabase.cpp	Tue Aug 31 16:17:46 2010 +0300
@@ -24,8 +24,8 @@
 #include "PlatformString.h"
 #include "KURL.h"
 #include "IntRect.h"
-#include <GULICON.H>
-#include <FBS.H>
+#include <gulicon.h>
+#include <fbs.h>
 #include "WebKitUtilsSqlite.h"
 
 using namespace WebCore;
@@ -68,24 +68,16 @@
             return NULL;
         CGulIcon* icon = NULL;
         CFbsBitmap* bitmap = new CFbsBitmap();
-        CFbsBitmap* mask = new CFbsBitmap();;
-        int errMask = KErrNone;
-        int errBmp = KErrNone;
+        CFbsBitmap* mask = new CFbsBitmap();
+
         if (bitmap && mask) {
-            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) {
+            int err( BitmapUtil::CopyBitmap(maskedBitmap->Bitmap(), *bitmap));
+            int errMask( BitmapUtil::CopyBitmap(maskedBitmap->Mask(), *mask));
+            if (err == KErrNone && errMask == KErrNone) {
                 TRAP_IGNORE(icon = CGulIcon::NewL());
                 if (icon) {
                     icon->SetBitmap( bitmap );
-                    if(mask)
-                        icon->SetMask( mask );
+                    icon->SetMask( mask );
                 }
             }
         }
@@ -104,7 +96,4 @@
     iconDatabase()->releaseIconForPageURL(String(url));
 }
 
-void WebIconDatabase::setEnabled(bool enabled)
-{
-    iconDatabase()->setEnabled(enabled);
-}
+