FCL/sf/app/browserui: comparison browsercore/appfw/Api/Managers/webpagecontroller.cpp

equal deleted inserted replaced

-:0f2326c2a325
+:1c3b8676e58c
 #include <QGraphicsWebView>
 #include <QFile>
 #include <QDir>
 #include <QtGui>
 #include <QCoreApplication>
+#include <QWebSecurityOrigin>
+#include <QWebDatabase>
+#include <QWebSettings>
+#include <QtCore/QSettings>
 using namespace WRT;
 #if defined(Q_OS_SYMBIAN) // for shareToMail
 #include <miutset.h>
 #include <sendui.h>
 WebPageController::WebPageController ( QObject* parent ) :
 QObject ( parent ),
 m_networkError (false),
 m_networkErrorMsg("No network error"),
 m_networkErrorUrl("No Url"),
+m_promptMsg("No message"),
+m_promptReserved(""),
 m_memoryHandler(new LowMemoryHandler(this)),
 d(new WebPageControllerPrivate(this)),
-m_settingsLoaded(0)
+m_settingsLoaded(0),
+m_bErrorUrlMatches(false)
 {
 // Register a new MetaType WebPageData. It is needed to serialize history (starage)
 qRegisterMetaTypeStreamOperators<WebPageData> ("WebPageData");
 d->m_historyDir = BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsString("DataBaseDirectory");
 connect( d->m_actionReload, SIGNAL( triggered() ), this, SLOT( currentReload() ) );
 connect( d->m_actionStop, SIGNAL( triggered() ), this, SLOT( currentStop() ) );
 connect( d->m_actionBack, SIGNAL( triggered() ), this, SLOT( currentBack() ) );
 connect( d->m_actionForward, SIGNAL( triggered() ), this, SLOT( currentForward() ) );
+connect( m_memoryHandler, SIGNAL( lowMemory() ), this, SIGNAL( lowMemory() ) );
 connect( m_memoryHandler, SIGNAL( lowMemory() ), this, SLOT( handleLowMemory() ) );
+connect( m_memoryHandler, SIGNAL( outOfMemory() ), this, SIGNAL( outOfMemory() ) );
 connect( m_memoryHandler, SIGNAL( outOfMemory() ), this, SLOT( handleOutOfMemory() ) );
 m_memoryHandler->start();
 updateJSActions();
 // emit signal for creating network connection.
 Q_ASSERT( page );
 page->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, (bool) BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsInt("DeveloperExtras"));
