Attachment #81103 for bug #52296

View Details Raw Unified Return to Bug 52296

| Differences between



2011-02-03  Kundu Suchismita  <suchi.kundu@nokia.com>

        Reviewed by NOBODY (OOPS!).

        Local Storage settings can be enable/disable from "Develop" menu
        https://bugs.webkit.org/show_bug.cgi?id=52296

        * QtTestBrowser/launcherwindow.cpp:
        (LauncherWindow::createChrome):
        (LauncherWindow::toggleLocalStorage):
        (LauncherWindow::toggleOfflineStorageDatabase):
        (LauncherWindow::toggleOfflineWebApplicationCache):
        (LauncherWindow::setOfflineStorageDefaultQuota):
        * QtTestBrowser/launcherwindow.h:
        (WindowOptions::WindowOptions):
        * QtTestBrowser/main.cpp:
        (LauncherApplication::handleUserOptions):

2011-01-22  Robert Hogan  <robert@webkit.org>

        Reviewed by Kenneth Rohde Christiansen.




    toolsMenu->addSeparator();

    QAction* toggleLocalStorage = toolsMenu->addAction("Enable Local Storage", this, SLOT(toggleLocalStorage(bool)));
    toggleLocalStorage->setCheckable(true);
    toggleLocalStorage->setChecked(m_windowOptions.useLocalStorage);

    QAction* toggleOfflineStorageDatabase = toolsMenu->addAction("Enable Offline Storage Database", this, SLOT(toggleOfflineStorageDatabase(bool)));
    toggleOfflineStorageDatabase->setCheckable(true);
    toggleOfflineStorageDatabase->setChecked(m_windowOptions.useOfflineStorageDatabase);

    QAction* toggleOfflineWebApplicationCache = toolsMenu->addAction("Enable Offline Web Application Cache", this, SLOT(toggleOfflineWebApplicationCache(bool)));
    toggleOfflineWebApplicationCache->setCheckable(true);
    toggleOfflineWebApplicationCache->setChecked(m_windowOptions.useOfflineWebApplicationCache);

    QAction* offlineStorageDefaultQuotaAction = toolsMenu->addAction("Set Offline Storage Default Quota Size", this, SLOT(setOfflineStorageDefaultQuota()));
    offlineStorageDefaultQuotaAction->setCheckable(true);
    offlineStorageDefaultQuotaAction->setChecked(m_windowOptions.offlineStorageDefaultQuotaSize);

    toolsMenu->addSeparator();

    QAction* userAgentAction = toolsMenu->addAction("Change User Agent", this, SLOT(showUserAgentDialog()));
    userAgentAction->setShortcut(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_U));


#endif
}

void LauncherWindow::toggleLocalStorage(bool toggle)
{
    m_windowOptions.useLocalStorage = toggle;
    page()->settings()->setAttribute(QWebSettings::LocalStorageEnabled, toggle);
}

void LauncherWindow::toggleOfflineStorageDatabase(bool toggle)
{
    m_windowOptions.useOfflineStorageDatabase = toggle;
    page()->settings()->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, toggle);
}

void LauncherWindow::toggleOfflineWebApplicationCache(bool toggle)
{
    m_windowOptions.useOfflineWebApplicationCache = toggle;
    page()->settings()->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled, toggle);
}

void LauncherWindow::setOfflineStorageDefaultQuota()
{
    // For command line execution, quota size is taken from command line.   
    if (m_windowOptions.offlineStorageDefaultQuotaSize)
        page()->settings()->setOfflineStorageDefaultQuota(m_windowOptions.offlineStorageDefaultQuotaSize);
    else {
        bool ok;
        // Maximum size is set to 25 * 1024 * 1024.
        int quotaSize = QInputDialog::getInt(this, "Offline Storage Default Quota Size" , "Quota Size", 0, 0, 26214400, 1, &ok);
        if (ok) 
            page()->settings()->setOfflineStorageDefaultQuota(quotaSize);
    }
}

