Changeset 21303

Timestamp:

2007-05-08 07:31:11 (1 year ago)

Author:

spadma

Message:

yaharon, reviewed by <reviewer>

DESC: S60 3.2 Touch: Scrolling initial implementatoin
http://bugs.webkit.org/show_bug.cgi?id=13561

• BrowserCore/Formcontrols/src/FControlInputWidget.cpp:
  (CControlInputWidget::ConstructTextEditorL):
  
• BrowserView/inc/PointerEventHandler.h:
  
• BrowserView/inc/ScrollingIndicatorDrawer.h: Added.
  
• BrowserView/inc/WebKitView.h:
  
• BrowserView/src/PointerEventHandler.cpp:
  (ContentScrollCallback):
  (CPointerEventHandler::~CPointerEventHandler):
  (CPointerEventHandler::HandlePointerEventL):
  (CPointerEventHandler::CheckSmartTextEntry):
  (CPointerEventHandler::GetFrameAt):
  (CPointerEventHandler::HandleScrollingPointerEventL):
  (CPointerEventHandler::HandleShouldStartScrollingL):
  (CPointerEventHandler::HandleDragL):
  (CPointerEventHandler::HandleContentScroll):
  (CPointerEventHandler::UpdateCursor):
  
• BrowserView/src/ScrollingIndicatorDrawer.cpp: Added.
  (CScrollingIndicatorDrawer::NewL):
  (CScrollingIndicatorDrawer::CScrollingIndicatorDrawer):
  (CScrollingIndicatorDrawer::~CScrollingIndicatorDrawer):
  (CScrollingIndicatorDrawer::ConstructSprite):
  (CScrollingIndicatorDrawerEdge::CScrollingIndicatorDrawerEdge):
  (CScrollingIndicatorDrawerEdge::ConstructL):
  (CScrollingIndicatorDrawerEdge::~CScrollingIndicatorDrawerEdge):
  (CScrollingIndicatorDrawerEdge::UpdateBitmapPositionL):
  (CScrollingIndicatorDrawerEdge::CreateBitmapAndContextL):
  (CScrollingIndicatorDrawerEdge::UpdateMaskL):
  (CScrollingIndicatorDrawerAccelerated::CScrollingIndicatorDrawerAccelerated):
  (CScrollingIndicatorDrawerAccelerated::ConstructL):
  (CScrollingIndicatorDrawerAccelerated::~CScrollingIndicatorDrawerAccelerated):
  (CScrollingIndicatorDrawerAccelerated::UpdateBitmapPositionL):
  (CScrollingIndicatorDrawerAccelerated::CheckNeedRefrech):
  (CScrollingIndicatorDrawerAccelerated::CreateBitmapAndContextL):
  (CScrollingIndicatorDrawerAccelerated::UpdateMaskL):
  (CScrollingIndicatorDrawerAccelerated::UpdateMaskExL):
  
• BrowserView/src/WebKitCursor.cpp:
  (CWebKitCursor::CursorUpdate):
  
• BrowserView/src/WebKitView.cpp:
  (CWebKitView::ContentIsScrolling):
  
• ChangeLog:
  
• Plugin/inc/PluginWin.h:
  
• Plugin/src/PluginWin.cpp:
  (CPluginWin::PluginConstructedL):
  (CPluginWin::ForceRedraw):
  (CPluginWin::HitRegionContains):
  
• group/BrowserView.mmp:
  

Files:

• S60/trunk/WebKit/BrowserCore/Formcontrols/src/FControlInputWidget.cpp (modified) (2 diffs)
• S60/trunk/WebKit/BrowserView/inc/PointerEventHandler.h (modified) (7 diffs)
• S60/trunk/WebKit/BrowserView/inc/ScrollingIndicatorDrawer.h (added)
• S60/trunk/WebKit/BrowserView/inc/WebKitView.h (modified) (1 diff)
• S60/trunk/WebKit/BrowserView/src/PointerEventHandler.cpp (modified) (10 diffs)
• S60/trunk/WebKit/BrowserView/src/ScrollingIndicatorDrawer.cpp (added)
• S60/trunk/WebKit/BrowserView/src/WebKitCursor.cpp (modified) (1 diff)
• S60/trunk/WebKit/BrowserView/src/WebKitView.cpp (modified) (1 diff)
• S60/trunk/WebKit/ChangeLog (modified) (1 diff)
• S60/trunk/WebKit/Plugin/inc/PluginWin.h (modified) (2 diffs)
• S60/trunk/WebKit/Plugin/src/PluginWin.cpp (modified) (2 diffs)
• S60/trunk/WebKit/group/BrowserView.mmp (modified) (1 diff)