+connect( page, SIGNAL( loadFinished(bool) ), SLOT( onLoadFinishedForBackgroundWindow(bool) ) );
 // emit signal indicating that new page is being created
 emit creatingPage( page );
 /* Add the new page after the current page */
 * @param page   WRT::WrtBrowserContainer instance to be closed
 * @see  WRT::WrtBrowserContainer
 */
 void WebPageController::closePage ( WRT::WrtBrowserContainer *page )
 {
-WRT::WrtBrowserContainer * theCurrentPage = currentPage();
+if(pageCount() > 1) {
-bool updateCurrentPageIndex = false;
+WRT::WrtBrowserContainer * theCurrentPage = currentPage();
+bool updateCurrentPageIndex = false;
-// get index of page we want to remove
-int closeIndex = d->m_allPages.indexOf(page);
+// get index of page we want to remove
-if(closeIndex < 0)
+int closeIndex = d->m_allPages.indexOf(page);
-return;
+if(closeIndex < 0)
+return;
-// was this page the "current page?"
-// if so, we need to select the page to become the new one
+// was this page the "current page?"
-// select the previous page unless at the beginning, then select next
+// if so, we need to select the page to become the new one
-if(page == theCurrentPage) {
+// select the previous page unless at the beginning, then select next
-int newCurrIndex = closeIndex - 1;
+if(page == theCurrentPage) {
-if(closeIndex == 0 ) {
+int newCurrIndex = closeIndex - 1;
-newCurrIndex = closeIndex + 1;
+if(closeIndex == 0 ) {
-}
+newCurrIndex = closeIndex + 1;
+}
 // change the current page
 if(newCurrIndex >= 0) {
 theCurrentPage = d->m_allPages.at(newCurrIndex);
 setCurrentPage(theCurrentPage);
 updateCurrentPageIndex = true;
+}
+else {
+d->m_currentPage = -1;
+emit pageChanged(page, NULL);
+}
 }
 else {
-d->m_currentPage = -1;
+/* Adjust m_currentPage if the index of the page deleted is less than
-emit pageChanged(page, NULL);
+* current page
+*/
+if (closeIndex < d->m_currentPage )
+updateCurrentPageIndex = true;
 }
-}
-else {
+// actually delete the page from the list
-/* Adjust m_currentPage if the index of the page deleted is less than
+d->m_allPages.removeAt(closeIndex);
-* current page
-*/
+// update the current page index if necessary
-if (closeIndex < d->m_currentPage )
+// (this will just update the index now that we've removed the page from the list)
-updateCurrentPageIndex = true;
+if(updateCurrentPageIndex) {
-}
+int index = d->m_allPages.indexOf(theCurrentPage);
+if(index >= 0)
-// actually delete the page from the list
+d->m_currentPage = index;
-d->m_allPages.removeAt(closeIndex);
+}
-// update the current page index if necessary
+// and emit sig that it was done
-// (this will just update the index now that we've removed the page from the list)
+emit pageDeleted(page);
-if(updateCurrentPageIndex) {
-int index = d->m_allPages.indexOf(theCurrentPage);
+delete page;
-if(index >= 0)
+}
-d->m_currentPage = index;
-}
-// and emit sig that it was done
-emit pageDeleted(page);
-delete page;
 }
 /*!
 *  Activate the given page as the current page
 *  @param page   page handle for setting current page
 disconnect(oldPage, 0, this, 0);
 disconnect(oldPage->mainFrame(), 0, this, 0);
 disconnect(oldPage->networkAccessManager(), 0, this, 0);
 disconnect(oldPage->loadController(), 0, this, 0);
 connect(oldPage, SIGNAL(createNewWindow(WrtBrowserContainer*)), this, SLOT(createWindow(WrtBrowserContainer*)));
+connect(oldPage, SIGNAL(loadFinished(bool)), SLOT(onLoadFinishedForBackgroundWindow(bool)));
 }
 // aggregate "current page" signalling from this page to PageMgr clients
 connect(page, SIGNAL(secureStateChange(int)), this, SLOT(secureStateChange(int)));
 connect( page->mainFrame(), SIGNAL ( titleChanged ( const QString& ) ), SIGNAL ( titleChanged ( const QString& ) ) );
 connect( page, SIGNAL( loadStarted() ), SIGNAL( loadStarted() ) );
 connect( page->mainFrame(), SIGNAL(initialLayoutCompleted() ), SIGNAL( initialLayoutCompleted() ) );
 connect( page, SIGNAL( loadProgress(int) ), SIGNAL( loadProgress(int) ) );
 connect( page, SIGNAL( loadFinished(bool) ), SLOT( onLoadFinished(bool) ) );
+connect( page, SIGNAL( databaseQuotaExceeded (QWebFrame *,QString) ), SLOT( onDatabaseQuotaExceeded (QWebFrame *,QString)) );
 connect( page->mainFrame(), SIGNAL( iconChanged() ), SIGNAL( pageIconChanged() ) );
 connect( page->loadController(), SIGNAL( pageLoadStarted() ), SIGNAL( pageLoadStarted() ) );
 connect( page->loadController(), SIGNAL( pageLoadFailed() ), SIGNAL( pageLoadFailed() ) );
 connect( page->loadController(), SIGNAL( pageLoadProgress(int) ), SIGNAL( pageLoadProgress(int) ) );
 connect( page->loadController(), SIGNAL( pageLoadFinished(bool) ), SIGNAL( pageLoadFinished(bool) ) );
 QTimer::singleShot(300, this, SLOT(updateHistory()));
 }
 else {
 emit(loadFinished(false));
 }
+}
+void WebPageController::onDatabaseQuotaExceeded (QWebFrame *frame, QString database)
+{
+	QString  dbdir = QWebSettings::offlineStoragePath ();
+QDir dir(dbdir);
+if(!dir.exists()||(dir.count() <= 1)) // empty DB
+	return;
+	if(frame)
+	{
+		QWebSecurityOrigin qwso = frame->securityOrigin();
+		qint64 quota = qwso.databaseQuota() ;
+		qint64 usage = qwso.databaseUsage() ;
+	}
+	m_promptMsg = "Database Quota Error";
+	emit databaseQuotaExceeded (frame, database);
+	return;
+}
+void WebPageController::onLoadFinishedForBackgroundWindow(bool ok)
+{
+if (!ok)
+return;
+WRT::WrtBrowserContainer* page = qobject_cast<WRT::WrtBrowserContainer*> (sender());
+if (page)
+page->setUpdateThumbnail(true);
 }
 void WebPageController::updateHistory()
 {
 BookmarksManager::getSingleton()->addHistory(currentDocUrl(), currentDocTitle());
 * @see WRT::WrtBrowserContainer
 */
 void WebPageController::processNetworkErrorUrl(const QUrl & url )
 {
 QString errorUrl = url.toString();
-QString currentUrl = currentDocUrl();
+QString requestedUrl = currentRequestedUrl();
 m_networkErrorUrl = url.toString();
-// TODO: may not necessary
-// Here we should be able to do various handling of the error url, such
+// Check if requestedUrl matches the URL from the network error
-// as comparing with QWebPage URL, ... etc
+// This is to resolve the problems when error popups occur when they shouldn't
+// especially during download.
+int matches = m_networkErrorUrl.compare(requestedUrl);
+if (matches == 0) m_bErrorUrlMatches = true;
 }
 //void QWEBKIT_EXPORT qt_drt_garbageCollector_collect();
 /*!
 */
 void WebPageController::updateStatePageLoading()
 {
 updateActions(true);
+// Reset to false for new page
+m_bErrorUrlMatches = false;
 // This is needed for loading a restored window (otherwise url bar is empty)
 currentPage()->loadController()->setUrlText(currentPage()->history()->currentItem().url().toString());
 }
 /*!
 */
 void WebPageController::updateActions(bool pageIsLoading)
 {
 d->m_actionReload->setEnabled(!pageIsLoading);
 d->m_actionStop->setEnabled(pageIsLoading);
 WRT::WrtBrowserContainer* activePage = currentPage();
 if(activePage) {
 int histLength = activePage->history()->count();
 int currItemIndex = activePage->history()->currentItemIndex();
 	return suggestList;
 }
 void WebPageController::loadLocalFile()
 	{
-QString chromeBaseDir = BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsString("ChromeBaseDirectory");
+QString chromeBaseDir = BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsString("LocalPagesBaseDirectory");
 QString startPage = BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsString("StartPage");
 QString startPagePath = chromeBaseDir + startPage;
 currentLoad(startPagePath);
 	}
 void WebPageController::loadInitialUrlFromOtherApp(QString url)
 {
 ActionJSObject *jso = new ActionJSObject(d->m_actionsParent, action);
 }
 }
 }
