Attachment #148997 for bug #89666

View Details Raw Unified Return to Bug 89666

| Differences between



2012-06-22  Szilard Ledan  <szledan@inf.u-szeged.hu>

        [Qt] Added a new API in the WebKit namespace
        for the WebKitTestRunner, which sets the DataDirectory.
        https://bugs.webkit.org/show_bug.cgi?id=89666

        Reviewed by NOBODY (OOPS!).

        I have renamed defaultDataLocation to persistentDataLocation.
        From now, with setPersistentDataLocation() we can set which
        directory should be used by WebKitTestRunner instead of the
        default one. Hence, parallelly run WKTRs don't use the same
        DataLocation.

        * Shared/qt/QtPersistentDataLocation.cpp: Renamed from Source/WebKit2/Shared/qt/QtDefaultDataLocation.cpp.
        (WebKit):
        (WebKit::globalDataLocation):
        (WebKit::persistentDataLocation):
        (WebKit::setPersistentDataLocation):
        * Shared/qt/QtPersistentDataLocation.h: Renamed from Source/WebKit2/Shared/qt/QtDefaultDataLocation.h.
        (WebKit):
        * Target.pri:
        * UIProcess/Plugins/qt/PluginProcessProxyQt.cpp:
        (WebKit::cacheFile):
        * UIProcess/qt/WebContextQt.cpp:
        (WebKit::defaultDiskCacheDirectory):
        (WebKit::WebContext::platformInitializeWebProcess):
        (WebKit::WebContext::platformDefaultDatabaseDirectory):
        (WebKit::WebContext::platformDefaultIconDatabasePath):
        (WebKit::WebContext::platformDefaultLocalStorageDirectory):

2012-06-21  Christophe Dumez  <christophe.dumez@intel.com>

        [WK2] Add C API to inspect a Web Intent



/*
 * Copyright (C) 2012 Apple Inc. All rights reserved.
 * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
 * Copyright (C) 2012 University of Szeged.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGE.
 */

#include "config.h"
#include "QtDefaultDataLocation.h"

#include <QCoreApplication>
#include <QDir>
#include <QStandardPaths>
#include <QStringBuilder>
#include <WebCore/FileSystem.h>

namespace WebKit {

QString defaultDataLocation()
{
    static QString s_dataLocation;

    if (!s_dataLocation.isEmpty())
        return s_dataLocation;

    QString dataLocation = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
    if (dataLocation.isEmpty())
        dataLocation = QDir::homePath() % QDir::separator() % QCoreApplication::applicationName();
    s_dataLocation = dataLocation % QDir::separator() % QStringLiteral(".QtWebKit") % QDir::separator();
    QDir::root().mkpath(s_dataLocation);

    return s_dataLocation;
}

}



/*
 * Copyright (C) 2012 Apple Inc. All rights reserved.
 * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
 * Copyright (C) 2012 University of Szeged.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGE.
 */

#ifndef QtDefaultDataLocation_h
#define QtDefaultDataLocation_h

#include <QString>

namespace WebKit {

QString defaultDataLocation();

}

#endif



/*
 * Copyright (C) 2012 Apple Inc. All rights reserved.
 * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
 * Copyright (C) 2012 University of Szeged.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGE.
 */

#include "config.h"
#include "QtPersistentDataLocation.h"

#include <QCoreApplication>
#include <QDir>
#include <QStandardPaths>
#include <QStringBuilder>
#include <WebCore/FileSystem.h>
#include <qwebkitglobal.h>
#include <wtf/StdLibExtras.h>