S60/trunk/WebKit/BrowserCore/Formcontrols/src/FControlInputWidget.cpp

@@ -61 +61 @@
-#include <centralrepository.h>
-#include <AknFepInternalCRKeys.h>
-
+
-
-#include <eikseced.h>       // for secret editor
@@ -300 +300 @@
-                         maxLength,
-                         flags );
+    iEditor->SetAknEditorFlags( iEditor->AknEdwinFlags() | EAknEditorFlagDeliverVirtualKeyEventsToApplication);
-    iEditor->EnableT9( t9Allowed);
-    iEditor->SetBorderViewMargins( aMargins );

S60/trunk/WebKit/BrowserView/inc/PointerEventHandler.h

@@ -49 +49 @@
-#include <coedef.h>
-#include <w32std.h>
+#include "ScrollingIndicatorDrawer.h"
-
-
@@ -112 +113 @@
-        * @return
-        */
+        TBool ContentIsScrolling() { return iContentIsScrolling;}
+
+        /**
+        * @since 3.2
+        * @param
+        * @return
+        */
-        void AutoScroll();
-
@@ -126 +134 @@
-        * @return
-        */
-
+
+
+
+
+
+
+
+
-
-        /**
@@ -135 +150 @@
-        TRect& ElementRect() { return iElementRect; }
-
+        /**
+        * @since 3.2
+        * param
+        * return
+        */
+        TBool HandleScrollingPointerEventL(const TPointerEvent& aPointerEvent);
+
+        /**
+        * @since 3.2
+        * param
+        * return
+        */
+        TBool HandleShouldStartScrollingL(const TPointerEvent& aPointerEvent);
+
+        /**
+        * @since 3.2
+        * param
+        * return
+        */
+        TBool HandleDragL(const TPointerEvent& aPointerEvent);
+
-    private: // New functions
-        /**
@@ -142 +178 @@
-        */
-        CWebKitFrame* GetFrameAt(TPoint aPoint);
+
+        /**
+        * @since 3.2
+        * @param
+        * @return
+        */
+        void UpdateCursor(TPoint aPoint);
-
-    private:    // Data
@@ -149 +192 @@
-        CPeriodic* iAutoScrollPeriodic;
-        TPointerEvent iLastPointerEvent;
-
+ // in page overview mode
-        TTime iTimeNow;
-        TBool iEnableToolBar;
@@ -156 +199 @@
-        CPeriodic* iLongtapTimer;
-        TBool iActiveWidgetConsumes;
+        TBool iContentIsScrolling; // in content view
+        RArray<TPointerEvent> iPreScrollingEvents;
+        CScrollingIndicatorDrawer* iScrollingIndicatorDrawer;
+  CScrollingIndicatorDrawer::TScrollingType iScrollingType;
-    };
-

S60/trunk/WebKit/BrowserView/inc/WebKitView.h

@@ -222 +222 @@
-        void HandlePointerEventL(const TPointerEvent& /*aPointerEvent*/);
-
+        /**
+        * Return if the user is currently scrolling the content while using the styles
+        * 
+        *
+        */
+        TBool ContentIsScrolling();
+
-    protected: // From CCoeControl
-

S60/trunk/WebKit/BrowserView/src/PointerEventHandler.cpp

