--- a/webengine/osswebengine/WebKit/s60/webview/WebView.h Wed Apr 14 17:06:56 2010 +0300
+++ b/webengine/osswebengine/WebKit/s60/webview/WebView.h Tue Apr 27 17:46:17 2010 +0300
@@ -355,7 +355,7 @@
/**
* To set the Bitmap zooming for Pinch
*/
- void setPinchBitmapZoomLevel(int zoomLevel);
+ void setPinchBitmapZoomLevelL(int zoomLevel);
/**
* To set the Bitmap zooming In for Pinch
@@ -365,14 +365,24 @@
/**
* To set the Bitmap zooming Out for Pinch
*/
- void setPinchBitmapZoomOut(int zoomLevel);
+ void setPinchBitmapZoomOutL(int zoomLevel);
+
+ TBool isPinchZoom() {return m_isPinchZoom; }
/**
- * Recreate Plugins in case of Retry Connection
- */
- void reCreatePlugins();
+ * Creates the checkerboard
+ */
+ void createCheckerBoardL();
- TBool isPinchZoom() {return m_isPinchZoom; }
+ /**
+ * Destroys the checkerboard
+ */
+ void destroyCheckerBoard();
+
+ /**
+ * Starts the checkerboard timer. End of this timer, checkerboard will be destroyed.
+ */
+ void startCheckerBoardDestroyTimer();
void setScrolling(bool scroll);
@@ -501,7 +511,7 @@
void sendMouseEventToEngineIfNeeded(TPointerEvent::TType eventType, TPoint pos, WebCore::Frame* frame);
void setFocusedNodeUnderCursor(WebCore::Frame* frame);
void waitTimerCB(WebCore::Timer<WebView>* t);
-
+ void calculateZoomRect(TRect &aOldRect, TRect &aNewRect, TInt aOldZoom, TInt aNewZoom);
public:
void sendMouseEventToEngine(TPointerEvent::TType eventType, TPoint pos, WebCore::Frame* frame);
void fepTimerFired(WebCore::Timer<WebView>*);
@@ -597,7 +607,6 @@
WebPageFullScreenHandler* m_pageFullScreenHandler; // owned
bool m_viewIsScrolling;
bool m_viewIsFastScrolling;
- bool m_scroll;
// synchronous requests
bool m_synchRequestPending;
@@ -615,7 +624,16 @@
TBool m_isPinchZoom;
TRealPoint m_pinchDocDelta;
int m_drawsMissed;
+ bool m_scroll;
CThumbnailGenerator* m_thumbnailGenerator;
+
+ CFbsBitmap *m_checkerBoardBitmap;
+ CFbsBitmapDevice *m_checkerBoardDevice;
+ CFbsBitGc *m_checkerBoardGc;
+
+ CPeriodic *m_checkerBoardDestroyTimer;
+
+ TBool m_isPinchZoomOut;
};
#endif