namespace WebKit {

QString& globalDataLocation()
{
    DEFINE_STATIC_LOCAL(QString, dataLocation, ());
    return dataLocation;
}

QString persistentDataLocation()
{
    QString& persistentDataLocation = globalDataLocation();

    if (!persistentDataLocation.isEmpty())
        return persistentDataLocation;

    QString dataLocation = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
    if (dataLocation.isEmpty())
        dataLocation = QDir::homePath() % QDir::separator() % QCoreApplication::applicationName();
    persistentDataLocation = dataLocation % QDir::separator() % QStringLiteral(".QtWebKit") % QDir::separator();
    QDir::root().mkpath(persistentDataLocation);

    return persistentDataLocation;
}

QWEBKIT_EXPORT void setPersistentDataLocation(QString dataLocation)
{
    QString& persistentDataLocation = globalDataLocation();

    ASSERT(persistentDataLocation.isNull());
    persistentDataLocation = dataLocation;
}

}



/*
 * Copyright (C) 2012 Apple Inc. All rights reserved.
 * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
 * Copyright (C) 2012 University of Szeged.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGE.
 */

#ifndef QtPersistentDataLocation_h
#define QtPersistentDataLocation_h

#include <QString>
#include <qwebkitglobal.h>

namespace WebKit {

QString persistentDataLocation();

// It is private api for WebKitTestRunner
QWEBKIT_EXPORT void setPersistentDataLocation(QString);

}

#endif



    Shared/qt/ArgumentCodersQt.h \
    Shared/qt/PlatformCertificateInfo.h \
    Shared/qt/WebEventFactoryQt.h \
    Shared/qt/QtPersistentDataLocation.h \
    Shared/qt/QtNetworkReplyData.h \
    Shared/qt/QtNetworkRequestData.h \
    UIProcess/API/C/WKAPICast.h \

    Shared/qt/ProcessExecutablePathQt.cpp \
    Shared/qt/WebCoreArgumentCodersQt.cpp \
    Shared/qt/WebEventFactoryQt.cpp \
    Shared/qt/QtPersistentDataLocation.cpp \
    Shared/qt/QtNetworkReplyData.cpp \
    Shared/qt/QtNetworkRequestData.cpp \
    Shared/qt/WebURLRequestQt.cpp \



#if ENABLE(PLUGIN_PROCESS)

#include "ProcessExecutablePath.h"
#include "QtPersistentDataLocation.h"
#include <QByteArray>
#include <QCoreApplication>
#include <QDateTime>


static PassOwnPtr<QFile> cacheFile()
{
    static QString cacheFilePath = persistentDataLocation() % QStringLiteral("plugin_meta_data.json");
    return adoptPtr(new QFile(cacheFilePath));
}





#include "ApplicationCacheStorage.h"
#include "FileSystem.h"
#include "QtPersistentDataLocation.h"
#include "WKSharedAPICast.h"
#if ENABLE(GEOLOCATION)
#include "WebGeolocationProviderQt.h"

    if (!s_defaultDiskCacheDirectory.isEmpty())
        return s_defaultDiskCacheDirectory;

    s_defaultDiskCacheDirectory = WebCore::pathByAppendingComponent(persistentDataLocation(), "cache/");
    WebCore::makeAllDirectories(s_defaultDiskCacheDirectory);
    return s_defaultDiskCacheDirectory;
}

void WebContext::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
{
    qRegisterMetaType<QProcess::ExitStatus>("QProcess::ExitStatus");
    parameters.cookieStorageDirectory = persistentDataLocation();
    parameters.diskCacheDirectory = defaultDiskCacheDirectory();
#if ENABLE(GEOLOCATION)
    static WebGeolocationProviderQt* location = WebGeolocationProviderQt::create(toAPI(geolocationManagerProxy()));

    if (!s_defaultDatabaseDirectory.isEmpty())
        return s_defaultDatabaseDirectory;

    s_defaultDatabaseDirectory = persistentDataLocation() + QLatin1String("Databases");
    QDir().mkpath(s_defaultDatabaseDirectory);
    return s_defaultDatabaseDirectory;
}

String WebContext::platformDefaultIconDatabasePath() const
{
    return persistentDataLocation() + QLatin1String("WebpageIcons.db");
}

