diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/WebKit/win/WebSecurityOrigin.cpp | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebKit/win/WebSecurityOrigin.cpp')
| -rw-r--r-- | Source/WebKit/win/WebSecurityOrigin.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Source/WebKit/win/WebSecurityOrigin.cpp b/Source/WebKit/win/WebSecurityOrigin.cpp index 61fcadf33..6d54c2b82 100644 --- a/Source/WebKit/win/WebSecurityOrigin.cpp +++ b/Source/WebKit/win/WebSecurityOrigin.cpp @@ -31,11 +31,7 @@ #include "WebKitDLL.h" #include <WebCore/BString.h> -#include <WebCore/DatabaseTracker.h> - -#if !ENABLE(SQL_DATABASE) -#include <wtf/UnusedParam.h> -#endif +#include <WebCore/DatabaseManager.h> using namespace WebCore; @@ -134,7 +130,7 @@ HRESULT STDMETHODCALLTYPE WebSecurityOrigin::usage( if (!result) return E_POINTER; - *result = DatabaseTracker::tracker().usageForOrigin(m_securityOrigin.get()); + *result = DatabaseManager::manager().usageForOrigin(m_securityOrigin.get()); return S_OK; #else @@ -150,7 +146,7 @@ HRESULT STDMETHODCALLTYPE WebSecurityOrigin::quota( if (!result) return E_POINTER; - *result = DatabaseTracker::tracker().quotaForOrigin(m_securityOrigin.get()); + *result = DatabaseManager::manager().quotaForOrigin(m_securityOrigin.get()); return S_OK; #else UNUSED_PARAM(result); @@ -162,7 +158,7 @@ HRESULT STDMETHODCALLTYPE WebSecurityOrigin::setQuota( /* [in] */ unsigned long long quota) { #if ENABLE(SQL_DATABASE) - DatabaseTracker::tracker().setQuota(m_securityOrigin.get(), quota); + DatabaseManager::manager().setQuota(m_securityOrigin.get(), quota); return S_OK; #else |