Changeset 109833 in webkit


Ignore:
Timestamp:
Mar 5, 2012 6:30:28 PM (12 years ago)
Author:
abarth@webkit.org
Message:

WorkerContext shouldn't need to know about SQLDatabase
​https://bugs.webkit.org/show_bug.cgi?id=80352

Reviewed by Eric Seidel.

This patch removes the SQLDatabase functions from WorkerContext in
preparation for moving the SQLDatabase code into a module. These
functions don't interact with the rest of WorkerContext.

  • CMakeLists.txt:
  • DerivedSources.make:
  • DerivedSources.pri:
  • GNUmakefile.list.am:
  • Target.pri:
  • WebCore.gypi:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • storage/DOMWindowSQLDatabase.cpp:
  • storage/WorkerContextSQLDatabase.cpp: Added.

(WebCore):
(WebCore::WorkerContextSQLDatabase::openDatabase):
(WebCore::WorkerContextSQLDatabase::openDatabaseSync):

  • storage/WorkerContextSQLDatabase.h: Added.

(WebCore):
(WorkerContextSQLDatabase):
(WebCore::WorkerContextSQLDatabase::WorkerContextSQLDatabase):
(WebCore::WorkerContextSQLDatabase::~WorkerContextSQLDatabase):

  • storage/WorkerContextSQLDatabase.idl: Added.
  • workers/WorkerContext.cpp:

(WebCore):

  • workers/WorkerContext.h:

(WebCore):
(WorkerContext):

  • workers/WorkerContext.idl:
