equal
deleted
inserted
replaced
43 #include "WebFrameView.h" |
43 #include "WebFrameView.h" |
44 #include "WebDataLoadConsumer.h" |
44 #include "WebDataLoadConsumer.h" |
45 #include "WebFormFillPopup.h" |
45 #include "WebFormFillPopup.h" |
46 #include "WebPageFullScreenHandler.h" |
46 #include "WebPageFullScreenHandler.h" |
47 #include "PageScaler.h" |
47 #include "PageScaler.h" |
|
48 #include "ThumbnailGenerator.h" |
48 #include "HistoryController.h" |
49 #include "HistoryController.h" |
49 #include "HistoryEntry.h" |
50 #include "HistoryEntry.h" |
50 #include "HistoryInterface.h" |
51 #include "HistoryInterface.h" |
51 #include "HistoryView.h" |
52 #include "HistoryView.h" |
52 #include "FormData.h" |
53 #include "FormData.h" |
660 } |
661 } |
661 break; |
662 break; |
662 } |
663 } |
663 case TBrCtlDefs::ECommandCancelFetch: |
664 case TBrCtlDefs::ECommandCancelFetch: |
664 { |
665 { |
665 m_webView->mainFrame()->stopLoading(); |
666 m_webView->Stop(); |
666 break; |
667 break; |
667 } |
668 } |
668 |
669 |
669 case TBrCtlDefs::ECommandShowThumbnailView: |
670 case TBrCtlDefs::ECommandShowThumbnailView: |
670 { |
671 { |
2086 { |
2087 { |
2087 HistoryEntry* entry = m_historyHandler->historyController()->entry(EHistoryStackDirectionCurrent); |
2088 HistoryEntry* entry = m_historyHandler->historyController()->entry(EHistoryStackDirectionCurrent); |
2088 if ( entry ) { |
2089 if ( entry ) { |
2089 CFbsBitmap* bitmap = entry->thumbnail(); |
2090 CFbsBitmap* bitmap = entry->thumbnail(); |
2090 if(!bitmap) { |
2091 if(!bitmap) { |
2091 // get scaled page from PageScaler; |
2092 if(m_webView->pageThumbnailGenerator()) { |
2092 bitmap = m_webView->pageScaler()->ScaledPage(); |
2093 //get the page thumbnail |
|
2094 bitmap = m_webView->pageThumbnailGenerator()->PageThumbnail(); |
|
2095 } |
|
2096 else { |
|
2097 // get scaled page from PageScaler; |
|
2098 bitmap = m_webView->pageScaler()->ScaledPage(); |
|
2099 } |
2093 } |
2100 } |
2094 if(bitmap) { |
2101 if(bitmap) { |
2095 // update the history with new bitmap |
2102 // update the history with new bitmap |
2096 TRAP_IGNORE(m_historyHandler->historyController()->updateHistoryEntryThumbnailL(bitmap)); |
2103 TRAP_IGNORE(m_historyHandler->historyController()->updateHistoryEntryThumbnailL(bitmap)); |
2097 TRAP_IGNORE(icon = CGulIcon::NewL(bitmap, NULL)); |
2104 TRAP_IGNORE(icon = CGulIcon::NewL(bitmap, NULL)); |
2517 } |
2524 } |
2518 |
2525 |
2519 |
2526 |
2520 |
2527 |
2521 |
2528 |
|
2529 |