@@ -56 +56 @@
-#include "SmartLinkHandler.h"
-#include "PopupDrawer.h"
+#include "ScrollingIndicatorDrawer.h"
+//#include <flogger.h>
+#include <f32file.h>
+#include <e32math.h>
-
-// constants
-const TInt KAutoScrollPeriodic = 20 * 1000; // Update frequently for faster, smoother scrolling
-const TInt KMicroInterval = 300000;
-
-
-
+
+
+
+
-_LIT(KElementType, "ElType");
-_LIT(KPointX, "PointX");
@@ -79 +84 @@
-    }
-
+TInt ContentScrollCallback(TAny* aPtr)
+    {
+    static_cast<CPointerEventHandler*>(aPtr)->HandleContentScroll();
+    return KErrNone;
+    }
+
+/** /
+//Uncomment to log pointer events
+void Log(const TPointerEvent& aPointerEvent, TPtrC aText)
+    {
+    _LIT(KDown, "down");
+    _LIT(KDrag, "drag");
+    _LIT(KUp, "up");
+    _LIT(KUnknown, "Unknown");
+    TPtrC pDown(KDown);
+    TPtrC pDrag(KDrag);
+    TPtrC pUp(KUp);
+    TPtrC p(KUnknown);
+    _LIT(KK,"time: %u %u, point=(%d, %d) Event=%S %S\0");
+    TTime timeNow;
+    timeNow.UniversalTime();
+    TInt64 now = timeNow.Int64();
+    TInt nowHigh = I64HIGH(now);
+    TInt nowLow = I64LOW(now);
+    switch (aPointerEvent.iType)
+        {
+        case TPointerEvent::EButton1Down:
+            p.Set(pDown);
+            break;
+        case TPointerEvent::EDrag:
+            p.Set(pDrag);
+            break;
+        case TPointerEvent::EButton1Up:
+            p.Set(pUp);
+            break;
+        }
+    RFileLogger::WriteFormat(_L("Browser"),_L("pointer.log"),EFileLoggingModeAppend,KK, nowHigh, nowLow, aPointerEvent.iPosition.iX,
+        aPointerEvent.iPosition.iY, &p, &aText);
+    }
+/**/
-
-// ============================ MEMBER FUNCTIONS ===============================
@@ -131 +176 @@
-        delete iLongtapTimer;
-        }
-
+
+
+
+
-void CPointerEventHandler::HandlePointerEventL(const TPointerEvent& aPointerEvent)
-    {
+    //Log(aPointerEvent, _L("HandlePointerEvent"));
-    if (AknLayoutUtils::PenEnabled())
-        {
@@ -160 +209 @@
-        // Handle input box
-        CCoeControl* activeWidget = iWebKitView->ActiveWidget();
-
+
+
+
-            {
-            if(aPointerEvent.iType == TPointerEvent::EButton1Down)
@@ -168 +219 @@
-            return activeWidget->HandlePointerEventL(aPointerEvent);
-            }
+            activeWidget->HandlePointerEventL(aPointerEvent);
+            }
+
+        // Handle plugin
+        if (iWebKitView->FocusedElementType() == TBrCtlDefs::EElementActivatedObjectBox )
+            {
+            iWebKitView->DeActivate(EFalse);
+            }
+
-        TPoint absCursorPos = iWebKitView->MainFrame().ToDocCoords(aPointerEvent.iPosition) + iWebKitView->MainFrame().ContentPosition();
-        absCursorPos = iWebKitView->MainFrame().ToViewCoords(absCursorPos);
@@ -181 +241 @@
-        if (elType == TBrCtlDefs::EElementNone)
-            {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        TPointerEvent pointerEvent = aPointerEvent;
-        pointerEvent.iPosition = absCursorPos;
-
-
-
-
-
-
-
+
-        frame->WebKitBridge().WebCoreBridge().PointerEvent(pointerEvent);
-
@@ -199 +263 @@
-            iLastPointerEvent = aPointerEvent;
-            iElementRect = elRect;
-
-
-
-
-
+
-                {
-                iLongtapTimer = CPeriodic::NewL(CActive::EPriorityLow);
@@ -209 +269 @@
-            iLongtapTimer->Start(KLongtapTimeout, KLongtapTimeout, TCallBack(&LongTapCallback, this));
-            }
-
-
-
-
-
-
-
+
-            {
-            if (elRect == iElementRect) // down and up on same element?
-                {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    }
-                }
@@ -380 +433 @@
-    }
-
-
-
-iLastPointerEvent.iPosition
+TPoint aPoint
+
+aPoint
-    if (focused)
-        {             
-iLastPointerEvent.iPosition
+aPoint
-        CSmartLink* entry = focused->SmartLinkMap()->GetEntry(TRect(ptCursor,TSize(1,1)));
-        if ( entry != NULL)
@@ -412 +465 @@
-
-
+TBool CPointerEventHandler::HandleScrollingPointerEventL(const TPointerEvent& aPointerEvent)
+    {
+    TBool ret = EFalse;
+    if (iContentIsScrolling)
+        {
+        return HandleDragL(aPointerEvent);
+        }
+    else
+        {
+        return HandleShouldStartScrollingL(aPointerEvent);
+        }
+    return ret;
+    }
+
+TBool CPointerEventHandler::HandleShouldStartScrollingL(const TPointerEvent& aPointerEvent)
+    {
+    TBool ret = EFalse;    
+    if (iWebKitView->MainFrame().ContentSize().iWidth > iWebKitView->Rect().Width() || 
+        iWebKitView->MainFrame().ContentSize().iHeight > iWebKitView->Rect().Height())
+        {
+        switch (aPointerEvent.iType)
+            {
+            case TPointerEvent::EButton1Down:
+                {
+                // Handle plugins separately
+                if (iWebKitView->FocusedElementType() == TBrCtlDefs::EElementObjectBox)
+                    {
+                    break;
+                    }
+                iPreScrollingEvents.Reset();
+                iPreScrollingEvents.AppendL(aPointerEvent);
+                break;
+                }
+            case TPointerEvent::EDrag:
+                {
+                if (iLastPointerEvent.iPosition == aPointerEvent.iPosition)
+                    {
+                    return ETrue; // Ignore the event
+                    }
+                switch (iPreScrollingEvents.Count())
+                    {
+                    case 1: // wait for more dragging events
+                        iPreScrollingEvents.AppendL(aPointerEvent);
+                        break;
+                    case 2:
+                        if (!iWebKitView->ActiveWidget())
+                            {
+                            iContentIsScrolling = ETrue;
+                            ret = ETrue;
+                            iPreScrollingEvents.AppendL(aPointerEvent);
+                            // Cancel the TPointerEvent::EButton1Down event in WebCore by sending a fake TPointerEvent::EButton1Up event
+                            TPointerEvent pointerEvent;
+                            pointerEvent.iPosition = TPoint(-1, -1);
+                            pointerEvent.iType = TPointerEvent::EButton1Up;
+                            GetFrameAt(aPointerEvent.iPosition)->WebKitBridge().WebCoreBridge().PointerEvent(pointerEvent);
+                            if (iWebKitView->Cursor())
+                                {
+                                iWebKitView->Cursor()->CursorUpdate(EFalse);
+                                }
+/*
+                                // easy way for selecting one of the 2 scrolling algorithms. 
+                                // Will be removed when an algorithm is selected
+                                RFs rfs;
+                                User::LeaveIfError(rfs.Connect());
+                                CleanupClosePushL(rfs);
+                                TUint att;
+                                if (rfs.Att(_L("c:\\a"), att) == KErrNone)
+                                    {
+                                    iScrollingType = CScrollingIndicatorDrawer::EScrollingTypeEdge;
+                                    }
+                                else
+                                    {
+                                    iScrollingType = CScrollingIndicatorDrawer::EScrollingTypeAccelerated;
+                                    }
+                              CleanupStack::PopAndDestroy(); // rfs
+*/
+                            iScrollingIndicatorDrawer = CScrollingIndicatorDrawer::NewL(*iWebKitView, iScrollingType);
+                            iScrollingIndicatorDrawer->UpdateBitmapPositionL(iPreScrollingEvents[0].iPosition);
+                            iScrollingIndicatorDrawer->UpdateBitmapPositionL(iPreScrollingEvents[2].iPosition);
+                            }
+                        break;
+                    default:
+                        break;
+                    } // switch (iPreScrollingEvents.Count())
+                break;
+                }
+            case TPointerEvent::EButton1Up: // Normal tap
+                break;
+            default:
+                break;
+            } // switch (aPointerEvent.iType)
+        }
+    return ret;
+    }
+
+TBool CPointerEventHandler::HandleDragL(const TPointerEvent& aPointerEvent)
+    {
+    TBool ret = ETrue;
+    if (aPointerEvent.iType == TPointerEvent::EDrag)
+        {      
+        if (!iAutoScrollPeriodic)
+            {
+            iAutoScrollPeriodic = CPeriodic::NewL(CActive::EPriorityStandard);
+            iAutoScrollPeriodic->Start(KContentScrollPeriodic, KContentScrollPeriodic, TCallBack(&ContentScrollCallback, this));
+            }
+        // Keep the last pointer event
+        iPreScrollingEvents[1] = iPreScrollingEvents[2];
+        iPreScrollingEvents[2] = aPointerEvent;
+        UpdateCursor(aPointerEvent.iPosition);
+        iScrollingIndicatorDrawer->UpdateBitmapPositionL(iPreScrollingEvents[2].iPosition);
+        }
+    else if (aPointerEvent.iType == TPointerEvent::EButton1Up)
+        {
+        if (iAutoScrollPeriodic)
+            {
+            iAutoScrollPeriodic->Cancel();
+            delete iAutoScrollPeriodic;
+            iAutoScrollPeriodic = NULL;
+            }
+        delete iScrollingIndicatorDrawer;
+        iScrollingIndicatorDrawer = NULL;
+        iContentIsScrolling = EFalse;
+        ret = EFalse;
+        iWebKitView->DrawNow();
+        }
+    return ret;
+    }
+
+void CPointerEventHandler::HandleContentScroll()
+    {
+    //Log(iPreScrollingEvents[2], _L("HandleContentScroll"));
+    TInt halfSize = iScrollingIndicatorDrawer->ScrollingIndicatorSize() / 2;
+    TInt deltaX = 0;
+    TInt deltaY = 0;
+    TReal r = 1;
+    TInt i = 1;
+    TInt dirX = 1;
+    TInt dirY = 1;
+    TReal power;
+
+    switch (iScrollingType)
+        {
+        case CScrollingIndicatorDrawer::EScrollingTypeEdge:
+            {            
+            power = 1.0;
+            if (iPreScrollingEvents[2].iPosition.iX < halfSize)
+                {
+                deltaX = halfSize - iPreScrollingEvents[2].iPosition.iX;
+                dirX = -1;
+                }
+            else if (iPreScrollingEvents[2].iPosition.iX > iWebKitView->Rect().iBr.iX - halfSize)
+                {
+                deltaX = iPreScrollingEvents[2].iPosition.iX - iWebKitView->Rect().iBr.iX + halfSize;
+                }
+
+            if (iPreScrollingEvents[2].iPosition.iY < halfSize)
+                {
+                deltaY = halfSize - iPreScrollingEvents[2].iPosition.iY;
+                dirY = -1;
+                }
+            else if (iPreScrollingEvents[2].iPosition.iY > iWebKitView->Rect().iBr.iY - halfSize)
+                {
+                deltaY = iPreScrollingEvents[2].iPosition.iY -iWebKitView->Rect().iBr.iY + halfSize;
+                }
+            break;
+            }
+        case CScrollingIndicatorDrawer::EScrollingTypeAccelerated:
+            {
+            power = 0.8;
+            if (iPreScrollingEvents[2].iPosition.iX < iPreScrollingEvents[0].iPosition.iX - halfSize)
+                {
+                deltaX = iPreScrollingEvents[0].iPosition.iX - halfSize - iPreScrollingEvents[2].iPosition.iX;
+                dirX = -1;
+                }
+            else if (iPreScrollingEvents[2].iPosition.iX > iPreScrollingEvents[0].iPosition.iX + halfSize)
+                {
+                deltaX = iPreScrollingEvents[2].iPosition.iX - iPreScrollingEvents[0].iPosition.iX - halfSize;
+                }
+
+            if (iPreScrollingEvents[2].iPosition.iY < iPreScrollingEvents[0].iPosition.iY - halfSize)
+                {
+                deltaY = iPreScrollingEvents[0].iPosition.iY - halfSize - iPreScrollingEvents[2].iPosition.iY;
+                dirY = -1;
+                }
+            else if (iPreScrollingEvents[2].iPosition.iY > iPreScrollingEvents[0].iPosition.iY + halfSize)
+                {
+                deltaY = iPreScrollingEvents[2].iPosition.iY - iPreScrollingEvents[0].iPosition.iY - halfSize;
+                }
+            break;
+            }
+    }
+
+    if (deltaX)
+        {
+        Math::Pow(r, deltaX, power);
+        i = r;
+        deltaX = i * dirX * KScrollJump;
+        }
+    if (deltaY)
+        {
+        Math::Pow(r, deltaY, power);
+        i = r;
+        deltaY = i * dirY * KScrollJump;
+        }
+
+    if (deltaX || deltaY)
+        {
+        iWebKitView->MainFrame().ScrollTo(iWebKitView->MainFrame().ContentPosition() + TPoint(deltaX, deltaY));
+        }
+    iScrollingIndicatorDrawer->UpdateBitmapPositionL(iPreScrollingEvents[2].iPosition);
+    }
+
+void CPointerEventHandler::UpdateCursor(TPoint aPoint)
+    {
+    if (iWebKitView->Cursor())
+        {
+        iWebKitView->Cursor()->ResetTransparency();
+        iWebKitView->Cursor()->CursorUpdate(!iContentIsScrolling);
+        iWebKitView->Cursor()->SetPosition(aPoint);
+        }
+    }
+
+
-//  End of File

S60/trunk/WebKit/BrowserView/src/WebKitCursor.cpp

@@ -192 +192 @@
-    iIsVisible = aVisibility;
-    iSprite.SetPosition( iPosition );
-
+&& !iView->ContentIsScrolling() 
-        {
-        TSpriteMember spriteMem;

S60/trunk/WebKit/BrowserView/src/WebKitView.cpp

@@ -1806 +1806 @@
-
-//-------------------------------------------------------------------------------
+// ContentIsScrolling
+// Returns if the user is currently using the stylus to scroll
+//-------------------------------------------------------------------------------
+TBool CWebKitView::ContentIsScrolling()
+    {
+    return iPointerEventHandler->ContentIsScrolling();
+    }
+
+//-------------------------------------------------------------------------------
-// NodeUnderPointer()
-// Checks if there is any Node under pointer

S60/trunk/WebKit/ChangeLog

@@ +1 @@
+yaharon, reviewed by <reviewer>
+ DESC:  S60 3.2 Touch: Scrolling initial implementatoin
+ http://bugs.webkit.org/show_bug.cgi?id=13561
+
+        * BrowserCore/Formcontrols/src/FControlInputWidget.cpp:
+        (CControlInputWidget::ConstructTextEditorL):
+        * BrowserView/inc/PointerEventHandler.h:
+        * BrowserView/inc/ScrollingIndicatorDrawer.h: Added.
+        * BrowserView/inc/WebKitView.h:
+        * BrowserView/src/PointerEventHandler.cpp:
+        (ContentScrollCallback):
+        (CPointerEventHandler::~CPointerEventHandler):
+        (CPointerEventHandler::HandlePointerEventL):
+        (CPointerEventHandler::CheckSmartTextEntry):
+        (CPointerEventHandler::GetFrameAt):
+        (CPointerEventHandler::HandleScrollingPointerEventL):
+        (CPointerEventHandler::HandleShouldStartScrollingL):
+        (CPointerEventHandler::HandleDragL):
+        (CPointerEventHandler::HandleContentScroll):
+        (CPointerEventHandler::UpdateCursor):
+        * BrowserView/src/ScrollingIndicatorDrawer.cpp: Added.
+        (CScrollingIndicatorDrawer::NewL):
+        (CScrollingIndicatorDrawer::CScrollingIndicatorDrawer):
+        (CScrollingIndicatorDrawer::~CScrollingIndicatorDrawer):
+        (CScrollingIndicatorDrawer::ConstructSprite):
+        (CScrollingIndicatorDrawerEdge::CScrollingIndicatorDrawerEdge):
+        (CScrollingIndicatorDrawerEdge::ConstructL):
+        (CScrollingIndicatorDrawerEdge::~CScrollingIndicatorDrawerEdge):
+        (CScrollingIndicatorDrawerEdge::UpdateBitmapPositionL):
+        (CScrollingIndicatorDrawerEdge::CreateBitmapAndContextL):
+        (CScrollingIndicatorDrawerEdge::UpdateMaskL):
+        (CScrollingIndicatorDrawerAccelerated::CScrollingIndicatorDrawerAccelerated):
+        (CScrollingIndicatorDrawerAccelerated::ConstructL):
+        (CScrollingIndicatorDrawerAccelerated::~CScrollingIndicatorDrawerAccelerated):
+        (CScrollingIndicatorDrawerAccelerated::UpdateBitmapPositionL):
+        (CScrollingIndicatorDrawerAccelerated::CheckNeedRefrech):
+        (CScrollingIndicatorDrawerAccelerated::CreateBitmapAndContextL):
+        (CScrollingIndicatorDrawerAccelerated::UpdateMaskL):
+        (CScrollingIndicatorDrawerAccelerated::UpdateMaskExL):
+        * BrowserView/src/WebKitCursor.cpp:
+        (CWebKitCursor::CursorUpdate):
+        * BrowserView/src/WebKitView.cpp:
+        (CWebKitView::ContentIsScrolling):
+        * ChangeLog:
+        * Plugin/inc/PluginWin.h:
+        * Plugin/src/PluginWin.cpp:
+        (CPluginWin::PluginConstructedL):
+        (CPluginWin::ForceRedraw):
+        (CPluginWin::HitRegionContains):
+        * group/BrowserView.mmp:
+
+
+
-brmorris, reviewed by sachin
- DESC: stub this out in SDK development environment:

S60/trunk/WebKit/Plugin/inc/PluginWin.h

@@ -99 +99 @@
-                    public MPluginAdapter,
-                    public MCoeControlObserver,
-
+
+
-    {
-
@@ -510 +511 @@
-        */
-        void ForceRedraw(TBool aDrawNow);
+
+    public: // Functions from MCoeControlHitTest
+        TBool HitRegionContains(const TPoint &aPoint, const CCoeControl &aControl) const;
-
-    protected: // New functions

S60/trunk/WebKit/Plugin/src/PluginWin.cpp

@@ -1209 +1209 @@
-    iPluginControl = aControl;
-    iDeleted = EFalse;
+    aControl->SetHitTest(this);
-    }
-
@@ -1292 +1293 @@
-
-// -----------------------------------------------------------------------------
+// CPluginWin::HitRegionContains
+// -----------------------------------------------------------------------------
+//  
+TBool CPluginWin::HitRegionContains(const TPoint &aPoint, const CCoeControl &/*aControl*/) const
+    {
+    if (iPluginSkin->WebKitControl()->WebKitView().FocusedElementType() != TBrCtlDefs::EElementActivatedObjectBox)
+        {
+        TPoint point = iPluginSkin->Rect().iTl + aPoint;
+        iPluginSkin->Frame()->WebKitBridge().WebCoreBridge().ActivateEvent(point);
+        iPluginSkin->WebKitControl()->WebKitView().WebKitControl().OpenPluginPlayer();
+        }
+    return ETrue;
+    }
+
+// -----------------------------------------------------------------------------
-// CPluginWin::IsContentInteractive()
-// Tells  that plugin content can accept user interaction.

S60/trunk/WebKit/group/BrowserView.mmp

@@ -76 +76 @@
-SOURCE          SmartLinkHandler.cpp
-SOURCE          SmartLinkMap.cpp
-
+
+
-#ifdef  RD_BROWSER_WIDGETS
-SOURCE          WidgetExtension.cpp