Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Side by Side Diff: Source/WebKit/chromium/src/WebIDBFactoryImpl.cpp

Issue 13843016: Prepare to remove WebSecurityOrigin from IDB backend (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: remove unused static Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 : m_idbFactoryBackend(IDBFactoryBackendImpl::create()) 52 : m_idbFactoryBackend(IDBFactoryBackendImpl::create())
53 { 53 {
54 } 54 }
55 55
56 WebIDBFactoryImpl::~WebIDBFactoryImpl() 56 WebIDBFactoryImpl::~WebIDBFactoryImpl()
57 { 57 {
58 } 58 }
59 59
60 void WebIDBFactoryImpl::getDatabaseNames(WebIDBCallbacks* callbacks, const WebSe curityOrigin& origin, WebFrame*, const WebString& dataDir) 60 void WebIDBFactoryImpl::getDatabaseNames(WebIDBCallbacks* callbacks, const WebSe curityOrigin& origin, WebFrame*, const WebString& dataDir)
61 { 61 {
62 m_idbFactoryBackend->getDatabaseNames(IDBCallbacksProxy::create(adoptPtr(cal lbacks)), origin, 0, dataDir); 62 m_idbFactoryBackend->getDatabaseNames(IDBCallbacksProxy::create(adoptPtr(cal lbacks)), origin.databaseIdentifier(), 0, dataDir);
63 }
64
65 void WebIDBFactoryImpl::getDatabaseNames(WebIDBCallbacks* callbacks, const WebSt ring& databaseIdentifier, const WebString& dataDir)
66 {
67 m_idbFactoryBackend->getDatabaseNames(IDBCallbacksProxy::create(adoptPtr(cal lbacks)), databaseIdentifier, 0, dataDir);
63 } 68 }
64 69
65 void WebIDBFactoryImpl::open(const WebString& name, long long version, long long transactionId, WebIDBCallbacks* callbacks, WebIDBDatabaseCallbacks* databaseCal lbacks, const WebSecurityOrigin& origin, WebFrame*, const WebString& dataDir) 70 void WebIDBFactoryImpl::open(const WebString& name, long long version, long long transactionId, WebIDBCallbacks* callbacks, WebIDBDatabaseCallbacks* databaseCal lbacks, const WebSecurityOrigin& origin, WebFrame*, const WebString& dataDir)
66 { 71 {
67 RefPtr<IDBCallbacksProxy> callbacksProxy = IDBCallbacksProxy::create(adoptPt r(callbacks)); 72 RefPtr<IDBCallbacksProxy> callbacksProxy = IDBCallbacksProxy::create(adoptPt r(callbacks));
68 RefPtr<IDBDatabaseCallbacksProxy> databaseCallbacksProxy = IDBDatabaseCallba cksProxy::create(adoptPtr(databaseCallbacks)); 73 RefPtr<IDBDatabaseCallbacksProxy> databaseCallbacksProxy = IDBDatabaseCallba cksProxy::create(adoptPtr(databaseCallbacks));
69 callbacksProxy->setDatabaseCallbacks(databaseCallbacksProxy); 74 callbacksProxy->setDatabaseCallbacks(databaseCallbacksProxy);
70 m_idbFactoryBackend->open(name, version, transactionId, callbacksProxy.get() , databaseCallbacksProxy.get(), origin, 0, dataDir); 75 m_idbFactoryBackend->open(name, version, transactionId, callbacksProxy.get() , databaseCallbacksProxy.get(), origin.databaseIdentifier(), 0, dataDir);
76 }
77
78 void WebIDBFactoryImpl::open(const WebString& name, long long version, long long transactionId, WebIDBCallbacks* callbacks, WebIDBDatabaseCallbacks* databaseCal lbacks, const WebString& databaseIdentifier, const WebString& dataDir)
79 {
80 RefPtr<IDBCallbacksProxy> callbacksProxy = IDBCallbacksProxy::create(adoptPt r(callbacks));
81 RefPtr<IDBDatabaseCallbacksProxy> databaseCallbacksProxy = IDBDatabaseCallba cksProxy::create(adoptPtr(databaseCallbacks));
82 callbacksProxy->setDatabaseCallbacks(databaseCallbacksProxy);
83 m_idbFactoryBackend->open(name, version, transactionId, callbacksProxy.get() , databaseCallbacksProxy.get(), databaseIdentifier, 0, dataDir);
71 } 84 }
72 85
73 void WebIDBFactoryImpl::deleteDatabase(const WebString& name, WebIDBCallbacks* c allbacks, const WebSecurityOrigin& origin, WebFrame*, const WebString& dataDir) 86 void WebIDBFactoryImpl::deleteDatabase(const WebString& name, WebIDBCallbacks* c allbacks, const WebSecurityOrigin& origin, WebFrame*, const WebString& dataDir)
74 { 87 {
75 m_idbFactoryBackend->deleteDatabase(name, IDBCallbacksProxy::create(adoptPtr (callbacks)), origin, 0, dataDir); 88 m_idbFactoryBackend->deleteDatabase(name, IDBCallbacksProxy::create(adoptPtr (callbacks)), origin.databaseIdentifier(), 0, dataDir);
89 }
90
91 void WebIDBFactoryImpl::deleteDatabase(const WebString& name, WebIDBCallbacks* c allbacks, const WebString& databaseIdentifier, const WebString& dataDir)
92 {
93 m_idbFactoryBackend->deleteDatabase(name, IDBCallbacksProxy::create(adoptPtr (callbacks)), databaseIdentifier, 0, dataDir);
76 } 94 }
77 95
78 } // namespace WebKit 96 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/WebIDBFactoryImpl.h ('k') | Source/WebKit/chromium/tests/IDBAbortOnCorruptTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698