String WebContext::platformDefaultLocalStorageDirectory() const

    if (!s_defaultLocalStorageDirectory.isEmpty())
        return s_defaultLocalStorageDirectory;

    s_defaultLocalStorageDirectory = persistentDataLocation() + QLatin1String("LocalStorage");
    QDir().mkpath(s_defaultLocalStorageDirectory);
    return s_defaultLocalStorageDirectory;
}



2012-06-22  Szilard Ledan  <szledan@inf.u-szeged.hu>

        [Qt] The WebKitTestRunner uses the default LocalStorage
        directory.If ther is the DUMPRENDERTREE_TEMP environment
        variables, use that, instead of the default.
        https://bugs.webkit.org/show_bug.cgi?id=89666

        Reviewed by NOBODY (OOPS!).

        * WebKitTestRunner/qt/TestControllerQt.cpp:
        (WTR::TestController::platformInitialize):

2012-06-22  Zoltan Horvath  <zoltan@webkit.org>

        [Qt] Allow DumpRenderTree to dump about:blank

Lines 28-44 a/Tools/WebKitTestRunner/qt/TestControllerQt.cpp_sec1
- a/Tools/WebKitTestRunner/qt/TestControllerQt.cpp -2 / +6 lines
28	#include "TestController.h"	28	#include "TestController.h"
29		29
30	#include "PlatformWebView.h"	30	#include "PlatformWebView.h"
		31	#include "QtPersistentDataLocation.h"
31	#include "WKStringQt.h"	32	#include "WKStringQt.h"
32		33
33	#include <cstdlib>
34	#include <QCoreApplication>	34	#include <QCoreApplication>
35	#include <QElapsedTimer>	35	#include <QElapsedTimer>
36	#include <QEventLoop>	36	#include <QEventLoop>
37	#include <QFileInfo>	37	#include <QFileInfo>
38	#include <QLibrary>	38	#include <QLibrary>
39	#include <QObject>	39	#include <QObject>
40	#include <qquickwebview_p.h>	40	#include <QStandardPaths>
41	#include <QtGlobal>	41	#include <QtGlobal>
		42	#include <cstdlib>
		43	#include <qquickwebview_p.h>
42	#include <wtf/Platform.h>	44	#include <wtf/Platform.h>
43	#include <wtf/text/WTFString.h>	45	#include <wtf/text/WTFString.h>
44		46
Lines 51-56 void TestController::notifyDone() a/Tools/WebKitTestRunner/qt/TestControllerQt.cpp_sec2
51	void TestController::platformInitialize()	53	void TestController::platformInitialize()
52	{	54	{
53	QQuickWebView::platformInitialize();	55	QQuickWebView::platformInitialize();
		56	if (!qgetenv("DUMPRENDERTREE_TEMP").isNull())
		57	WebKit::setPersistentDataLocation(qgetenv("DUMPRENDERTREE_TEMP"));
54	}	58	}
55		59
56	void TestController::platformRunUntil(bool& condition, double timeout)	60	void TestController::platformRunUntil(bool& condition, double timeout)

Return to Bug 89666