+bool WebPageController::removeDirectory(QDir &aDir)
+{
+		bool has_err = false;
+		if (aDir.exists())
+		{
+				QFileInfoList entries = aDir.entryInfoList(QDir::NoDotAndDotDot |
+				QDir::Dirs | QDir::Files);
+				int count = entries.size();
+				for (int idx = 0; ((idx < count) && (0 == has_err)); idx++)
+				{
+						QFileInfo entryInfo = entries[idx];
+						QString path = entryInfo.absoluteFilePath();
+						if (entryInfo.isDir())
+						{
+							QDir dir(path);
+							has_err = removeDirectory(dir);
+						}
+						else
+						{
+							QFile file(path);
+							if (!file.remove())
+							has_err = true;
+						}
+				}
+				if (!aDir.rmdir(aDir.absolutePath()))
+					has_err = true;
+		}
+		return(has_err);
+}
 void WebPageController::clearHistoryInMemory()
 {
 WRT::WrtBrowserContainer * activePage = currentPage();
 if(activePage)
 {
 }
 }
 void WebPageController::deleteCache()
 {
+QWebDatabase::removeAllDatabases();
+QString  str1 = QWebSettings::offlineStoragePath ();
+QString  str2 = QWebSettings::offlineWebApplicationCachePath ();
+QWebSettings * globalSettings = QWebSettings::globalSettings();
+QString  LocalStoragePath = globalSettings->localStoragePath();
+/*QString deleteFlag = d->m_historyDir + QLatin1String("/deleteOfflineStorage");
+QFile deleteFileFlag(deleteFlag);
+if(deleteFileFlag.open(QIODevice::WriteOnly)) { // create indicator that marks offline storage for deletion while next browser startup
+deleteFileFlag.close();
+}*/
+QDir LocalStorage(LocalStoragePath);
+removeDirectory(LocalStorage);
+QString applicationCacheFile = d->m_historyDir + QLatin1String("/ApplicationCache.db");
+QFile file(applicationCacheFile);
+if(file.open(QIODevice::ReadOnly)) {
+file.remove(); // may fail if file in usage; will be deleted in next browser startup
+file.close();
+}
 	  if ( !BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->value("DiskCacheEnabled").toBool() )
 			return;
 		QString diskCacheDir = BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->value("DiskCacheDirectoryPath").toString();
 }
 }
 void WebPageController::urlChanged(const QUrl& url)
 {
 //private slot
 QString urlString = partialUrl(url);
 emit partialUrlChanged(urlString);
 }
 QString WebPageController::partialUrl(const QUrl& url)
 {
 QString urlString = url.toString();
 QSize currSize = view->size().toSize();
 bool needRestore =  false;
 for (int i = 0; i < allPages()->count(); i++) {
 WRT::WrtBrowserContainer* page = allPages()->at(i);
 QWebHistoryItem item = page->history()->currentItem();
+WebPageData data = item.userData().value<WebPageData>();
-WebPageData data = item.userData().value<WebPageData>();
 // If not still a blank window, check whether we need to update the img
 if (!page->emptyWindow() ){
 QImage img = data.m_thumbnail;
+bool isSameMode = ( (img.size().width() > img.size().height()) == (currSize.width() > currSize.height()) );
-bool isSameMode = ( (img.size().width() > img.size().height()) == (currSize.width() > currSize.height()) );
+if (img.isNull() || !isSameMode) {
-if (img.isNull() || !isSameMode) {
+needRestore = true;
+view->setPage(page);
-qDebug() << "need new thumbnail!!!" << img.size() << ":" << currSize;
+page->setWebWidget(view);
-needRestore = true;
+QCoreApplication::sendEvent(view, new WebPageControllerUpdateViewPortEvent());
-view->setPage(page);
+page->savePageDataToHistoryItem(page->mainFrame(), &item);
-page->setWebWidget(view);
+page->setUpdateThumbnail(false);
-QCoreApplication::sendEvent(view, new WebPageControllerUpdateViewPortEvent());
+}
-page->savePageDataToHistoryItem(page->mainFrame(), &item);
+if (page->needUpdateThumbnail()) {
-}
+page->savePageDataToHistoryItem(page->mainFrame(), &item);
+page->setUpdateThumbnail(false);
+}
 }
 }
 // restore
-if (needRestore)
+if (needRestore) {
-{
 view->setPage(savedPage);
 savedPage->setWebWidget(view);
 }
 }
 void WebPageController::updatePageThumbnails()
 {
-// update current page's thumbnail forcely
+// update current page's thumbnail forcely since the scrolling position may change
 WRT::WrtBrowserContainer *page = currentPage();
 QWebHistoryItem item = page->history()->currentItem();
 page->savePageDataToHistoryItem(page->mainFrame(), &item);
+page->setUpdateThumbnail(false);
-WebPageData data = item.userData().value<WebPageData>();
 checkAndUpdatePageThumbnails();
 }
 void WebPageController::resizeAndUpdatePageThumbnails(QSize& s)
 {
 QString WebPageController::networkErrorUrl() {
 return m_networkErrorUrl;
 }
+bool WebPageController::errorUrlMatches() {
+return m_bErrorUrlMatches;
+}
+QString WebPageController::promptMsg() {
+return m_promptMsg;
+}
+QString WebPageController::promptReserved() {
+return m_promptReserved;
+}
 /*!
 \fn void WebPageController::pageCreated(WrtPage* newPage);
 emitted when a page is created
 */

changeset 6	1c3b8676e58c
parent 5	0f2326c2a325
child 10	232fbd5a2dcb