equal
deleted
inserted
replaced
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 int errMask = KErrNone; |
72 |
73 int errBmp = KErrNone; |
|
74 if (bitmap && mask) { |
73 if (bitmap && mask) { |
75 errBmp = BitmapUtil::CopyBitmap(maskedBitmap->Bitmap(), *bitmap); |
74 int err( BitmapUtil::CopyBitmap(maskedBitmap->Bitmap(), *bitmap)); |
76 if(maskedBitmap->HasMask()) { |
75 int errMask( BitmapUtil::CopyBitmap(maskedBitmap->Mask(), *mask)); |
77 errMask = BitmapUtil::CopyBitmap(maskedBitmap->Mask(), *mask); |
76 if (err == KErrNone && errMask == KErrNone) { |
78 }else { |
|
79 delete mask; |
|
80 mask = NULL; |
|
81 } |
|
82 |
|
83 if (errBmp == KErrNone && errMask == KErrNone) { |
|
84 TRAP_IGNORE(icon = CGulIcon::NewL()); |
77 TRAP_IGNORE(icon = CGulIcon::NewL()); |
85 if (icon) { |
78 if (icon) { |
86 icon->SetBitmap( bitmap ); |
79 icon->SetBitmap( bitmap ); |
87 if(mask) |
80 icon->SetMask( mask ); |
88 icon->SetMask( mask ); |
|
89 } |
81 } |
90 } |
82 } |
91 } |
83 } |
92 return icon; |
84 return icon; |
93 } |
85 } |
102 void WebIconDatabase::releaseIconForURL(const TDesC8& url) |
94 void WebIconDatabase::releaseIconForURL(const TDesC8& url) |
103 { |
95 { |
104 iconDatabase()->releaseIconForPageURL(String(url)); |
96 iconDatabase()->releaseIconForPageURL(String(url)); |
105 } |
97 } |
106 |
98 |
107 void WebIconDatabase::setEnabled(bool enabled) |
99 |
108 { |
|
109 iconDatabase()->setEnabled(enabled); |
|
110 } |
|