diff -r 7c90e6132015 -r 10e98eab6f85 webengine/osswebengine/WebKit/s60/webview/WebCursor.h --- a/webengine/osswebengine/WebKit/s60/webview/WebCursor.h Fri May 08 08:25:06 2009 +0300 +++ b/webengine/osswebengine/WebKit/s60/webview/WebCursor.h Fri Jul 03 15:54:40 2009 +0100 @@ -21,6 +21,7 @@ #include #include "WebCoreWidget.h" #include "WebCannedImages.h" +#include "WebSprite.h" #include namespace WebCore { @@ -34,6 +35,7 @@ class CWindowGc; class WebFrame; class CFbsBitmap; +class CWebSprite; class WebCursor : public CBase { @@ -46,7 +48,7 @@ const TPoint& position() const { return m_pos; } const TRect& nodeRect() const { return m_nodeRect; } - void setPosition(const TPoint& pt) { m_pos = pt; m_sprite.SetPosition(pt);} + void setPosition(const TPoint& pt) { m_pos = pt;} void updatePositionAndElemType(const TPoint& pt); void setCurrentView(WebView& view); void offsetCursor(const TPoint& offset); @@ -66,11 +68,11 @@ void scrollAndMoveCursor(int dir, int scrollRange, bool auto); WebFrame* getFrameUnderCursor(); bool navigableNodeUnderCursor(WebFrame& webFrame, TPoint& aPoint, TBrCtlDefs::TBrCtlElementType& aElType, TRect& aFocusRect) const; + WebFrame* getFrameAtPoint(const TPoint& viewPos_); private: void moveCursor(int lr,int tb, int scrollRange); - WebFrame* getFrameAtPoint(const TPoint& viewPos_); bool determineCursorPosition(WebFrame& webFrame, TBrCtlDefs::TBrCtlElementType& aElType, TRect& aFocusRect, TRect& aSearchRect, TPoint& aCursorPosition, bool aInitialize); void increaseSearchRect(int lr,int tb,TRect& aRect); @@ -85,7 +87,7 @@ WebCursor(); void ConstructL(); TRect calcSearchRect(int lr, int tb, int scrollRange); - void constructSprite(); + void constructSpriteL(); TPoint m_pos; @@ -103,7 +105,8 @@ WebView* m_view; bool m_visible; - RWsSprite m_sprite; + + CWebSprite* m_sprite; bool m_waiton; int m_flipcounter; bool m_transparent;