160 m_pluginSupported( EFalse ), |
160 m_pluginSupported( EFalse ), |
161 m_pluginClosed(false), |
161 m_pluginClosed(false), |
162 m_canInteract( EFalse ), |
162 m_canInteract( EFalse ), |
163 m_rect(TRect(0,0,0,0)), |
163 m_rect(TRect(0,0,0,0)), |
164 m_ref(1), |
164 m_ref(1), |
|
165 m_oldRect(TRect(0,0,0,0)), |
|
166 m_oldViewport(TRect(0,0,0,0)), |
|
167 m_loadmode(ELoadModeNone), |
|
168 m_NPObject(0), |
165 m_handle(-1), |
169 m_handle(-1), |
166 m_instance(0), |
170 m_instance(0), |
167 m_pluginfuncs(0), |
171 m_pluginfuncs(0), |
168 m_resized(false), |
172 m_resized(false) |
169 m_oldRect(TRect(0,0,0,0)), |
|
170 m_oldViewport(TRect(0,0,0,0)), |
|
171 m_loadmode(ELoadModeNone), |
|
172 m_NPObject(0) |
|
173 { |
173 { |
174 } |
174 } |
175 |
175 |
176 |
176 |
177 void PluginSkin::addWidgetAttributesL() |
177 void PluginSkin::addWidgetAttributesL() |
407 User::Free(m_instance); m_instance = 0; |
407 User::Free(m_instance); m_instance = 0; |
408 delete m_pluginwin; m_pluginwin = 0; |
408 delete m_pluginwin; m_pluginwin = 0; |
409 delete m_attributeNames; m_attributeNames = 0; |
409 delete m_attributeNames; m_attributeNames = 0; |
410 delete m_attributeValues; m_attributeValues = 0; |
410 delete m_attributeValues; m_attributeValues = 0; |
411 delete m_url; m_url = 0; |
411 delete m_url; m_url = 0; |
412 delete iJavascriptTimer; iJavascriptTimer = 0; |
412 if(iJavascriptTimer) |
|
413 { |
|
414 iJavascriptTimer->Cancel(); |
|
415 delete iJavascriptTimer; |
|
416 iJavascriptTimer = 0; |
|
417 } |
413 m_pluginfuncs = 0; |
418 m_pluginfuncs = 0; |
414 m_pluginSupported = EFalse; |
419 m_pluginSupported = EFalse; |
415 m_pluginClosed = true; |
420 m_pluginClosed = true; |
416 |
421 |
417 } |
422 } |
473 gc->SetPenStyle( CGraphicsContext::ENullPen ); |
478 gc->SetPenStyle( CGraphicsContext::ENullPen ); |
474 gc->SetBrushStyle( CGraphicsContext::ENullBrush ); |
479 gc->SetBrushStyle( CGraphicsContext::ENullBrush ); |
475 |
480 |
476 CFbsBitmap* bitmap = m_cannedimg.m_img; |
481 CFbsBitmap* bitmap = m_cannedimg.m_img; |
477 TSize bmpSize( bitmap->SizeInPixels() ); |
482 TSize bmpSize( bitmap->SizeInPixels() ); |
478 if ( !m_pluginwin && newRect.Height() >= bmpSize.iHeight && newRect.Width() >= bmpSize.iWidth ) |
483 CWidgetExtension* wdgtExt = control(this->frame()) ? control(this->frame())->getWidgetExt(): NULL; |
|
484 |
|
485 if ( !wdgtExt && !m_pluginwin && newRect.Height() >= bmpSize.iHeight && newRect.Width() >= bmpSize.iWidth ) |
479 { |
486 { |
480 // The inner rect is big enough, draw the placeholder image |
487 // The inner rect is big enough, draw the placeholder image |
481 TPoint bitmapStartPoint( newRect.Center() ); |
488 TPoint bitmapStartPoint( newRect.Center() ); |
482 bitmapStartPoint -= TPoint(bmpSize.iWidth/2,bmpSize.iHeight/2); |
489 bitmapStartPoint -= TPoint(bmpSize.iWidth/2,bmpSize.iHeight/2); |
483 gc->BitBltMasked( bitmapStartPoint, m_cannedimg.m_img, |
490 gc->BitBltMasked( bitmapStartPoint, m_cannedimg.m_img, |