Lines 1-3 a/Source/WebKit2/ChangeLog_sec1
- a/Source/WebKit2/ChangeLog +31 lines
		1	2012-06-22 Szilard Ledan <szledan@inf.u-szeged.hu>
		2
		3	[Qt] Added a new API in the WebKit namespace
		4	for the WebKitTestRunner, which sets the DataDirectory.
		5	https://bugs.webkit.org/show_bug.cgi?id=89666
		6
		7	Reviewed by NOBODY (OOPS!).
		8
		9	I have renamed defaultDataLocation to persistentDataLocation.
		10	From now, with setPersistentDataLocation() we can set which
		11	directory should be used by WebKitTestRunner instead of the
		12	default one. Hence, parallelly run WKTRs don't use the same
		13	DataLocation.
		14
		15	* Shared/qt/QtPersistentDataLocation.cpp: Renamed from Source/WebKit2/Shared/qt/QtDefaultDataLocation.cpp.
		16	(WebKit):
		17	(WebKit::globalDataLocation):
		18	(WebKit::persistentDataLocation):
		19	(WebKit::setPersistentDataLocation):
		20	* Shared/qt/QtPersistentDataLocation.h: Renamed from Source/WebKit2/Shared/qt/QtDefaultDataLocation.h.
		21	(WebKit):
		22	* Target.pri:
		23	* UIProcess/Plugins/qt/PluginProcessProxyQt.cpp:
		24	(WebKit::cacheFile):
		25	* UIProcess/qt/WebContextQt.cpp:
		26	(WebKit::defaultDiskCacheDirectory):
		27	(WebKit::WebContext::platformInitializeWebProcess):
		28	(WebKit::WebContext::platformDefaultDatabaseDirectory):
		29	(WebKit::WebContext::platformDefaultIconDatabasePath):
		30	(WebKit::WebContext::platformDefaultLocalStorageDirectory):
		31
1	2012-06-21 Christophe Dumez <christophe.dumez@intel.com>	32	2012-06-21 Christophe Dumez <christophe.dumez@intel.com>
2		33
3	[WK2] Add C API to inspect a Web Intent	34	[WK2] Add C API to inspect a Web Intent

Lines 1-55 a/Source/WebKit2/Shared/qt/QtDefaultDataLocation.cpp_sec1
- a/Source/WebKit2/Shared/qt/QtDefaultDataLocation.cpp -55 lines
1	/*
2	* Copyright (C) 2012 Apple Inc. All rights reserved.
3	* Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
4	* Copyright (C) 2012 University of Szeged. All rights reserved.
5	*
6	* Redistribution and use in source and binary forms, with or without
7	* modification, are permitted provided that the following conditions
8	* are met:
9	* 1. Redistributions of source code must retain the above copyright
10	* notice, this list of conditions and the following disclaimer.
11	* 2. Redistributions in binary form must reproduce the above copyright
12	* notice, this list of conditions and the following disclaimer in the
13	* documentation and/or other materials provided with the distribution.
14	*
15	* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS AS IS''
16	* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
17	* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
18	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
19	* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
20	* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
21	* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
22	* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
23	* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
24	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
25	* THE POSSIBILITY OF SUCH DAMAGE.
26	*/
27
28	#include "config.h"
29	#include "QtDefaultDataLocation.h"
30
31	#include <QCoreApplication>
32	#include <QDir>
33	#include <QStandardPaths>
34	#include <QStringBuilder>
35	#include <WebCore/FileSystem.h>
36
37	namespace WebKit {
38
39	QString defaultDataLocation()
40	{
41	static QString s_dataLocation;
42
43	if (!s_dataLocation.isEmpty())
44	return s_dataLocation;
45
46	QString dataLocation = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
47	if (dataLocation.isEmpty())
48	dataLocation = QDir::homePath() % QDir::separator() % QCoreApplication::applicationName();
49	s_dataLocation = dataLocation % QDir::separator() % QStringLiteral(".QtWebKit") % QDir::separator();
50	QDir::root().mkpath(s_dataLocation);
51
52	return s_dataLocation;
53	}
54
55	}