LauncherWindow* LauncherWindow::newWindow()
{
    LauncherWindow* mw = new LauncherWindow(&m_windowOptions);

Lines 94-99 public: Tools/QtTestBrowser/launcherwindow.h_sec1
- Tools/QtTestBrowser/launcherwindow.h +13 lines
94	, showFrameRate(false)	94	, showFrameRate(false)
95	, resizesToContents(false)	95	, resizesToContents(false)
96	, viewportUpdateMode(QGraphicsView::MinimalViewportUpdate)	96	, viewportUpdateMode(QGraphicsView::MinimalViewportUpdate)
		97	, useLocalStorage(false)
		98	, useOfflineStorageDatabase(false)
		99	, useOfflineWebApplicationCache(false)
		100	, offlineStorageDefaultQuotaSize(0)
97	#if defined(QT_CONFIGURED_WITH_OPENGL)	101	#if defined(QT_CONFIGURED_WITH_OPENGL)
98	, useQGLWidgetViewport(false)	102	, useQGLWidgetViewport(false)
99	#endif	103	#endif
Lines 115-120 public: Tools/QtTestBrowser/launcherwindow.h_sec2
115	#endif	119	#endif
116	QUrl inspectorUrl;	120	QUrl inspectorUrl;
117	quint16 remoteInspectorPort;	121	quint16 remoteInspectorPort;
		122	bool useLocalStorage;
		123	bool useOfflineStorageDatabase;
		124	bool useOfflineWebApplicationCache;
		125	quint64 offlineStorageDefaultQuotaSize;
118	};	126	};
119		127
120	class LauncherWindow : public MainWindow {	128	class LauncherWindow : public MainWindow {
Lines 163-169 protected slots: Tools/QtTestBrowser/launcherwindow.h_sec3
163	void toggleFrameFlattening(bool toggle);	171	void toggleFrameFlattening(bool toggle);
164	void toggleInterruptingJavaScriptEnabled(bool enable);	172	void toggleInterruptingJavaScriptEnabled(bool enable);
165	void toggleJavascriptCanOpenWindows(bool enable);	173	void toggleJavascriptCanOpenWindows(bool enable);
		174	void toggleLocalStorage(bool toggle);
		175	void toggleOfflineStorageDatabase(bool toggle);
		176	void toggleOfflineWebApplicationCache(bool toggle);
		177	void setOfflineStorageDefaultQuota();
		178
166	#if defined(QT_CONFIGURED_WITH_OPENGL)	179	#if defined(QT_CONFIGURED_WITH_OPENGL)
167	void toggleQGLWidgetViewport(bool enable);	180	void toggleQGLWidgetViewport(bool enable);
168	#endif	181	#endif



    }
    
    if (args.contains("-local-storage-enabled"))
        windowOptions.useLocalStorage = true;
        
    if (args.contains("-offline-storage-database-enabled"))
        windowOptions.useOfflineStorageDatabase = true;

    if (args.contains("-offline-web-application-cache-enabled"))   
        windowOptions.useOfflineWebApplicationCache = true;
    
    int setOfflineStorageDefaultQuotaIndex = args.indexOf("-set-offline-storage-default-quota");
    if (setOfflineStorageDefaultQuotaIndex != -1) {
        unsigned int maxSize = takeOptionValue(&args, setOfflineStorageDefaultQuotaIndex).toUInt();
        windowOptions.offlineStorageDefaultQuotaSize = maxSize;
    }   
    
    if (defaultForAnimations)

Return to Bug 52296

Lines 259-264 void LauncherWindow::createChrome() Tools/QtTestBrowser/launcherwindow.cpp_sec1
- Tools/QtTestBrowser/launcherwindow.cpp +50 lines
259		259
260	toolsMenu->addSeparator();	260	toolsMenu->addSeparator();
261		261
		262	QAction* toggleLocalStorage = toolsMenu->addAction("Enable Local Storage", this, SLOT(toggleLocalStorage(bool)));
		263	toggleLocalStorage->setCheckable(true);
		264	toggleLocalStorage->setChecked(m_windowOptions.useLocalStorage);
		265
		266	QAction* toggleOfflineStorageDatabase = toolsMenu->addAction("Enable Offline Storage Database", this, SLOT(toggleOfflineStorageDatabase(bool)));
		267	toggleOfflineStorageDatabase->setCheckable(true);
		268	toggleOfflineStorageDatabase->setChecked(m_windowOptions.useOfflineStorageDatabase);
		269
		270	QAction* toggleOfflineWebApplicationCache = toolsMenu->addAction("Enable Offline Web Application Cache", this, SLOT(toggleOfflineWebApplicationCache(bool)));
		271	toggleOfflineWebApplicationCache->setCheckable(true);
		272	toggleOfflineWebApplicationCache->setChecked(m_windowOptions.useOfflineWebApplicationCache);
		273
		274	QAction* offlineStorageDefaultQuotaAction = toolsMenu->addAction("Set Offline Storage Default Quota Size", this, SLOT(setOfflineStorageDefaultQuota()));
		275	offlineStorageDefaultQuotaAction->setCheckable(true);
		276	offlineStorageDefaultQuotaAction->setChecked(m_windowOptions.offlineStorageDefaultQuotaSize);
		277
		278	toolsMenu->addSeparator();
		279
262	QAction* userAgentAction = toolsMenu->addAction("Change User Agent", this, SLOT(showUserAgentDialog()));	280	QAction* userAgentAction = toolsMenu->addAction("Change User Agent", this, SLOT(showUserAgentDialog()));
263	userAgentAction->setShortcut(QKeySequence(Qt::CTRL \| Qt::SHIFT \| Qt::Key_U));	281	userAgentAction->setShortcut(QKeySequence(Qt::CTRL \| Qt::SHIFT \| Qt::Key_U));
264		282
Lines 874-879 void LauncherWindow::updateFPS(int fps) Tools/QtTestBrowser/launcherwindow.cpp_sec2
874	#endif	892	#endif
875	}	893	}
876		894
		895	void LauncherWindow::toggleLocalStorage(bool toggle)
		896	{
		897	m_windowOptions.useLocalStorage = toggle;
		898	page()->settings()->setAttribute(QWebSettings::LocalStorageEnabled, toggle);
		899	}
		900
		901	void LauncherWindow::toggleOfflineStorageDatabase(bool toggle)
		902	{
		903	m_windowOptions.useOfflineStorageDatabase = toggle;
		904	page()->settings()->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, toggle);
		905	}
		906
		907	void LauncherWindow::toggleOfflineWebApplicationCache(bool toggle)
		908	{
		909	m_windowOptions.useOfflineWebApplicationCache = toggle;
		910	page()->settings()->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled, toggle);
		911	}
		912
		913	void LauncherWindow::setOfflineStorageDefaultQuota()
		914	{
		915	// For command line execution, quota size is taken from command line.
		916	if (m_windowOptions.offlineStorageDefaultQuotaSize)
		917	page()->settings()->setOfflineStorageDefaultQuota(m_windowOptions.offlineStorageDefaultQuotaSize);
		918	else {
		919	bool ok;
		920	// Maximum size is set to 25 * 1024 * 1024.
		921	int quotaSize = QInputDialog::getInt(this, "Offline Storage Default Quota Size" , "Quota Size", 0, 0, 26214400, 1, &ok);
		922	if (ok)
		923	page()->settings()->setOfflineStorageDefaultQuota(quotaSize);
		924	}
		925	}
		926
