MCL/sf/mw/web: comparison webengine/osswebengine/WebKit/s60/plugins/PluginWin.cpp

equal deleted inserted replaced

-:e1bea15f9a39
+:79859ed3eea9
 #include <e32std.h>
 #include <e32def.h>
 #include <eikdef.h>
 #include <eikenv.h>
 #include <eikappui.h>
-#include <SysUtil.h>
+#include <sysutil.h>
 #include <AknUtils.h>
 #include "WebFrame.h"
 #include "HttpDefs.h"
-#include <brctldefs.h>
+#include "BrCtlDefs.h"
 #include "StaticObjectsContainer.h"
-#include <pluginadapterinterface.h>
+#include <PluginAdapterInterface.h>
 #include "PluginWin.h"
 #include "PluginSkin.h"
 #include "PluginHandler.h"
 #include "PluginStream.h"
 #include "WebView.h"
 #include "Frame.h"
 #include "WebCursor.h"
 #include "WebPointerEventHandler.h"
 #include "WebPageScrollHandler.h"
 #include "WebKitLogger.h"
-#include "WebCoreGraphicsContext.h"
-#include <rt_gestureif.h>
 using namespace WebCore;
 using namespace RT_GestureHelper;
-using namespace stmGesture;
 // CONSTANTS
 const TInt KPluginGranularity = 3;
 _LIT(KPath,"c:\\system\\temp\\");
 void panicPlugin(TInt error = KErrNone)
 // might leave.
 // -----------------------------------------------------------------------------
 //
 PluginWin::PluginWin(PluginSkin* pluginskin)
 : m_pluginskin(pluginskin)
-, m_windowedPlugin(true), m_fullscreen(false), m_windowCreated(false), m_visibilty(false)
+, m_windowedPlugin(true), m_fullscreen(false), m_windowCreated(false)
 {
 }
 // -----------------------------------------------------------------------------
 // PluginWin::ConstructL
 TDisplayMode mode = m_transparentPlugin ? EColor16MA : WebCore::StaticObjectsContainer::instance()->webSurface()->displayMode();
 m_bitmap->Create(TSize(0,0), mode);
 }
 // Add the focus/foreground observer
 ControlEnv()->AddForegroundObserverL( *this ) ;
-m_pluginHasBitmap = false;
-m_pausedBitmap = NULL;
-m_BitmapSupported = false;
 }
 // -----------------------------------------------------------------------------
 // PluginWin::~PluginWin
 // Deconstructor.
 // -----------------------------------------------------------------------------
 //
 PluginWin::~PluginWin()
 {
-PluginHandler* pluginHandler = WebCore::StaticObjectsContainer::instance()->pluginHandler();
-int index = pluginHandler->getVisiblePlugins().Find(m_pluginskin);
-if (index != KErrNotFound)
-pluginHandler->getVisiblePlugins().Remove(index);
 TRAP_IGNORE( setPluginFocusL( EFalse ) );
 // Remove the foreground observer
 ControlEnv()->RemoveForegroundObserver( *this );
 delete m_bitmap;
-if (m_pausedBitmap)
-{
-delete m_pausedBitmap;
-}
 }
 // -----------------------------------------------------------------------------
 // PluginWin::NewL
 // Two-phased constructor.
 }
 m_notifier->NotifyL( MPluginNotifier::EPluginActivated, (void*) &pt );
 cursor->cursorUpdate(EFalse);
 consumed = ETrue;
 setPluginFocusL( ETrue );