Line 0 a/Source/WebKit2/Shared/qt/QtPersistentDataLocation.cpp_sec1
- a/Source/WebKit2/Shared/qt/QtPersistentDataLocation.cpp +71 lines
		1	/*
		2	* Copyright (C) 2012 Apple Inc. All rights reserved.
		3	* Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
		4	* Copyright (C) 2012 University of Szeged. All rights reserved.
		5	*
		6	* Redistribution and use in source and binary forms, with or without
		7	* modification, are permitted provided that the following conditions
		8	* are met:
		9	* 1. Redistributions of source code must retain the above copyright
		10	* notice, this list of conditions and the following disclaimer.
		11	* 2. Redistributions in binary form must reproduce the above copyright
		12	* notice, this list of conditions and the following disclaimer in the
		13	* documentation and/or other materials provided with the distribution.
		14	*
		15	* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS AS IS''
		16	* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
		17	* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
		18	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
		19	* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
		20	* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
		21	* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
		22	* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
		23	* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
		24	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
		25	* THE POSSIBILITY OF SUCH DAMAGE.
		26	*/
		27
		28	#include "config.h"
		29	#include "QtPersistentDataLocation.h"
		30
		31	#include <QCoreApplication>
		32	#include <QDir>
		33	#include <QStandardPaths>
		34	#include <QStringBuilder>
		35	#include <WebCore/FileSystem.h>
		36	#include <qwebkitglobal.h>
		37	#include <wtf/StdLibExtras.h>
		38
		39	namespace WebKit {
		40
		41	QString& globalDataLocation()
		42	{
		43	DEFINE_STATIC_LOCAL(QString, dataLocation, ());
		44	return dataLocation;
		45	}
		46
		47	QString persistentDataLocation()
		48	{
		49	QString& persistentDataLocation = globalDataLocation();
		50
		51	if (!persistentDataLocation.isEmpty())
		52	return persistentDataLocation;
		53
		54	QString dataLocation = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
		55	if (dataLocation.isEmpty())
		56	dataLocation = QDir::homePath() % QDir::separator() % QCoreApplication::applicationName();
		57	persistentDataLocation = dataLocation % QDir::separator() % QStringLiteral(".QtWebKit") % QDir::separator();
		58	QDir::root().mkpath(persistentDataLocation);
		59
		60	return persistentDataLocation;
		61	}
		62
		63	QWEBKIT_EXPORT void setPersistentDataLocation(QString dataLocation)
		64	{
65	QString& persistentDataLocation = globalDataLocation();
66
67	ASSERT(persistentDataLocation.isNull());
68	persistentDataLocation = dataLocation;
69	}
70
71	}

Lines 139-145 HEADERS += \ a/Source/WebKit2/Target.pri_sec1
- a/Source/WebKit2/Target.pri -2 / +2 lines
139	Shared/qt/ArgumentCodersQt.h \	139	Shared/qt/ArgumentCodersQt.h \
140	Shared/qt/PlatformCertificateInfo.h \	140	Shared/qt/PlatformCertificateInfo.h \
141	Shared/qt/WebEventFactoryQt.h \	141	Shared/qt/WebEventFactoryQt.h \
142	Shared/qt/QtDefaultDataLocation.h \	142	Shared/qt/QtPersistentDataLocation.h \
143	Shared/qt/QtNetworkReplyData.h \	143	Shared/qt/QtNetworkReplyData.h \
144	Shared/qt/QtNetworkRequestData.h \	144	Shared/qt/QtNetworkRequestData.h \
145	UIProcess/API/C/WKAPICast.h \	145	UIProcess/API/C/WKAPICast.h \
Lines 499-505 SOURCES += \ a/Source/WebKit2/Target.pri_sec2
499	Shared/qt/ProcessExecutablePathQt.cpp \	499	Shared/qt/ProcessExecutablePathQt.cpp \
500	Shared/qt/WebCoreArgumentCodersQt.cpp \	500	Shared/qt/WebCoreArgumentCodersQt.cpp \
501	Shared/qt/WebEventFactoryQt.cpp \	501	Shared/qt/WebEventFactoryQt.cpp \
502	Shared/qt/QtDefaultDataLocation.cpp \	502	Shared/qt/QtPersistentDataLocation.cpp \
503	Shared/qt/QtNetworkReplyData.cpp \	503	Shared/qt/QtNetworkReplyData.cpp \
504	Shared/qt/QtNetworkRequestData.cpp \	504	Shared/qt/QtNetworkRequestData.cpp \
505	Shared/qt/WebURLRequestQt.cpp \	505	Shared/qt/WebURLRequestQt.cpp \

