diff options
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 168 | ||||
| -rw-r--r-- | webkit/build/port/port.vcproj | 12 | ||||
| -rw-r--r-- | webkit/build/webkit_common_includes.vsprops | 4 | ||||
| -rw-r--r-- | webkit/port/page/inspector/InspectorController.cpp | 21 | ||||
| -rw-r--r-- | webkit/port/storage/DatabaseTracker.cpp | 89 | ||||
| -rw-r--r-- | webkit/port/storage/OriginQuotaManager.cpp | 60 | ||||
| -rw-r--r-- | webkit/webkit.sln | 9 |
7 files changed, 361 insertions, 2 deletions
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index 3340c09..624efa7 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -1184,6 +1184,18 @@ RelativePath="..\..\pending\FileSystemWin.cpp" > </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\win\MutexWin.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\win\ThreadConditionWin.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\win\ThreadingWin.cpp" + > + </File> </Filter> <Filter Name="text" @@ -1381,6 +1393,50 @@ > </File> </Filter> + <Filter + Name="sql" + > + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\sql\SQLiteAuthorizer.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\sql\SQLiteAuthorizer.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\sql\SQLiteDatabase.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\sql\SQLiteDatabase.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\sql\SQLiteStatement.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\sql\SQLiteStatement.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\sql\SQLiteTransaction.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\sql\SQLiteTransaction.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\sql\SQLValue.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\sql\SQLValue.h" + > + </File> + </Filter> </Filter> <Filter Name="css" @@ -5701,6 +5757,118 @@ <Filter Name="storage" > + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\storage\ChangeVersionWrapper.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\storage\ChangeVersionWrapper.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\storage\Database.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\storage\Database.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\storage\DatabaseAuthorizer.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\storage\DatabaseAuthorizer.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\storage\DatabaseDetails.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\storage\DatabaseTask.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\storage\DatabaseTask.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\storage\DatabaseThread.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\storage\DatabaseThread.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\storage\DatabaseTracker.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\storage\DatabaseTrackerClient.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\storage\OriginQuotaManager.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\storage\OriginUsageRecord.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\storage\SQLError.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\storage\SQLResultSet.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\storage\SQLResultSet.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\storage\SQLResultSetRowList.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\storage\SQLResultSetRowList.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\storage\SQLStatement.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\storage\SQLStatement.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\storage\SQLStatementCallback.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\storage\SQLStatementErrorCallback.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\storage\SQLTransaction.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\storage\SQLTransaction.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\storage\SQLTransactionCallback.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\storage\SQLTransactionErrorCallback.h" + > + </File> </Filter> <Filter Name="plugins" diff --git a/webkit/build/port/port.vcproj b/webkit/build/port/port.vcproj index 7c08873..a213e33 100644 --- a/webkit/build/port/port.vcproj +++ b/webkit/build/port/port.vcproj @@ -1180,6 +1180,18 @@ > </File> </Filter> + <Filter + Name="storage" + > + <File + RelativePath="..\..\port\storage\DatabaseTracker.cpp" + > + </File> + <File + RelativePath="..\..\port\storage\OriginQuotaManager.cpp" + > + </File> + </Filter> </Files> <Globals> </Globals> diff --git a/webkit/build/webkit_common_includes.vsprops b/webkit/build/webkit_common_includes.vsprops index 202ae85..99b8539 100644 --- a/webkit/build/webkit_common_includes.vsprops +++ b/webkit/build/webkit_common_includes.vsprops @@ -6,7 +6,7 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(OutDir)\obj\WebCore";"$(OutDir)\obj\WebCore\JavaScriptHeaders";"$(OutDir)\obj\WebCore\JavaScriptHeaders\JavaScriptCore";..\..\pending\;..\..\pending\kjs;..\..\pending\wtf;..\..\port\bridge;..\..\port\css;..\..\port\dom;..\..\port\history;..\..\port\loader;..\..\port\page;..\..\port\platform;..\..\port\platform\image-decoders;..\..\port\platform\image-decoders\bmp;..\..\port\platform\image-decoders\gif;..\..\port\platform\image-decoders\ico;..\..\port\platform\image-decoders\jpeg;..\..\port\platform\image-decoders\png;..\..\port\platform\image-decoders\xbm;..\..\port\platform\network;..\..\port\plugins;..\..\port\rendering;..\..\;"$(ProjectDir)";..\..\..\third_party\WebKit\WebCore\;..\..\..\third_party\WebKit\WebCore\bridge;..\..\..\third_party\WebKit\WebCore\css;..\..\..\third_party\WebKit\WebCore\dom;..\..\..\third_party\WebKit\WebCore\editing;..\..\..\third_party\WebKit\WebCore\history;..\..\..\third_party\WebKit\WebCore\html;..\..\..\third_party\WebKit\WebCore\loader;..\..\..\third_party\WebKit\WebCore\loader\icon;..\..\..\third_party\WebKit\WebCore\page;..\..\..\third_party\WebKit\WebCore\platform;..\..\..\third_party\WebKit\WebCore\platform\text;..\..\..\third_party\WebKit\WebCore\platform\graphics;..\..\port\platform\graphics;..\..\..\third_party\WebKit\WebCore\svg\graphics;..\..\..\third_party\WebKit\WebCore\platform\network;..\..\..\third_party\WebKit\WebCore\platform\sql;..\..\..\third_party\WebKit\WebCore\platform\network\win;..\..\..\third_party\WebKit\WebCore\rendering;..\..\..\third_party\WebKit\WebCore\storage;..\..\..\third_party\WebKit\WebCore\xml;..\..\..\third_party\WebKit\WebCore;"..\..\..\third_party\WebKit\WebCore\os-win32";..\..\..\third_party\WebKit\WebCore\wtf;..\..\..\third_party\WebKit\JavaScriptCore;..\..\..\third_party\WebKit\JavaScriptCore\wtf;"..\..\..\third_party\WebKit\JavaScriptCore\os-win32";..\..\build;"$(SDKIncludes)";"$(IntDir)\..\WebCore\DerivedSources";..\..\..\third_party\WebKit\WebCore\svg;..\..\..\third_party\WebKit\WebCore\svg\graphics\filters;..\..\..\third_party\WebKit\WebCore\plugins" - PreprocessorDefinitions="ENABLE_CROSS_DOCUMENT_MESSAGING=1;ENABLE_XSLT=1;ENABLE_XPATH=1;ENABLE_SVG=1;ENABLE_SVG_AS_IMAGE=1;ENABLE_SVG_USE=1;ENABLE_SVG_FOREIGN_OBJECT=1;ENABLE_SVG_FONTS=1;ANDROID_CANVAS_IMPL=1;WEBCORE_NAVIGATOR_PLATFORM="\"Win32\"";USE_GOOGLE_URL_LIBRARY;CRASH=__debugbreak" + AdditionalIncludeDirectories=""$(OutDir)\obj\WebCore";"$(OutDir)\obj\WebCore\JavaScriptHeaders";"$(OutDir)\obj\WebCore\JavaScriptHeaders\JavaScriptCore";..\..\pending\;..\..\pending\kjs;..\..\pending\wtf;..\..\port\bridge;..\..\port\css;..\..\port\dom;..\..\port\history;..\..\port\loader;..\..\port\page;..\..\port\platform;..\..\port\platform\image-decoders;..\..\port\platform\image-decoders\bmp;..\..\port\platform\image-decoders\gif;..\..\port\platform\image-decoders\ico;..\..\port\platform\image-decoders\jpeg;..\..\port\platform\image-decoders\png;..\..\port\platform\image-decoders\xbm;..\..\port\platform\network;..\..\port\plugins;..\..\port\rendering;..\..\;"$(ProjectDir)";..\..\..\third_party\WebKit\WebCore\;..\..\..\third_party\WebKit\WebCore\bridge;..\..\..\third_party\WebKit\WebCore\css;..\..\..\third_party\WebKit\WebCore\dom;..\..\..\third_party\WebKit\WebCore\editing;..\..\..\third_party\WebKit\WebCore\history;..\..\..\third_party\WebKit\WebCore\html;..\..\..\third_party\WebKit\WebCore\loader;..\..\..\third_party\WebKit\WebCore\loader\icon;..\..\..\third_party\WebKit\WebCore\page;..\..\..\third_party\WebKit\WebCore\platform;..\..\..\third_party\WebKit\WebCore\platform\text;..\..\..\third_party\WebKit\WebCore\platform\graphics;..\..\port\platform\graphics;..\..\..\third_party\WebKit\WebCore\svg\graphics;..\..\..\third_party\WebKit\WebCore\platform\network;..\..\..\third_party\WebKit\WebCore\platform\sql;..\..\..\third_party\WebKit\WebCore\platform\network\win;..\..\..\third_party\WebKit\WebCore\rendering;..\..\..\third_party\WebKit\WebCore\storage;..\..\..\third_party\WebKit\WebCore\xml;..\..\..\third_party\WebKit\WebCore;"..\..\..\third_party\WebKit\WebCore\os-win32";..\..\..\third_party\WebKit\WebCore\wtf;..\..\..\third_party\WebKit\JavaScriptCore;..\..\..\third_party\WebKit\JavaScriptCore\wtf;"..\..\..\third_party\WebKit\JavaScriptCore\os-win32";..\..\build;"$(SDKIncludes)";"$(IntDir)\..\WebCore\DerivedSources";..\..\..\third_party\WebKit\WebCore\svg;..\..\..\third_party\WebKit\WebCore\svg\graphics\filters;..\..\..\third_party\WebKit\WebCore\plugins;..\..\..\third_party\sqlite" + PreprocessorDefinitions="ENABLE_DATABASE=1;ENABLE_CROSS_DOCUMENT_MESSAGING=1;ENABLE_XSLT=1;ENABLE_XPATH=1;ENABLE_SVG=1;ENABLE_SVG_AS_IMAGE=1;ENABLE_SVG_USE=1;ENABLE_SVG_FOREIGN_OBJECT=1;ENABLE_SVG_FONTS=1;ANDROID_CANVAS_IMPL=1;WEBCORE_NAVIGATOR_PLATFORM="\"Win32\"";USE_GOOGLE_URL_LIBRARY;CRASH=__debugbreak" /> </VisualStudioPropertySheet> diff --git a/webkit/port/page/inspector/InspectorController.cpp b/webkit/port/page/inspector/InspectorController.cpp index a34ad33..35c052f 100644 --- a/webkit/port/page/inspector/InspectorController.cpp +++ b/webkit/port/page/inspector/InspectorController.cpp @@ -89,10 +89,15 @@ #endif #include <wtf/RefCounted.h> +// TODO(aa): Implement database inspection and remove this macro. +#define ENABLE_DATABASE_INSPECTION 0 + #if ENABLE(DATABASE) #include "Database.h" +#if ENABLE_DATABASE_INSPECTION #include "JSDatabase.h" #endif +#endif #if USE(JAVASCRIPTCORE_BINDINGS) using namespace KJS; @@ -477,6 +482,7 @@ protected: #if ENABLE(DATABASE) struct InspectorDatabaseResource : public RefCounted<InspectorDatabaseResource> { +#if ENABLE_DATABASE_INSPECTION static PassRefPtr<InspectorDatabaseResource> create(Database* database, const String& domain, const String& name, const String& version) { // Apple changed the default refcount to 1: http://trac.webkit.org/changeset/30406 @@ -518,6 +524,7 @@ private: , scriptObject(0) { } +#endif }; #endif @@ -908,6 +915,7 @@ void InspectorController::search(Node* node, const String& target) { #endif #if ENABLE(DATABASE) +#if ENABLE_DATABASE_INSPECTION static JSValueRef databaseTableNames(JSContextRef ctx, JSObjectRef /*function*/, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) { InspectorController* controller = reinterpret_cast<InspectorController*>(JSObjectGetPrivate(thisObject)); @@ -962,6 +970,7 @@ static JSValueRef databaseTableNames(JSContextRef ctx, JSObjectRef /*function*/, return result; } #endif +#endif #if USE(JAVASCRIPTCORE_BINDINGS) static JSValueRef inspectedWindow(JSContextRef ctx, JSObjectRef /*function*/, JSObjectRef thisObject, size_t /*argumentCount*/, const JSValueRef[] /*arguments[]*/, JSValueRef* /*exception*/) @@ -1447,8 +1456,10 @@ void InspectorController::windowScriptObjectAvailable() { "detach", detach, kJSPropertyAttributeNone }, { "search", search, kJSPropertyAttributeNone }, #if ENABLE(DATABASE) +#if ENABLE_DATABASE_INSPECTION { "databaseTableNames", databaseTableNames, kJSPropertyAttributeNone }, #endif +#endif { "inspectedWindow", inspectedWindow, kJSPropertyAttributeNone }, { "localizedStringsURL", localizedStrings, kJSPropertyAttributeNone }, { "platform", platform, kJSPropertyAttributeNone }, @@ -2193,10 +2204,12 @@ void InspectorController::populateScriptObjects() addScriptConsoleMessage(m_consoleMessages[i]); #if ENABLE(DATABASE) +#if ENABLE_DATABASE_INSPECTION DatabaseResourcesSet::iterator databasesEnd = m_databaseResources.end(); for (DatabaseResourcesSet::iterator it = m_databaseResources.begin(); it != databasesEnd; ++it) addDatabaseScriptResource((*it).get()); #endif +#endif } #elif USE(V8_BINDING) void InspectorController::populateScriptObjects() @@ -2212,6 +2225,7 @@ void InspectorController::populateScriptObjects() #endif #if ENABLE(DATABASE) +#if ENABLE_DATABASE_INSPECTION JSObjectRef InspectorController::addDatabaseScriptResource(InspectorDatabaseResource* resource) { ASSERT_ARG(resource, resource); @@ -2306,6 +2320,7 @@ void InspectorController::removeDatabaseScriptResource(InspectorDatabaseResource HANDLE_EXCEPTION(exception); } #endif +#endif #if USE(JAVASCRIPTCORE_BINDINGS) void InspectorController::addScriptConsoleMessage(const ConsoleMessage* message) @@ -2434,12 +2449,14 @@ void InspectorController::resetScriptObjects() } #if ENABLE(DATABASE) +#if ENABLE_DATABASE_INSPECTION DatabaseResourcesSet::iterator databasesEnd = m_databaseResources.end(); for (DatabaseResourcesSet::iterator it = m_databaseResources.begin(); it != databasesEnd; ++it) { InspectorDatabaseResource* resource = (*it).get(); resource->setScriptObject(0, 0); } #endif +#endif #if USE(JAVASCRIPTCORE_BINDINGS) callSimpleFunction(m_scriptContext, m_scriptObject, "reset"); @@ -2486,8 +2503,10 @@ void InspectorController::didCommitLoad(DocumentLoader* loader) m_consoleMessages.clear(); #if ENABLE(DATABASE) +#if ENABLE_DATABASE_INSPECTION m_databaseResources.clear(); #endif +#endif if (windowVisible()) { resetScriptObjects(); @@ -2729,6 +2748,7 @@ void InspectorController::resourceRetrievedByXMLHttpRequest(unsigned long identi #if ENABLE(DATABASE) void InspectorController::didOpenDatabase(Database* database, const String& domain, const String& name, const String& version) { +#if ENABLE_DATABASE_INSPECTION if (!enabled()) return; @@ -2738,6 +2758,7 @@ void InspectorController::didOpenDatabase(Database* database, const String& doma if (windowVisible()) addDatabaseScriptResource(resource.get()); +#endif } #endif diff --git a/webkit/port/storage/DatabaseTracker.cpp b/webkit/port/storage/DatabaseTracker.cpp new file mode 100644 index 0000000..e4e1ccb --- /dev/null +++ b/webkit/port/storage/DatabaseTracker.cpp @@ -0,0 +1,89 @@ +/* + * Copyright (C) 2007, 2008 Apple Inc. 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. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY APPLE 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 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 "DatabaseTracker.h" +#include "OriginQuotaManager.h" + +using namespace std; + +namespace WebCore { + +OriginQuotaManager& DatabaseTracker::originQuotaManager() +{ + return *m_quotaManager; +} + +DatabaseTracker& DatabaseTracker::tracker() +{ + static DatabaseTracker tracker; + return tracker; +} + +DatabaseTracker::DatabaseTracker() + : m_client(0) + , m_proposedDatabase(0) +#ifndef NDEBUG + , m_thread(currentThread()) +#endif +{ +} + +bool DatabaseTracker::canEstablishDatabase(Document* document, const String& name, const String& displayName, unsigned long estimatedSize) +{ + return true; +} + +String DatabaseTracker::fullPathForDatabase(SecurityOrigin* origin, const String& name, bool createIfNotExists) +{ + return ""; +} + +void DatabaseTracker::setDatabaseDetails(SecurityOrigin* origin, const String& name, const String& displayName, unsigned long estimatedSize) +{ +} + +void DatabaseTracker::addOpenDatabase(Database* database) +{ +} + +void DatabaseTracker::removeOpenDatabase(Database* database) +{ +} + +unsigned long long DatabaseTracker::quotaForOrigin(SecurityOrigin* origin) +{ + return 0; +} + +void DatabaseTracker::scheduleNotifyDatabaseChanged(SecurityOrigin* origin, const String& name) +{ +} + + +} // namespace WebCore diff --git a/webkit/port/storage/OriginQuotaManager.cpp b/webkit/port/storage/OriginQuotaManager.cpp new file mode 100644 index 0000000..d069bc1 --- /dev/null +++ b/webkit/port/storage/OriginQuotaManager.cpp @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2008 Apple Inc. 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. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY APPLE 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 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 "OriginQuotaManager.h" + +#include "Database.h" +#include "OriginUsageRecord.h" + +namespace WebCore { + +OriginQuotaManager::OriginQuotaManager() +{ +} + +void OriginQuotaManager::lock() +{ + m_usageRecordGuard.lock(); +} + +void OriginQuotaManager::unlock() +{ + m_usageRecordGuard.unlock(); +} + +void OriginQuotaManager::markDatabase(Database* database) +{ +} + +unsigned long long OriginQuotaManager::diskUsage(SecurityOrigin* origin) const +{ + return 0; +} + + +} diff --git a/webkit/webkit.sln b/webkit/webkit.sln index 989f326..e240e0c 100644 --- a/webkit/webkit.sln +++ b/webkit/webkit.sln @@ -20,6 +20,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebCore", "build\WebCore\We ProjectSection(ProjectDependencies) = postProject {2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673} {2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {2F7EDFA2-EE27-4D83-8454-9EFBD5779203} + {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "V8Config", "build\JSConfig\V8Config.vcproj", "{2E2D3301-2EC4-4C0F-B889-87073B30F673}" @@ -28,6 +29,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Port", "build\port\port.vcp ProjectSection(ProjectDependencies) = postProject {2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673} {2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {2F7EDFA2-EE27-4D83-8454-9EFBD5779203} + {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "webkit (readonly)", "webkit (readonly)", "{1DFD10B5-A673-4C3A-BA1D-3546FC4B7740}" @@ -208,6 +210,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v8_snapshot", "..\v8\tools\ {EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "..\third_party\sqlite\sqlite.vcproj", "{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -286,6 +290,10 @@ Global {625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Debug|Win32.Build.0 = Debug|Win32 {625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Release|Win32.ActiveCfg = Release|Win32 {625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Release|Win32.Build.0 = Release|Win32 + {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Debug|Win32.ActiveCfg = Debug|Win32 + {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Debug|Win32.Build.0 = Debug|Win32 + {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Release|Win32.ActiveCfg = Release|Win32 + {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Release|Win32.Build.0 = Release|Win32 {7100F41F-868D-4E99-80A2-AF8E6574749D}.Debug|Win32.ActiveCfg = Debug|Win32 {7100F41F-868D-4E99-80A2-AF8E6574749D}.Debug|Win32.Build.0 = Debug|Win32 {7100F41F-868D-4E99-80A2-AF8E6574749D}.Release|Win32.ActiveCfg = Release|Win32 @@ -398,6 +406,7 @@ Global {5916D37D-8C97-424F-A904-74E52594C2D6} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D} {60B43839-95E6-4526-A661-209F16335E0E} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D} {625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D} + {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B} {7100F41F-868D-4E99-80A2-AF8E6574749D} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B} {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B} {865575D0-37E2-405E-8CBA-5F6C485B5A26} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B} |