Location:
trunk/Source/WebCore
Files:
13 edited
3 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/CMakeLists.txt

    r109798 r109833  
    14381438    storage/StorageSyncManager.cpp
    14391439    storage/StorageTracker.cpp
     1440    storage/WorkerContextSQLDatabase.cpp
    14401441
    14411442    xml/DOMParser.cpp
    … …  
    15251526        storage/SQLTransactionSync.idl
    15261527        storage/SQLTransactionSyncCallback.idl
     1528        storage/WorkerContextSQLDatabase.idl
    15271529    )
    15281530ENDIF ()

  • trunk/Source/WebCore/ChangeLog

    r109832 r109833  
     12012-03-05  Adam Barth  <abarth@webkit.org>
     2
     3        WorkerContext shouldn't need to know about SQLDatabase
     4        https://bugs.webkit.org/show_bug.cgi?id=80352
     5
     6        Reviewed by Eric Seidel.
     7
     8        This patch removes the SQLDatabase functions from WorkerContext in
     9        preparation for moving the SQLDatabase code into a module.  These
     10        functions don't interact with the rest of WorkerContext.
     11
     12        * CMakeLists.txt:
     13        * DerivedSources.make:
     14        * DerivedSources.pri:
     15        * GNUmakefile.list.am:
     16        * Target.pri:
     17        * WebCore.gypi:
     18        * WebCore.vcproj/WebCore.vcproj:
     19        * WebCore.xcodeproj/project.pbxproj:
     20        * storage/DOMWindowSQLDatabase.cpp:
     21        * storage/WorkerContextSQLDatabase.cpp: Added.
     22        (WebCore):
     23        (WebCore::WorkerContextSQLDatabase::openDatabase):
     24        (WebCore::WorkerContextSQLDatabase::openDatabaseSync):
     25        * storage/WorkerContextSQLDatabase.h: Added.
     26        (WebCore):
     27        (WorkerContextSQLDatabase):
     28        (WebCore::WorkerContextSQLDatabase::WorkerContextSQLDatabase):
     29        (WebCore::WorkerContextSQLDatabase::~WorkerContextSQLDatabase):
     30        * storage/WorkerContextSQLDatabase.idl: Added.
     31        * workers/WorkerContext.cpp:
     32        (WebCore):
     33        * workers/WorkerContext.h:
     34        (WebCore):
     35        (WorkerContext):
     36        * workers/WorkerContext.idl:
     37
    1382012-03-05  Kenichi Ishibashi  <bashi@chromium.org>
    239

  • trunk/Source/WebCore/DerivedSources.make

    r109798 r109833  
    387387    $(WebCore)/storage/StorageInfoQuotaCallback.idl \
    388388    $(WebCore)/storage/StorageInfoUsageCallback.idl \
     389    $(WebCore)/storage/WorkerContextSQLDatabase.idl \
    389390    $(WebCore)/svg/ElementTimeControl.idl \
    390391    $(WebCore)/svg/SVGAElement.idl \

  • trunk/Source/WebCore/DerivedSources.pri

    r109798 r109833  
    409409    $$PWD/storage/SQLTransactionSync.idl \
    410410    $$PWD/storage/SQLTransactionSyncCallback.idl \
     411    $$PWD/storage/WorkerContextSQLDatabase.idl \
    411412    $$PWD/testing/Internals.idl \
    412413    $$PWD/testing/InternalSettings.idl \

  • trunk/Source/WebCore/GNUmakefile.list.am

    r109798 r109833  
    40064006        Source/WebCore/storage/StorageTracker.h \
    40074007        Source/WebCore/storage/StorageTrackerClient.h \
     4008        Source/WebCore/storage/WorkerContextSQLDatabase.cpp \
     4009        Source/WebCore/storage/WorkerContextSQLDatabase.h \
    40084010        Source/WebCore/svg/animation/SMILTimeContainer.cpp \
    40094011        Source/WebCore/svg/animation/SMILTimeContainer.h \

  • trunk/Source/WebCore/Target.pri

    r109798 r109833  
    13191319    storage/StorageSyncManager.cpp \
    13201320    storage/StorageTracker.cpp \
     1321    storage/WorkerContextSQLDatabase.cpp \
    13211322    testing/Internals.cpp \
    13221323    testing/InternalSettings.cpp \
    … …  
    25492550    storage/StorageTracker.h \
    25502551    storage/StorageTrackerClient.h \
     2552    storage/WorkerContextSQLDatabase.h \
    25512553    svg/animation/SMILTimeContainer.h \
    25522554    svg/animation/SMILTime.h \

  • trunk/Source/WebCore/WebCore.gypi

    r109798 r109833  
    10801080            'storage/StorageInfoQuotaCallback.idl',
    10811081            'storage/StorageInfoUsageCallback.idl',
     1082            'storage/WorkerContextSQLDatabase.idl',
    10821083            'webaudio/AudioBuffer.idl',
    10831084            'webaudio/AudioBufferCallback.idl',
    … …  
    47734774            'storage/StorageSyncManager.h',
    47744775            'storage/StorageTracker.cpp',
     4776            'storage/WorkerContextSQLDatabase.cpp',
     4777            'storage/WorkerContextSQLDatabase.h',
    47754778            'storage/chromium/DatabaseObserver.h',
    47764779            'storage/chromium/DatabaseTrackerChromium.cpp',

  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r109556 r109833  
    7116671166                                >
    7116771167                        </File>
     71168                        <File
     71169                                RelativePath="..\storage\WorkerContextSQLDatabase.cpp"
     71170                                >
     71171                        </File>
     71172                        <File
     71173                                RelativePath="..\storage\WorkerContextSQLDatabase.h"
     71174                                >
     71175                        </File>
    7116871176                </Filter>
    7116971177                <Filter

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r109798 r109833  
    35533553                97E4A12614F4C5D400870E43 /* NavigatorRegisterProtocolHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 9730BE1514EF286B00DF06B9 /* NavigatorRegisterProtocolHandler.h */; };
    35543554                97E4A12714F4C5D700870E43 /* NavigatorRegisterProtocolHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9730BE1414EF286B00DF06B9 /* NavigatorRegisterProtocolHandler.cpp */; };
     3555                97E6C13D1505873F006FC943 /* WorkerContextSQLDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97E6C13A1505873F006FC943 /* WorkerContextSQLDatabase.cpp */; };
     3556                97E6C13E1505873F006FC943 /* WorkerContextSQLDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = 97E6C13B1505873F006FC943 /* WorkerContextSQLDatabase.h */; };
    35553557                97EF7DFE107E55B700D7C49C /* ScriptControllerBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97EF7DFD107E55B700D7C49C /* ScriptControllerBase.cpp */; };
    35563558                984264F112D5280A000D88A4 /* LinkLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 984264EF12D5280A000D88A4 /* LinkLoaderClient.h */; };
    … …  
    1049410496                97E4028D13A696ED00913D67 /* IconController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IconController.cpp; sourceTree = "<group>"; };
    1049510497                97E4028E13A696ED00913D67 /* IconController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IconController.h; sourceTree = "<group>"; };
     10498                97E6C13A1505873F006FC943 /* WorkerContextSQLDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerContextSQLDatabase.cpp; sourceTree = "<group>"; };
     10499                97E6C13B1505873F006FC943 /* WorkerContextSQLDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerContextSQLDatabase.h; sourceTree = "<group>"; };
     10500                97E6C13C1505873F006FC943 /* WorkerContextSQLDatabase.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WorkerContextSQLDatabase.idl; sourceTree = "<group>"; };
    1049610501                97EF7DFD107E55B700D7C49C /* ScriptControllerBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptControllerBase.cpp; sourceTree = "<group>"; };
    1049710502                984264EF12D5280A000D88A4 /* LinkLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinkLoaderClient.h; sourceTree = "<group>"; };
    … …  
    1407214077                                3AB02D2812D4F91600FBB694 /* StorageTracker.h */,
    1407314078                                3AC367FE12EF7A09006A3D6F /* StorageTrackerClient.h */,
     14079                                97E6C13A1505873F006FC943 /* WorkerContextSQLDatabase.cpp */,
     14080                                97E6C13B1505873F006FC943 /* WorkerContextSQLDatabase.h */,
     14081                                97E6C13C1505873F006FC943 /* WorkerContextSQLDatabase.idl */,
    1407414082                        );
    1407514083                        indentWidth = 4;
    … …  
    2446124469                                9712A612150090CE0048AF10 /* WorkerContextIndexedDatabase.h in Headers */,
    2446224470                                2E43464B0F546A8200B0F1BA /* WorkerContextProxy.h in Headers */,
     24471                                97E6C13E1505873F006FC943 /* WorkerContextSQLDatabase.h in Headers */,
    2446324472                                F34742E11343631F00531BC2 /* WorkerDebuggerAgent.h in Headers */,
    2446424473                                A3E2643114748991005A8588 /* WorkerEventQueue.h in Headers */,
    … …  
    2743827447                                2E4346480F546A8200B0F1BA /* WorkerContext.cpp in Sources */,
    2743927448                                9712A611150090CE0048AF10 /* WorkerContextIndexedDatabase.cpp in Sources */,
     27449                                97E6C13D1505873F006FC943 /* WorkerContextSQLDatabase.cpp in Sources */,
    2744027450                                F34742E01343631F00531BC2 /* WorkerDebuggerAgent.cpp in Sources */,
    2744127451                                A3E2643014748991005A8588 /* WorkerEventQueue.cpp in Sources */,

  • trunk/Source/WebCore/storage/DOMWindowSQLDatabase.cpp

    r109052 r109833  
    2626
    2727#include "config.h"
     28
     29#if ENABLE(SQL_DATABASE)
     30
    2831#include "DOMWindowSQLDatabase.h"
    2932
    … …  
    3538#include "Frame.h"
    3639#include "SecurityOrigin.h"
    37 
    38 #if ENABLE(SQL_DATABASE)
    3940
    4041namespace WebCore {

  • trunk/Source/WebCore/storage/WorkerContextSQLDatabase.cpp

    r109832 r109833  
    11/*
    2  * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
    3  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
     2 * Copyright (C) 2008 Apple Inc. All Rights Reserved.
     3 * Copyright (C) 2009, 2011 Google Inc. All Rights Reserved.
    44 *
    55 * Redistribution and use in source and binary forms, with or without
    … …  
    2323 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    2424 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     25 *
    2526 */
    2627
    2728#include "config.h"
    28 #include "DOMWindowSQLDatabase.h"
    29 
    30 #include "AbstractDatabase.h"
    31 #include "DOMWindow.h"
    32 #include "Database.h"
    33 #include "DatabaseCallback.h"
    34 #include "Document.h"
    35 #include "Frame.h"
    36 #include "SecurityOrigin.h"
    3729
    3830#if ENABLE(SQL_DATABASE)
    3931
     32#include "WorkerContextSQLDatabase.h"
     33
     34#include "AbstractDatabase.h"
     35#include "Database.h"
     36#include "DatabaseCallback.h"
     37#include "DatabaseSync.h"
     38#include "DatabaseTracker.h"
     39#include "SecurityOrigin.h"
     40#include "WorkerContext.h"
     41
    4042namespace WebCore {
    4143
    42 PassRefPtr<Database> DOMWindowSQLDatabase::openDatabase(DOMWindow* window, const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode& ec)
     44PassRefPtr<Database> WorkerContextSQLDatabase::openDatabase(WorkerContext* context, const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode& ec)
    4345{
    44     if (!window->isCurrentlyDisplayedInFrame())
     46    if (!context->securityOrigin()->canAccessDatabase() || !AbstractDatabase::isAvailable()) {
     47        ec = SECURITY_ERR;
    4548        return 0;
     49    }
    4650
    47     RefPtr<Database> database = 0;
    48     if (AbstractDatabase::isAvailable() && window->document()->securityOrigin()->canAccessDatabase())
    49         database = Database::openDatabase(window->document(), name, version, displayName, estimatedSize, creationCallback, ec);
     51    return Database::openDatabase(context, name, version, displayName, estimatedSize, creationCallback, ec);
     52}
    5053
    51     if (!database && !ec)
     54PassRefPtr<DatabaseSync> WorkerContextSQLDatabase::openDatabaseSync(WorkerContext* context, const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode& ec)
     55{
     56    if (!context->securityOrigin()->canAccessDatabase() || !AbstractDatabase::isAvailable()) {
    5257        ec = SECURITY_ERR;
     58        return 0;
     59    }
    5360
    54     return database;
     61    return DatabaseSync::openDatabaseSync(context, name, version, displayName, estimatedSize, creationCallback, ec);
    5562}
    5663

  • trunk/Source/WebCore/storage/WorkerContextSQLDatabase.h

    r109832 r109833  
    11/*
    2  * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
    3  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
     2 * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
    43 *
    54 * Redistribution and use in source and binary forms, with or without
    … …  
    2221 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
    2322 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    24  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     24 *
    2525 */
    2626
    27 #include "config.h"
    28 #include "DOMWindowSQLDatabase.h"
    29 
    30 #include "AbstractDatabase.h"
    31 #include "DOMWindow.h"
    32 #include "Database.h"
    33 #include "DatabaseCallback.h"
    34 #include "Document.h"
    35 #include "Frame.h"
    36 #include "SecurityOrigin.h"
     27#ifndef WorkerContextSQLDatabase_h
     28#define WorkerContextSQLDatabase_h
    3729
    3830#if ENABLE(SQL_DATABASE)
    3931
     32#include "ExceptionCode.h"
     33#include "PlatformString.h"
     34#include <wtf/PassRefPtr.h>
     35#include <wtf/RefCounted.h>
     36#include <wtf/RefPtr.h>
     37
    4038namespace WebCore {
    4139
    42 PassRefPtr<Database> DOMWindowSQLDatabase::openDatabase(DOMWindow* window, const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode& ec)
    43 {
    44     if (!window->isCurrentlyDisplayedInFrame())
    45         return 0;
     40class Database;
     41class DatabaseCallback;
     42class DatabaseSync;
     43class WorkerContext;
    4644
    47     RefPtr<Database> database = 0;
    48     if (AbstractDatabase::isAvailable() && window->document()->securityOrigin()->canAccessDatabase())
    49         database = Database::openDatabase(window->document(), name, version, displayName, estimatedSize, creationCallback, ec);
     45class WorkerContextSQLDatabase {
     46public:
     47    static PassRefPtr<Database> openDatabase(WorkerContext*, const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode&);
     48    static PassRefPtr<DatabaseSync> openDatabaseSync(WorkerContext*, const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode&);
    5049
    51     if (!database && !ec)
    52         ec = SECURITY_ERR;
    53 
    54     return database;
    55 }
     50private:
     51    WorkerContextSQLDatabase() { };
     52    ~WorkerContextSQLDatabase() { };
     53};
    5654
    5755} // namespace WebCore
    5856
    5957#endif // ENABLE(SQL_DATABASE)
     58
     59#endif // WorkerContextSQLDatabase_h

  • trunk/Source/WebCore/storage/WorkerContextSQLDatabase.idl

    r109832 r109833  
    11/*
    2  * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
    3  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
     2 * Copyright (C) 2008 Apple Inc. All Rights Reserved.
    43 *
    54 * Redistribution and use in source and binary forms, with or without
    … …  
    2322 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    2423 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     24 *
    2525 */
    2626
    27 #include "config.h"
    28 #include "DOMWindowSQLDatabase.h"
     27module window {
    2928
    30 #include "AbstractDatabase.h"
    31 #include "DOMWindow.h"
    32 #include "Database.h"
    33 #include "DatabaseCallback.h"
    34 #include "Document.h"
    35 #include "Frame.h"
    36 #include "SecurityOrigin.h"
     29    interface [
     30        Conditional=SQL_DATABASE,
     31        Supplemental=WorkerContext
     32    ] WorkerContextSQLDatabase {
     33        [V8EnabledAtRuntime] Database openDatabase(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize, in [Callback, Optional] DatabaseCallback creationCallback)
     34            raises(DOMException);
    3735
    38 #if ENABLE(SQL_DATABASE)
     36        [V8EnabledAtRuntime] DatabaseSync openDatabaseSync(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize, in [Callback, Optional] DatabaseCallback creationCallback)
     37            raises(DOMException);
     38    };
    3939
    40 namespace WebCore {
    41 
    42 PassRefPtr<Database> DOMWindowSQLDatabase::openDatabase(DOMWindow* window, const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode& ec)
    43 {
    44     if (!window->isCurrentlyDisplayedInFrame())
    45         return 0;
    46 
    47     RefPtr<Database> database = 0;
    48     if (AbstractDatabase::isAvailable() && window->document()->securityOrigin()->canAccessDatabase())
    49         database = Database::openDatabase(window->document(), name, version, displayName, estimatedSize, creationCallback, ec);
    50 
    51     if (!database && !ec)
    52         ec = SECURITY_ERR;
    53 
    54     return database;
    5540}
    56 
    57 } // namespace WebCore
    58 
    59 #endif // ENABLE(SQL_DATABASE)

  • trunk/Source/WebCore/workers/WorkerContext.cpp

    r109716 r109833  
    3232#include "WorkerContext.h"
    3333
    34 #include "AbstractDatabase.h"
    3534#include "ActiveDOMObject.h"
    3635#include "ContentSecurityPolicy.h"
    37 #include "Database.h"
    38 #include "DatabaseCallback.h"
    39 #include "DatabaseSync.h"
    40 #include "DatabaseTracker.h"
    4136#include "DOMTimer.h"
    4237#include "DOMURL.h"
    … …  
    309304#endif
    310305
    311 #if ENABLE(SQL_DATABASE)
    312 PassRefPtr<Database> WorkerContext::openDatabase(const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode& ec)
    313 {
    314     if (!securityOrigin()->canAccessDatabase() || !AbstractDatabase::isAvailable()) {
    315         ec = SECURITY_ERR;
    316         return 0;
    317     }
    318 
    319     return Database::openDatabase(this, name, version, displayName, estimatedSize, creationCallback, ec);
    320 }
    321 
    322 PassRefPtr<DatabaseSync> WorkerContext::openDatabaseSync(const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode& ec)
    323 {
    324     if (!securityOrigin()->canAccessDatabase() || !AbstractDatabase::isAvailable()) {
    325         ec = SECURITY_ERR;
    326         return 0;
    327     }
    328 
    329     return DatabaseSync::openDatabaseSync(this, name, version, displayName, estimatedSize, creationCallback, ec);
    330 }
    331 #endif
    332 
    333306bool WorkerContext::isContextThread() const
    334307{

  • trunk/Source/WebCore/workers/WorkerContext.h

    r109716 r109833  
    4949    class Blob;
    5050    class DOMURL;
    51     class Database;
    52     class DatabaseCallback;
    53     class DatabaseSync;
    5451    class NotificationCenter;
    5552    class ScheduledAction;
    … …  
    113110#endif
    114111
    115 #if ENABLE(SQL_DATABASE)
    116         // HTML 5 client-side database
    117         PassRefPtr<Database> openDatabase(const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode&);
    118         PassRefPtr<DatabaseSync> openDatabaseSync(const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode&);
    119 #endif
    120112        virtual bool isContextThread() const;
    121113        virtual bool isJSExecutionForbidden() const;

  • trunk/Source/WebCore/workers/WorkerContext.idl

    r109556 r109833  
    5151        [Custom] void importScripts(/*[Variadic] in DOMString urls */);
    5252                 attribute [Replaceable] WorkerNavigator navigator;
    53 #if defined(ENABLE_SQL_DATABASE) && ENABLE_SQL_DATABASE
    54         [V8EnabledAtRuntime] Database openDatabase(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize, in [Callback, Optional] DatabaseCallback creationCallback)
    55             raises(DOMException);
    56         [V8EnabledAtRuntime] DatabaseSync openDatabaseSync(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize, in [Callback, Optional] DatabaseCallback creationCallback)
    57             raises(DOMException);
    58 #endif
    5953
    6054        // Timers
Note: See TracChangeset for help on using the changeset viewer.