-m_pluginskin->pluginFocusChanged(ETrue);
 }
 else
 {
 m_pluginskin->frame()->frameView()->topView()->setFocusedElementType(TBrCtlDefs::EElementBrokenImage);
 TKeyResponse ret = EKeyWasNotConsumed;
 if ( m_control ) {
 ret = m_control->OfferKeyEventL( aKeyEvent, aType );
 }
 else if (!m_windowedPlugin && m_pluginskin->getNPPluginFucs() && m_pluginskin->getNPPluginFucs()->event) {
-WebCursor* c = StaticObjectsContainer::instance()->webCursor();
-TPoint pt = (c->position());
-pt = m_pluginskin->frame()->frameView()->viewCoordsInFrameCoords(pt);
-pt -= m_pluginskin->rect().iTl;
 NPEvent event;
 NPEventKey eventKey;
 event.event = ENppEventKey;
 eventKey.keyEvent = &aKeyEvent;
 eventKey.type = aType;
-eventKey.reserved = static_cast<void*>(&pt);
+eventKey.reserved = NULL;
 event.param = &eventKey;
 ret = (TKeyResponse)m_pluginskin->getNPPluginFucs()->event(m_pluginskin->getNPP(), static_cast<void*>(&event));
 }
 return ret;
 }
 // Hides or shows the PluginInst.
 // -----------------------------------------------------------------------------
 //
 void PluginWin::makeVisible( TBool visible )
 {
-WebView* view = control(m_pluginskin->frame())->webView();
+if(IsVisible() != visible)
-if(!view)
-return;
-if((!m_pluginHasBitmap) && (IsVisible() != visible) && (!view->isPinchZoom()))
 {
 CCoeControl::MakeVisible(visible);
 }
-PluginHandler* pluginHandler = WebCore::StaticObjectsContainer::instance()->pluginHandler();
-int index = pluginHandler->getVisiblePlugins().Find(m_pluginskin);
-if (visible && (m_visibilty != visible) && (index == KErrNotFound)) {
-pluginHandler->getVisiblePlugins().AppendL(m_pluginskin);
-m_visibilty = visible;
-}
-else if (!visible && (index != KErrNotFound)) {
-pluginHandler->getVisiblePlugins().Remove(index);
-m_visibilty = visible;
-}
 NotifyPluginVisible(visible);
 if (!m_windowedPlugin && m_pluginskin->getNPPluginFucs() && m_pluginskin->getNPPluginFucs()->event) {
 NPEvent event;
 NpEventVisibility ev;
 event.event = ENppEventVisibility;
 // -----------------------------------------------------------------------------
 //
 void PluginWin::HandleGainingForeground()
 {
 if (m_notifier) {
-if(m_pluginHasBitmap)
-{
-ClearPluginBitmap();
-m_pluginskin->activateVisiblePlugins();
-}
 TRAP_IGNORE(m_notifier->NotifyL(MPluginNotifier::EApplicationFocusChanged, (void*)1));
 }
 }
 // -----------------------------------------------------------------------------
 if (m_pluginskin->pluginPlayer()) {
 DrawNow();
 }
 else {
 WebFrame* mf = (m_pluginskin->frame());
-if (mf && mf->frameView()) {
+WebFrameView* fv = mf->frameView();
-WebFrameView* fv = mf->frameView();
+TRect rect(Rect());
-TRect rect(Rect());
+rect = TRect(fv->viewCoordsInFrameCoords(Rect().iTl), fv->viewCoordsInFrameCoords(Rect().iBr));
-rect = TRect(fv->viewCoordsInFrameCoords(Rect().iTl), fv->viewCoordsInFrameCoords(Rect().iBr));
+if (mf && mf->frameView())
-fv->invalidateRect(rect, drawNow);
+mf->frameView()->invalidateRect(rect, drawNow);
-}
 }
 }
 // -----------------------------------------------------------------------------
 // CPluginWin::MoveWindow
 TInt zoomlevel = view->zoomLevel();
 		    TPoint oldPos(mf->frameView()->contentPos());
 		    TPoint newPos ((aOffset.iX  * 100)/zoomlevel, (aOffset.iY  * 100)/zoomlevel);
 	        c->offsetCursor( aOffset );
 mf->frameView()->scrollTo(oldPos + newPos);
-view->scrollStatus(false);
 c->cursorUpdate(EFalse);
 }
 }
 m_notifier->NotifyL( MPluginNotifier::EPluginPause, (void*)0 );
 }
 }
 }