877	LauncherWindow* LauncherWindow::newWindow()	927	LauncherWindow* LauncherWindow::newWindow()
878	{	928	{
879	LauncherWindow* mw = new LauncherWindow(&m_windowOptions);	929	LauncherWindow* mw = new LauncherWindow(&m_windowOptions);

Lines 1-3 Tools/ChangeLog_sec1
- Tools/ChangeLog +18 lines
		1	2011-02-03 Kundu Suchismita <suchi.kundu@nokia.com>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	Local Storage settings can be enable/disable from "Develop" menu
		6	https://bugs.webkit.org/show_bug.cgi?id=52296
		7
		8	* QtTestBrowser/launcherwindow.cpp:
		9	(LauncherWindow::createChrome):
		10	(LauncherWindow::toggleLocalStorage):
		11	(LauncherWindow::toggleOfflineStorageDatabase):
		12	(LauncherWindow::toggleOfflineWebApplicationCache):
		13	(LauncherWindow::setOfflineStorageDefaultQuota):
		14	* QtTestBrowser/launcherwindow.h:
		15	(WindowOptions::WindowOptions):
		16	* QtTestBrowser/main.cpp:
		17	(LauncherApplication::handleUserOptions):
		18
1	2011-01-22 Robert Hogan <robert@webkit.org>	19	2011-01-22 Robert Hogan <robert@webkit.org>
2		20
3	Reviewed by Kenneth Rohde Christiansen.	21	Reviewed by Kenneth Rohde Christiansen.

Lines 164-181 void LauncherApplication::handleUserOpti Tools/QtTestBrowser/main.cpp_sec1
- Tools/QtTestBrowser/main.cpp -5 / +5 lines
164	}	164	}
165		165
166	if (args.contains("-local-storage-enabled"))	166	if (args.contains("-local-storage-enabled"))
167	QWebSettings::globalSettings()->setAttribute(QWebSettings::LocalStorageEnabled, true);	167	windowOptions.useLocalStorage = true;
168		168
169	if (args.contains("-offline-storage-database-enabled"))	169	if (args.contains("-offline-storage-database-enabled"))
170	QWebSettings::globalSettings()->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, true);	170	windowOptions.useOfflineStorageDatabase = true;
171		171
172	if (args.contains("-offline-web-application-cache-enabled"))	172	if (args.contains("-offline-web-application-cache-enabled"))
173	QWebSettings::globalSettings()->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled, true);	173	windowOptions.useOfflineWebApplicationCache = true;
174		174
175	int setOfflineStorageDefaultQuotaIndex = args.indexOf("-set-offline-storage-default-quota");	175	int setOfflineStorageDefaultQuotaIndex = args.indexOf("-set-offline-storage-default-quota");
176	if (setOfflineStorageDefaultQuotaIndex != -1) {	176	if (setOfflineStorageDefaultQuotaIndex != -1) {
177	int maxSize = takeOptionValue(&args, setOfflineStorageDefaultQuotaIndex).toInt();	177	unsigned int maxSize = takeOptionValue(&args, setOfflineStorageDefaultQuotaIndex).toUInt();
178	QWebSettings::globalSettings()->setOfflineStorageDefaultQuota(maxSize);	178	windowOptions.offlineStorageDefaultQuotaSize = maxSize;
179	}	179	}
180		180
181	if (defaultForAnimations)	181	if (defaultForAnimations)