equal
deleted
inserted
replaced
22 #include "MaskedBitmap.h" |
22 #include "MaskedBitmap.h" |
23 #include "Image.h" |
23 #include "Image.h" |
24 #include "PlatformString.h" |
24 #include "PlatformString.h" |
25 #include "KURL.h" |
25 #include "KURL.h" |
26 #include "IntRect.h" |
26 #include "IntRect.h" |
27 #include <gulicon.h> |
27 #include <GULICON.H> |
28 #include <fbs.h> |
28 #include <FBS.H> |
29 #include "WebKitUtilsSqlite.h" |
29 #include "WebKitUtilsSqlite.h" |
30 |
30 |
31 using namespace WebCore; |
31 using namespace WebCore; |
32 |
32 |
33 _LIT(KDBFile, "c:\\private\\%08x\\"); |
33 _LIT(KDBFile, "c:\\private\\%08x\\"); |
66 CMaskedBitmap* maskedBitmap = image->getMaskedBitmap(); |
66 CMaskedBitmap* maskedBitmap = image->getMaskedBitmap(); |
67 if (!maskedBitmap) |
67 if (!maskedBitmap) |
68 return NULL; |
68 return NULL; |
69 CGulIcon* icon = NULL; |
69 CGulIcon* icon = NULL; |
70 CFbsBitmap* bitmap = new CFbsBitmap(); |
70 CFbsBitmap* bitmap = new CFbsBitmap(); |
71 CFbsBitmap* mask = new CFbsBitmap(); |
71 CFbsBitmap* mask = new CFbsBitmap();; |
72 |
72 int errMask = KErrNone; |
|
73 int errBmp = KErrNone; |
73 if (bitmap && mask) { |
74 if (bitmap && mask) { |
74 int err( BitmapUtil::CopyBitmap(maskedBitmap->Bitmap(), *bitmap)); |
75 errBmp = BitmapUtil::CopyBitmap(maskedBitmap->Bitmap(), *bitmap); |
75 int errMask( BitmapUtil::CopyBitmap(maskedBitmap->Mask(), *mask)); |
76 if(maskedBitmap->HasMask()) { |
76 if (err == KErrNone && errMask == KErrNone) { |
77 errMask = BitmapUtil::CopyBitmap(maskedBitmap->Mask(), *mask); |
|
78 }else { |
|
79 delete mask; |
|
80 mask = NULL; |
|
81 } |
|
82 |
|
83 if (errBmp == KErrNone && errMask == KErrNone) { |
77 TRAP_IGNORE(icon = CGulIcon::NewL()); |
84 TRAP_IGNORE(icon = CGulIcon::NewL()); |
78 if (icon) { |
85 if (icon) { |
79 icon->SetBitmap( bitmap ); |
86 icon->SetBitmap( bitmap ); |
80 icon->SetMask( mask ); |
87 if(mask) |
|
88 icon->SetMask( mask ); |
81 } |
89 } |
82 } |
90 } |
83 } |
91 } |
84 return icon; |
92 return icon; |
85 } |
93 } |
94 void WebIconDatabase::releaseIconForURL(const TDesC8& url) |
102 void WebIconDatabase::releaseIconForURL(const TDesC8& url) |
95 { |
103 { |
96 iconDatabase()->releaseIconForPageURL(String(url)); |
104 iconDatabase()->releaseIconForPageURL(String(url)); |
97 } |
105 } |
98 |
106 |
99 |
107 void WebIconDatabase::setEnabled(bool enabled) |
|
108 { |
|
109 iconDatabase()->setEnabled(enabled); |
|
110 } |