-TBool PluginWin::IsCollectBitmapSupported ()
-{
-if(m_notifier) {
-m_BitmapSupported = m_notifier->NotifyL( MPluginNotifier::ECollectBitmapSupported, (void*)0 ) ;
-}
-return m_BitmapSupported;
-}
-void PluginWin::GetBitmapFromPlugin (bool status)
-{
-if(m_notifier) {
-if (status) {
-//if plugin fails to send bitmap even though the "ECollectBitmapSupported"
-CBrCtl*   brCtl = control(m_pluginskin->frame());
-WebView*  view = brCtl->webView();
-if(view && view->isPinchZoom())
-m_PluginInvisibleOnPinchZoom = ETrue;
-m_notifier->NotifyL( MPluginNotifier::ECollectBitmap, (void*)1 );
-			 //if Notify CollectBitmap failed to send bitmap to SetBitmapFromPlugin,
-			 //Then forcefully make the plugin window invisible for pinch zoom
-if(m_PluginInvisibleOnPinchZoom)
-{
-m_PluginInvisibleOnPinchZoom = EFalse;
-if (IsVisible())
-{
-MakeVisible(false);
-}
-}
-}
-else {
-m_notifier->NotifyL( MPluginNotifier::ECollectBitmap, (void*)0 );
-m_pluginHasBitmap = 0;
-if(m_pausedBitmap)
-{
-delete m_pausedBitmap;
-m_pausedBitmap = NULL;
-}
-}
-}
-}
 void PluginWin::HandlePointerEventFromPluginL(const TPointerEvent& aEvent)
 {
 CBrCtl*   brCtl = control(m_pluginskin->frame());
 WebView*  view = brCtl->webView();
-#ifdef BRDO_MULTITOUCH_ENABLED_FF
+TPointerEvent event(aEvent);
-if (aEvent.IsAdvancedPointerEvent()) {
-TAdvancedPointerEvent tadvp = *(static_cast<const TAdvancedPointerEvent *>(&aEvent));
+if (!StaticObjectsContainer::instance()->isPluginFullscreen()) {
-if (!StaticObjectsContainer::instance()->isPluginFullscreen()) {
+event.iPosition = aEvent.iPosition - view->PositionRelativeToScreen();
-tadvp.iPosition = aEvent.iPosition - view->PositionRelativeToScreen();
+}
-}
+view->pointerEventHandler()->HandlePointerEventL(event);
-view->pointerEventHandler()->HandlePointerEventL(tadvp);
+}
-}
-else {
-#endif
+TBool PluginWin::HandleGesture(const TGestureEvent& aEvent)
-TPointerEvent event(aEvent);
-if (!StaticObjectsContainer::instance()->isPluginFullscreen()) {
-event.iPosition = aEvent.iPosition - view->PositionRelativeToScreen();
-}
-view->pointerEventHandler()->HandlePointerEventL(event);
-#ifdef BRDO_MULTITOUCH_ENABLED_FF
-}
-#endif
-}
-TBool PluginWin::HandleGesture(const TStmGestureEvent& aEvent)
 {
 TBool ret = EFalse;
-TGestureEvent eventForPlugin;
-switch(aEvent.Code())
-{
-case EGestureUidUnknown :
-eventForPlugin.SetCode(EGestureUnknown);
-break;
-case EGestureUidTouch :
-eventForPlugin.SetCode(EGestureStart);
-break;
-case EGestureUidTap :
-if(aEvent.Type() == ETapTypeSingle)
-eventForPlugin.SetCode(EGestureTap);
-else
-eventForPlugin.SetCode(EGestureDoubleTap);
-break;
-case EGestureUidLongPress :
-eventForPlugin.SetCode(EGestureLongTap);
-break;
-case EGestureUidPan :
-eventForPlugin.SetCode(EGestureDrag);
-break;
-case EGestureUidRelease :
-eventForPlugin.SetCode(EGestureReleased);
-break;
-case EGestureUidFlick :
-eventForPlugin.SetCode(EGestureFlick);
-break;
-case EGestureUidPinch :
-eventForPlugin.SetCode(EGesturePinch);
-break;
-default :
-break;
-}
 if (m_control) {
+TGestureEvent gestEvent(aEvent);
 CBrCtl*   brCtl = control(m_pluginskin->frame());
 WebView*  view = brCtl->webView();
 TPoint newPos = aEvent.CurrentPos();
-// Not sure plugins need the start position of the gesture. Not inlcuded in the new struct
+TPoint startPos = aEvent.StartPos();
-TPoint startPos = aEvent.CurrentPos();
 TPoint viewPos = view->PositionRelativeToScreen();
 TPoint ctrlPos = m_control->PositionRelativeToScreen();
 if (!StaticObjectsContainer::instance()->isPluginFullscreen()) {
 // adjust the position to make it relative to top left corner of
 newPos += viewPos;
 startPos += viewPos;
-}
+gestEvent.SetCurrentPos(newPos);
-eventForPlugin.SetCurrentPos(newPos);
+gestEvent.SetStartPos(startPos);
-eventForPlugin.SetStartPos(startPos);
+}
-if (StaticObjectsContainer::instance()->isPluginFullscreen() ||
+if (StaticObjectsContainer::instance()->isPluginFullscreen() ||
 	    m_control->Rect().Contains(newPos - ctrlPos)) {
 NPEvent event;
 NPEventPointer ev;
 event.event = ENppEventPointer;
-ev.reserved = &eventForPlugin;
+ev.reserved = &gestEvent;
 ev.pointerEvent = NULL;
 event.param = &ev;
 ret = m_pluginskin->getNPPluginFucs()->event(m_pluginskin->getNPP(),
 static_cast<void*>(&event));
 }
 }
 else if(!m_windowedPlugin && m_pluginskin->getNPPluginFucs() && m_pluginskin->getNPPluginFucs()->event){
 TRect cliprect = m_pluginskin->getClipRect();
-TPoint newPos = aEvent.CurrentPos();
+TPoint newpos = aEvent.CurrentPos();
-eventForPlugin.SetCurrentPos(newPos);
+if(cliprect.Contains(newpos)){
-eventForPlugin.SetCurrentPos(newPos);
+TGestureEvent gestEvent(aEvent);
-if(cliprect.Contains(newPos)){
 NPEvent event;
 NPEventPointer ev;
 event.event = ENppEventPointer;
-ev.reserved = &eventForPlugin;
+ev.reserved = &gestEvent;
 ev.pointerEvent = NULL;
 event.param = &ev;
 ret = m_pluginskin->getNPPluginFucs()->event(m_pluginskin->getNPP(),
 static_cast<void*>(&event));
 }
 }
 return ret;
 }
-bool PluginWin::containsPoint(WebView& view, const TPoint& pt)
-{
-if (m_control) {
-if (StaticObjectsContainer::instance()->isPluginFullscreen()) {
-return true;
-}
-else {
-TPoint point = pt;
-TPoint viewPos = view.PositionRelativeToScreen();
-TPoint ctrlPos = m_control->PositionRelativeToScreen();
-point += viewPos;
-return m_control->Rect().Contains(point - ctrlPos);
-}
-}
-else
-return false;
-}
-// -----------------------------------------------------------------------------
-// PluginWin::SetBitmapFromPlugin
-// Plugin video is captured in CFBsBitmap and handle is passed to plugin window
-// Duplicate the bitmap handle and use it to draw while Panning or Pinch zoom
-// -----------------------------------------------------------------------------
-void PluginWin::SetBitmapFromPlugin(TInt aHandle)
-{
-m_PluginInvisibleOnPinchZoom = EFalse;
-if (aHandle)
-{
-if (m_pausedBitmap)
-{
-delete m_pausedBitmap;
-m_pausedBitmap = NULL;
-}
-m_pausedBitmap = new (ELeave) CFbsBitmap();
-TInt dupStatus = m_pausedBitmap->Duplicate(aHandle);
-if(dupStatus == KErrNone)
-{
-m_pluginHasBitmap = true;
-if (IsVisible())
-{
-MakeVisible(false);
-}
-//setPluginFocusL(false);
-drawBitmapToWebCoreContext();
-}
-}
-else
-{
-if(m_pausedBitmap)
-{
-delete m_pausedBitmap;
-	m_pausedBitmap = NULL;
-		}
-m_pluginHasBitmap = false;
-}
-}
-void PluginWin::ClearPluginBitmap()
-{
-if(m_pausedBitmap)
-{
-delete m_pausedBitmap;
-m_pausedBitmap = NULL;
-m_pluginHasBitmap = false; //clearing plugin bitmap
-}
-}
-void PluginWin::drawBitmapToWebCoreContext()
-{
-CBrCtl* brCtl = control(m_pluginskin->frame());
-WebView* view = brCtl->webView();
-WebCoreGraphicsContext* context = view->getGraphicsContext();
-CFbsBitGc& gc = context->gc();
-TRect plWinRect(m_pluginskin->getPluginWinRect());
-TRect oldcontextrect = context->clippingRect();
-TRect clippingRect = context->clippingRect();
-// save the gc state
-TWebCoreSavedContext saved(context->save());
-if(plWinRect != clippingRect)
-{
-context->setClippingRect(plWinRect);
-}
-gc.DrawBitmap(plWinRect, m_pausedBitmap);
-context->restore(saved);
-}
-// Notify Plugins about the change in Access Point during Upgrade / Downgrade
-void PluginWin::notifyAPChange(void* ap)
-{
-if (m_notifier) {
-m_notifier->NotifyL( MPluginNotifier::EAccesPointChanged, ap );
-}
-}

branch	RCL_3
changeset 48	79859ed3eea9
parent 47	e1bea15f9a39
child 49	919f36ff910f