--- a/webengine/osswebengine/WebKit/s60/webview/BrCtl.cpp Wed Mar 31 23:16:40 2010 +0300
+++ b/webengine/osswebengine/WebKit/s60/webview/BrCtl.cpp Wed Apr 14 17:06:56 2010 +0300
@@ -45,6 +45,7 @@
#include "WebFormFillPopup.h"
#include "WebPageFullScreenHandler.h"
#include "PageScaler.h"
+#include "ThumbnailGenerator.h"
#include "HistoryController.h"
#include "HistoryEntry.h"
#include "HistoryInterface.h"
@@ -662,7 +663,7 @@
}
case TBrCtlDefs::ECommandCancelFetch:
{
- m_webView->mainFrame()->stopLoading();
+ m_webView->Stop();
break;
}
@@ -2088,8 +2089,14 @@
if ( entry ) {
CFbsBitmap* bitmap = entry->thumbnail();
if(!bitmap) {
- // get scaled page from PageScaler;
- bitmap = m_webView->pageScaler()->ScaledPage();
+ if(m_webView->pageThumbnailGenerator()) {
+ //get the page thumbnail
+ bitmap = m_webView->pageThumbnailGenerator()->PageThumbnail();
+ }
+ else {
+ // get scaled page from PageScaler;
+ bitmap = m_webView->pageScaler()->ScaledPage();
+ }
}
if(bitmap) {
// update the history with new bitmap
@@ -2519,3 +2526,4 @@
+