Lines 29-35 a/Source/WebKit2/UIProcess/Plugins/qt/PluginProcessProxyQt.cpp_sec1
- a/Source/WebKit2/UIProcess/Plugins/qt/PluginProcessProxyQt.cpp -2 / +2 lines
29	#if ENABLE(PLUGIN_PROCESS)	29	#if ENABLE(PLUGIN_PROCESS)
30		30
31	#include "ProcessExecutablePath.h"	31	#include "ProcessExecutablePath.h"
32	#include "QtDefaultDataLocation.h"	32	#include "QtPersistentDataLocation.h"
33	#include <QByteArray>	33	#include <QByteArray>
34	#include <QCoreApplication>	34	#include <QCoreApplication>
35	#include <QDateTime>	35	#include <QDateTime>
Lines 57-63 void PluginProcessProxy::platformInitializePluginProcess(PluginProcessCreationPa a/Source/WebKit2/UIProcess/Plugins/qt/PluginProcessProxyQt.cpp_sec2
57		57
58	static PassOwnPtr<QFile> cacheFile()	58	static PassOwnPtr<QFile> cacheFile()
59	{	59	{
60	static QString cacheFilePath = defaultDataLocation() % QStringLiteral("plugin_meta_data.json");	60	static QString cacheFilePath = persistentDataLocation() % QStringLiteral("plugin_meta_data.json");
61	return adoptPtr(new QFile(cacheFilePath));	61	return adoptPtr(new QFile(cacheFilePath));
62	}	62	}
63		63

Lines 29-35 a/Source/WebKit2/UIProcess/qt/WebContextQt.cpp_sec1
- a/Source/WebKit2/UIProcess/qt/WebContextQt.cpp -6 / +6 lines
29		29
30	#include "ApplicationCacheStorage.h"	30	#include "ApplicationCacheStorage.h"
31	#include "FileSystem.h"	31	#include "FileSystem.h"
32	#include "QtDefaultDataLocation.h"	32	#include "QtPersistentDataLocation.h"
33	#include "WKSharedAPICast.h"	33	#include "WKSharedAPICast.h"
34	#if ENABLE(GEOLOCATION)	34	#if ENABLE(GEOLOCATION)
35	#include "WebGeolocationProviderQt.h"	35	#include "WebGeolocationProviderQt.h"
Lines 51-57 static String defaultDiskCacheDirectory() a/Source/WebKit2/UIProcess/qt/WebContextQt.cpp_sec2
51	if (!s_defaultDiskCacheDirectory.isEmpty())	51	if (!s_defaultDiskCacheDirectory.isEmpty())
52	return s_defaultDiskCacheDirectory;	52	return s_defaultDiskCacheDirectory;
53		53
54	s_defaultDiskCacheDirectory = WebCore::pathByAppendingComponent(defaultDataLocation(), "cache/");	54	s_defaultDiskCacheDirectory = WebCore::pathByAppendingComponent(persistentDataLocation(), "cache/");
55	WebCore::makeAllDirectories(s_defaultDiskCacheDirectory);	55	WebCore::makeAllDirectories(s_defaultDiskCacheDirectory);
56	return s_defaultDiskCacheDirectory;	56	return s_defaultDiskCacheDirectory;
57	}	57	}
Lines 64-70 String WebContext::applicationCacheDirectory() a/Source/WebKit2/UIProcess/qt/WebContextQt.cpp_sec3
64	void WebContext::platformInitializeWebProcess(WebProcessCreationParameters& parameters)	64	void WebContext::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
65	{	65	{
66	qRegisterMetaType<QProcess::ExitStatus>("QProcess::ExitStatus");	66	qRegisterMetaType<QProcess::ExitStatus>("QProcess::ExitStatus");
67	parameters.cookieStorageDirectory = defaultDataLocation();	67	parameters.cookieStorageDirectory = persistentDataLocation();
68	parameters.diskCacheDirectory = defaultDiskCacheDirectory();	68	parameters.diskCacheDirectory = defaultDiskCacheDirectory();
69	#if ENABLE(GEOLOCATION)	69	#if ENABLE(GEOLOCATION)
70	static WebGeolocationProviderQt* location = WebGeolocationProviderQt::create(toAPI(geolocationManagerProxy()));	70	static WebGeolocationProviderQt* location = WebGeolocationProviderQt::create(toAPI(geolocationManagerProxy()));
Lines 81-94 String WebContext::platformDefaultDatabaseDirectory() const a/Source/WebKit2/UIProcess/qt/WebContextQt.cpp_sec4
81	if (!s_defaultDatabaseDirectory.isEmpty())	81	if (!s_defaultDatabaseDirectory.isEmpty())
82	return s_defaultDatabaseDirectory;	82	return s_defaultDatabaseDirectory;
83		83
84	s_defaultDatabaseDirectory = defaultDataLocation() + QLatin1String("Databases");	84	s_defaultDatabaseDirectory = persistentDataLocation() + QLatin1String("Databases");
85	QDir().mkpath(s_defaultDatabaseDirectory);	85	QDir().mkpath(s_defaultDatabaseDirectory);
86	return s_defaultDatabaseDirectory;	86	return s_defaultDatabaseDirectory;
87	}	87	}
88		88
89	String WebContext::platformDefaultIconDatabasePath() const	89	String WebContext::platformDefaultIconDatabasePath() const
90	{	90	{
91	return defaultDataLocation() + QLatin1String("WebpageIcons.db");	91	return persistentDataLocation() + QLatin1String("WebpageIcons.db");
92	}	92	}
93		93
94	String WebContext::platformDefaultLocalStorageDirectory() const	94	String WebContext::platformDefaultLocalStorageDirectory() const
Lines 96-102 String WebContext::platformDefaultLocalStorageDirectory() const a/Source/WebKit2/UIProcess/qt/WebContextQt.cpp_sec5
96	if (!s_defaultLocalStorageDirectory.isEmpty())	96	if (!s_defaultLocalStorageDirectory.isEmpty())
97	return s_defaultLocalStorageDirectory;	97	return s_defaultLocalStorageDirectory;
98		98
99	s_defaultLocalStorageDirectory = defaultDataLocation() + QLatin1String("LocalStorage");	99	s_defaultLocalStorageDirectory = persistentDataLocation() + QLatin1String("LocalStorage");
100	QDir().mkpath(s_defaultLocalStorageDirectory);	100	QDir().mkpath(s_defaultLocalStorageDirectory);
101	return s_defaultLocalStorageDirectory;	101	return s_defaultLocalStorageDirectory;
102	}	102	}

Lines 1-3 a/Tools/ChangeLog_sec1
- a/Tools/ChangeLog +12 lines
		1	2012-06-22 Szilard Ledan <szledan@inf.u-szeged.hu>
		2
		3	[Qt] The WebKitTestRunner uses the default LocalStorage
		4	directory.If ther is the DUMPRENDERTREE_TEMP environment
		5	variables, use that, instead of the default.
		6	https://bugs.webkit.org/show_bug.cgi?id=89666
		7
		8	Reviewed by NOBODY (OOPS!).
		9
		10	* WebKitTestRunner/qt/TestControllerQt.cpp:
		11	(WTR::TestController::platformInitialize):
		12
1	2012-06-22 Zoltan Horvath <zoltan@webkit.org>	13	2012-06-22 Zoltan Horvath <zoltan@webkit.org>
2		14
3	[Qt] Allow DumpRenderTree to dump about:blank	15	[Qt] Allow DumpRenderTree to dump about:blank