summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authoralecflett@chromium.org <alecflett@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-25 19:03:34 +0000
committeralecflett@chromium.org <alecflett@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-25 19:03:34 +0000
commit92ed0e1a885fb97c73002ba1ae847cd4966a980d (patch)
tree8a6e292b5138b5a1e15369f32451cb272f583526 /webkit
parenta40397e7483a2120354343f0a41e1f5eb90c0ee9 (diff)
downloadchromium_src-92ed0e1a885fb97c73002ba1ae847cd4966a980d.zip
chromium_src-92ed0e1a885fb97c73002ba1ae847cd4966a980d.tar.gz
chromium_src-92ed0e1a885fb97c73002ba1ae847cd4966a980d.tar.bz2
Remove WebSecurityOrigin from chromium
This is part 2 of 3. WebFrame and WebSecurityOrigin is now gone from the backend. BUG=233361 Review URL: https://codereview.chromium.org/14156007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196450 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/support/test_webidbfactory.cc22
-rw-r--r--webkit/support/test_webidbfactory.h17
2 files changed, 17 insertions, 22 deletions
diff --git a/webkit/support/test_webidbfactory.cc b/webkit/support/test_webidbfactory.cc
index a320f6c..42dfc21 100644
--- a/webkit/support/test_webidbfactory.cc
+++ b/webkit/support/test_webidbfactory.cc
@@ -23,10 +23,9 @@ TestWebIDBFactory::~TestWebIDBFactory() {
void TestWebIDBFactory::getDatabaseNames(
WebKit::WebIDBCallbacks* callbacks,
- const WebKit::WebSecurityOrigin& origin,
- WebKit::WebFrame* frame,
+ const WebKit::WebString& database_identifier,
const WebKit::WebString& data_dir) {
- GetFactory()->getDatabaseNames(callbacks, origin, frame,
+ GetFactory()->getDatabaseNames(callbacks, database_identifier,
data_dir.isEmpty() ? GetDataDir() : data_dir);
}
@@ -36,20 +35,19 @@ void TestWebIDBFactory::open(
long long transaction_id,
WebKit::WebIDBCallbacks* callbacks,
WebKit::WebIDBDatabaseCallbacks* database_callbacks,
- const WebKit::WebSecurityOrigin& origin,
- WebKit::WebFrame* frame,
+ const WebKit::WebString& database_identifier,
const WebKit::WebString& data_dir) {
GetFactory()->open(name, version, transaction_id, callbacks,
- database_callbacks, origin, frame,
+ database_callbacks, database_identifier,
data_dir.isEmpty() ? GetDataDir() : data_dir);
}
-void TestWebIDBFactory::deleteDatabase(const WebKit::WebString& name,
- WebKit::WebIDBCallbacks* callbacks,
- const WebKit::WebSecurityOrigin& origin,
- WebKit::WebFrame* frame,
- const WebKit::WebString& data_dir) {
- GetFactory()->deleteDatabase(name, callbacks, origin, frame,
+void TestWebIDBFactory::deleteDatabase(
+ const WebKit::WebString& name,
+ WebKit::WebIDBCallbacks* callbacks,
+ const WebKit::WebString& database_identifier,
+ const WebKit::WebString& data_dir) {
+ GetFactory()->deleteDatabase(name, callbacks, database_identifier,
data_dir.isEmpty() ? GetDataDir() : data_dir);
}
diff --git a/webkit/support/test_webidbfactory.h b/webkit/support/test_webidbfactory.h
index e7b02b0..508d7a0 100644
--- a/webkit/support/test_webidbfactory.h
+++ b/webkit/support/test_webidbfactory.h
@@ -18,22 +18,19 @@ class TestWebIDBFactory : public WebKit::WebIDBFactory {
virtual ~TestWebIDBFactory();
// WebIDBFactory methods:
- virtual void getDatabaseNames(WebKit::WebIDBCallbacks* callbacks,
- const WebKit::WebSecurityOrigin& origin,
- WebKit::WebFrame* frame,
+ virtual void getDatabaseNames(WebKit::WebIDBCallbacks*,
+ const WebKit::WebString& database_identifier,
const WebKit::WebString& data_dir);
virtual void open(const WebKit::WebString& name,
long long version,
long long transaction_id,
- WebKit::WebIDBCallbacks* callbacks,
- WebKit::WebIDBDatabaseCallbacks* database_callbacks,
- const WebKit::WebSecurityOrigin& origin,
- WebKit::WebFrame* frame,
+ WebKit::WebIDBCallbacks*,
+ WebKit::WebIDBDatabaseCallbacks*,
+ const WebKit::WebString& database_identifier,
const WebKit::WebString& data_dir);
virtual void deleteDatabase(const WebKit::WebString& name,
- WebKit::WebIDBCallbacks* callbacks,
- const WebKit::WebSecurityOrigin& origin,
- WebKit::WebFrame* frame,
+ WebKit::WebIDBCallbacks*,
+ const WebKit::WebString& database_identifier,
const WebKit::WebString& data_dir);
private: