Attachment #42728 for bug #31249

View Details Raw Unified Return to Bug 31249



2009-11-08  Laszlo Gombos  <laszlo.1.gombos@nokia.com>

        Reviewed by NOBODY (OOPS!).

        [Qt] Remove the sessionStorage setting (per Page)
        https://bugs.webkit.org/show_bug.cgi?id=31249

        This setting allows to run sessionStorage on/off on a per page
        basis. Remove this prematurely exposed API.

        * Api/qwebsettings.cpp:
        (QWebSettingsPrivate::apply):
        (QWebSettings::QWebSettings):
        * tests/qwebpage/tst_qwebpage.cpp:
        (tst_QWebPage::database):
        (tst_QWebPage::testOptionalJSObjects):

2009-11-05  Shu Chang  <Chang.Shu@nokia.com>

        Reviewed by Tor Arne Vestbø.



        value = attributes.value(QWebSettings::LocalContentCanAccessRemoteUrls,
                                      global->attributes.value(QWebSettings::LocalContentCanAccessRemoteUrls));
        settings->setAllowUniversalAccessFromFileURLs(value);

        value = attributes.value(QWebSettings::SessionStorageEnabled,
                                    global->attributes.value(QWebSettings::SessionStorageEnabled));
        settings->setSessionStorageEnabled(value);
    } else {
        QList<QWebSettingsPrivate*> settings = *::allSettings();
        for (int i = 0; i < settings.count(); ++i)

    \value LocalStorageEnabled Specifies whether support for the HTML 5
        local storage feature is enabled or not. Disabled by default.
    \value LocalContentCanAccessRemoteUrls Specifies whether locally loaded documents are allowed to access remote urls.
    \value SessionStorageEnabled Specifies whether support for the HTML 5
        session storage feature is enabled or not. Enabled by default.                
*/

/*!

    d->attributes.insert(QWebSettings::OfflineWebApplicationCacheEnabled, false);
    d->attributes.insert(QWebSettings::LocalStorageEnabled, false);
    d->attributes.insert(QWebSettings::LocalContentCanAccessRemoteUrls, false);
    d->attributes.insert(QWebSettings::SessionStorageEnabled, true);
    d->offlineStorageDefaultQuota = 5 * 1024 * 1024;
    d->defaultTextEncoding = QLatin1String("iso-8859-1");
    d->printingMinimumShrinkFactor = 0.0f;



    QVERIFY(QWebSettings::offlineStorageDefaultQuota() == 1024 * 1024);

    m_page->settings()->setAttribute(QWebSettings::LocalStorageEnabled, true);
    m_page->settings()->setAttribute(QWebSettings::SessionStorageEnabled, true);
    m_page->settings()->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, true);

    QString dbFileName = path + "Databases.db";

    QCOMPARE(testFlag(webPage2, QWebSettings::LocalStorageEnabled, "localStorage", true),  true);
    QCOMPARE(testFlag(webPage1, QWebSettings::LocalStorageEnabled, "localStorage", false), false);
    QCOMPARE(testFlag(webPage2, QWebSettings::LocalStorageEnabled, "localStorage", false), true);

    QCOMPARE(testFlag(webPage1, QWebSettings::SessionStorageEnabled, "sessionStorage", false), false);
    QCOMPARE(testFlag(webPage2, QWebSettings::SessionStorageEnabled, "sessionStorage", true),  true);
    QCOMPARE(testFlag(webPage1, QWebSettings::SessionStorageEnabled, "sessionStorage", false), false);
    QCOMPARE(testFlag(webPage2, QWebSettings::SessionStorageEnabled, "sessionStorage", false), true);
}

void tst_QWebPage::testEnablePersistentStorage()

Return to Bug 31249

Lines 206-215 void QWebSettingsPrivate::apply() WebKit/qt/Api/qwebsettings.cpp_sec1
- WebKit/qt/Api/qwebsettings.cpp -7 lines
206	value = attributes.value(QWebSettings::LocalContentCanAccessRemoteUrls,	206	value = attributes.value(QWebSettings::LocalContentCanAccessRemoteUrls,
207	global->attributes.value(QWebSettings::LocalContentCanAccessRemoteUrls));	207	global->attributes.value(QWebSettings::LocalContentCanAccessRemoteUrls));
208	settings->setAllowUniversalAccessFromFileURLs(value);	208	settings->setAllowUniversalAccessFromFileURLs(value);
209
210	value = attributes.value(QWebSettings::SessionStorageEnabled,
211	global->attributes.value(QWebSettings::SessionStorageEnabled));
212	settings->setSessionStorageEnabled(value);
213	} else {	209	} else {
214	QList<QWebSettingsPrivate> settings = ::allSettings();	210	QList<QWebSettingsPrivate> settings = ::allSettings();
215	for (int i = 0; i < settings.count(); ++i)	211	for (int i = 0; i < settings.count(); ++i)
Lines 351-358 QWebSettings* QWebSettings::globalSettin WebKit/qt/Api/qwebsettings.cpp_sec2
351	\value LocalStorageEnabled Specifies whether support for the HTML 5	347	\value LocalStorageEnabled Specifies whether support for the HTML 5
352	local storage feature is enabled or not. Disabled by default.	348	local storage feature is enabled or not. Disabled by default.
353	\value LocalContentCanAccessRemoteUrls Specifies whether locally loaded documents are allowed to access remote urls.	349	\value LocalContentCanAccessRemoteUrls Specifies whether locally loaded documents are allowed to access remote urls.
354	\value SessionStorageEnabled Specifies whether support for the HTML 5
355	session storage feature is enabled or not. Enabled by default.
356	*/	350	*/
357		351
358	/*!	352	/*!
Lines 383-389 QWebSettings::QWebSettings() WebKit/qt/Api/qwebsettings.cpp_sec3
383	d->attributes.insert(QWebSettings::OfflineWebApplicationCacheEnabled, false);	377	d->attributes.insert(QWebSettings::OfflineWebApplicationCacheEnabled, false);
384	d->attributes.insert(QWebSettings::LocalStorageEnabled, false);	378	d->attributes.insert(QWebSettings::LocalStorageEnabled, false);
385	d->attributes.insert(QWebSettings::LocalContentCanAccessRemoteUrls, false);	379	d->attributes.insert(QWebSettings::LocalContentCanAccessRemoteUrls, false);
386	d->attributes.insert(QWebSettings::SessionStorageEnabled, true);
387	d->offlineStorageDefaultQuota = 5 * 1024 * 1024;	380	d->offlineStorageDefaultQuota = 5 * 1024 * 1024;
388	d->defaultTextEncoding = QLatin1String("iso-8859-1");	381	d->defaultTextEncoding = QLatin1String("iso-8859-1");
389	d->printingMinimumShrinkFactor = 0.0f;	382	d->printingMinimumShrinkFactor = 0.0f;

Lines 456-462 void tst_QWebPage::database() WebKit/qt/tests/qwebpage/tst_qwebpage.cpp_sec1
- WebKit/qt/tests/qwebpage/tst_qwebpage.cpp -6 lines
456	QVERIFY(QWebSettings::offlineStorageDefaultQuota() == 1024 * 1024);	456	QVERIFY(QWebSettings::offlineStorageDefaultQuota() == 1024 * 1024);
457		457
458	m_page->settings()->setAttribute(QWebSettings::LocalStorageEnabled, true);	458	m_page->settings()->setAttribute(QWebSettings::LocalStorageEnabled, true);
459	m_page->settings()->setAttribute(QWebSettings::SessionStorageEnabled, true);
460	m_page->settings()->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, true);	459	m_page->settings()->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, true);
461		460
462	QString dbFileName = path + "Databases.db";	461	QString dbFileName = path + "Databases.db";
Lines 1505-1515 void tst_QWebPage::testOptionalJSObjects WebKit/qt/tests/qwebpage/tst_qwebpage.cpp_sec2
1505	QCOMPARE(testFlag(webPage2, QWebSettings::LocalStorageEnabled, "localStorage", true), true);	1504	QCOMPARE(testFlag(webPage2, QWebSettings::LocalStorageEnabled, "localStorage", true), true);
1506	QCOMPARE(testFlag(webPage1, QWebSettings::LocalStorageEnabled, "localStorage", false), false);	1505	QCOMPARE(testFlag(webPage1, QWebSettings::LocalStorageEnabled, "localStorage", false), false);
1507	QCOMPARE(testFlag(webPage2, QWebSettings::LocalStorageEnabled, "localStorage", false), true);	1506	QCOMPARE(testFlag(webPage2, QWebSettings::LocalStorageEnabled, "localStorage", false), true);
1508
1509	QCOMPARE(testFlag(webPage1, QWebSettings::SessionStorageEnabled, "sessionStorage", false), false);
1510	QCOMPARE(testFlag(webPage2, QWebSettings::SessionStorageEnabled, "sessionStorage", true), true);
1511	QCOMPARE(testFlag(webPage1, QWebSettings::SessionStorageEnabled, "sessionStorage", false), false);
1512	QCOMPARE(testFlag(webPage2, QWebSettings::SessionStorageEnabled, "sessionStorage", false), true);
1513	}	1507	}
1514		1508
1515	void tst_QWebPage::testEnablePersistentStorage()	1509	void tst_QWebPage::testEnablePersistentStorage()

Lines 1-3 WebKit/qt/ChangeLog_sec1
- WebKit/qt/ChangeLog +17 lines
		1	2009-11-08 Laszlo Gombos <laszlo.1.gombos@nokia.com>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	[Qt] Remove the sessionStorage setting (per Page)
		6	https://bugs.webkit.org/show_bug.cgi?id=31249
		7
		8	This setting allows to run sessionStorage on/off on a per page
		9	basis. Remove this prematurely exposed API.
		10
		11	* Api/qwebsettings.cpp:
		12	(QWebSettingsPrivate::apply):
		13	(QWebSettings::QWebSettings):
		14	* tests/qwebpage/tst_qwebpage.cpp:
		15	(tst_QWebPage::database):
		16	(tst_QWebPage::testOptionalJSObjects):
		17
1	2009-11-05 Shu Chang <Chang.Shu@nokia.com>	18	2009-11-05 Shu Chang <Chang.Shu@nokia.com>
2		19
3	Reviewed by Tor Arne Vestbø.	20	Reviewed by Tor Arne Vestbø.