summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DEPS2
-rw-r--r--chrome/browser/in_process_webkit/indexed_db_context.cc14
-rw-r--r--chrome/browser/in_process_webkit/indexed_db_context.h6
-rw-r--r--chrome/browser/in_process_webkit/indexed_db_dispatcher_host.cc15
-rw-r--r--chrome/browser/in_process_webkit/indexed_db_dispatcher_host.h4
-rw-r--r--chrome/chrome_renderer.gypi4
-rw-r--r--chrome/common/render_messages.h8
-rw-r--r--chrome/common/render_messages_internal.h6
-rw-r--r--chrome/renderer/indexed_db_dispatcher.cc6
-rw-r--r--chrome/renderer/indexed_db_dispatcher.h2
-rw-r--r--chrome/renderer/render_thread.cc2
-rw-r--r--chrome/renderer/renderer_webindexeddatabase_impl.cc13
-rw-r--r--chrome/renderer/renderer_webindexeddatabase_impl.h17
-rw-r--r--chrome/renderer/renderer_webkitclient_impl.cc16
-rw-r--r--chrome/renderer/renderer_webkitclient_impl.h4
15 files changed, 61 insertions, 58 deletions
diff --git a/DEPS b/DEPS
index 90b8013..3fb410e 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "64343",
+ "webkit_revision": "64344",
"ffmpeg_revision": "54050",
"skia_revision": "592",
"chromium_git": "http://src.chromium.org/git",
diff --git a/chrome/browser/in_process_webkit/indexed_db_context.cc b/chrome/browser/in_process_webkit/indexed_db_context.cc
index 6235833..ceaf8d9 100644
--- a/chrome/browser/in_process_webkit/indexed_db_context.cc
+++ b/chrome/browser/in_process_webkit/indexed_db_context.cc
@@ -5,10 +5,10 @@
#include "chrome/browser/in_process_webkit/indexed_db_context.h"
#include "third_party/WebKit/WebKit/chromium/public/WebIDBDatabase.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebIndexedDatabase.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebIDBFactory.h"
using WebKit::WebIDBDatabase;
-using WebKit::WebIndexedDatabase;
+using WebKit::WebIDBFactory;
IndexedDBContext::IndexedDBContext() {
}
@@ -16,9 +16,9 @@ IndexedDBContext::IndexedDBContext() {
IndexedDBContext::~IndexedDBContext() {
}
-WebIndexedDatabase* IndexedDBContext::GetIndexedDatabase() {
- if (!indexed_database_.get())
- indexed_database_.reset(WebIndexedDatabase::create());
- DCHECK(indexed_database_.get());
- return indexed_database_.get();
+WebIDBFactory* IndexedDBContext::GetIDBFactory() {
+ if (!idb_factory_.get())
+ idb_factory_.reset(WebIDBFactory::create());
+ DCHECK(idb_factory_.get());
+ return idb_factory_.get();
}
diff --git a/chrome/browser/in_process_webkit/indexed_db_context.h b/chrome/browser/in_process_webkit/indexed_db_context.h
index 828ea13..cb3ce05 100644
--- a/chrome/browser/in_process_webkit/indexed_db_context.h
+++ b/chrome/browser/in_process_webkit/indexed_db_context.h
@@ -11,7 +11,7 @@
#include "base/scoped_ptr.h"
namespace WebKit {
-class WebIndexedDatabase;
+class WebIDBFactory;
}
class IndexedDBContext {
@@ -21,10 +21,10 @@ class IndexedDBContext {
// TODO(jorlow): If this is all this class ever does, then we should kill it
// and move this variable to WebKitContext.
- WebKit::WebIndexedDatabase* GetIndexedDatabase();
+ WebKit::WebIDBFactory* GetIDBFactory();
private:
- scoped_ptr<WebKit::WebIndexedDatabase> indexed_database_;
+ scoped_ptr<WebKit::WebIDBFactory> idb_factory_;
DISALLOW_COPY_AND_ASSIGN(IndexedDBContext);
};
diff --git a/chrome/browser/in_process_webkit/indexed_db_dispatcher_host.cc b/chrome/browser/in_process_webkit/indexed_db_dispatcher_host.cc
index 352a334..3fd0714 100644
--- a/chrome/browser/in_process_webkit/indexed_db_dispatcher_host.cc
+++ b/chrome/browser/in_process_webkit/indexed_db_dispatcher_host.cc
@@ -16,8 +16,8 @@
#include "third_party/WebKit/WebKit/chromium/public/WebIDBDatabase.h"
#include "third_party/WebKit/WebKit/chromium/public/WebIDBDatabaseError.h"
#include "third_party/WebKit/WebKit/chromium/public/WebIDBIndex.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebIDBFactory.h"
#include "third_party/WebKit/WebKit/chromium/public/WebIDBObjectStore.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebIndexedDatabase.h"
#include "third_party/WebKit/WebKit/chromium/public/WebSecurityOrigin.h"
using WebKit::WebDOMStringList;
@@ -81,7 +81,7 @@ bool IndexedDBDispatcherHost::OnMessageReceived(const IPC::Message& message) {
DCHECK(process_handle_);
switch (message.type()) {
- case ViewHostMsg_IndexedDatabaseOpen::ID:
+ case ViewHostMsg_IDBFactoryOpen::ID:
case ViewHostMsg_IDBDatabaseName::ID:
case ViewHostMsg_IDBDatabaseDescription::ID:
case ViewHostMsg_IDBDatabaseVersion::ID:
@@ -153,8 +153,8 @@ void IndexedDBDispatcherHost::OnMessageReceivedWebKit(
handled = true;
DCHECK(msg_is_ok);
IPC_BEGIN_MESSAGE_MAP_EX(IndexedDBDispatcherHost, message, msg_is_ok)
- IPC_MESSAGE_HANDLER(ViewHostMsg_IndexedDatabaseOpen,
- OnIndexedDatabaseOpen)
+ IPC_MESSAGE_HANDLER(ViewHostMsg_IDBFactoryOpen,
+ OnIDBFactoryOpen)
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP()
}
@@ -178,19 +178,18 @@ int32 IndexedDBDispatcherHost::Add(WebIDBObjectStore* idb_object_store) {
return object_store_dispatcher_host_->map_.Add(idb_object_store);
}
-void IndexedDBDispatcherHost::OnIndexedDatabaseOpen(
- const ViewHostMsg_IndexedDatabaseOpen_Params& params) {
+void IndexedDBDispatcherHost::OnIDBFactoryOpen(
+ const ViewHostMsg_IDBFactoryOpen_Params& params) {
// TODO(jorlow): Check the content settings map and use params.routing_id_
// if it's necessary to ask the user for permission.
DCHECK(ChromeThread::CurrentlyOn(ChromeThread::WEBKIT));
- Context()->GetIndexedDatabase()->open(
+ Context()->GetIDBFactory()->open(
params.name_, params.description_,
new IndexedDBCallbacks<WebIDBDatabase>(this, params.response_id_),
WebSecurityOrigin::createFromDatabaseIdentifier(params.origin_), NULL);
}
-
//////////////////////////////////////////////////////////////////////
// Helper templates.
//
diff --git a/chrome/browser/in_process_webkit/indexed_db_dispatcher_host.h b/chrome/browser/in_process_webkit/indexed_db_dispatcher_host.h
index 7bea48a..436b547 100644
--- a/chrome/browser/in_process_webkit/indexed_db_dispatcher_host.h
+++ b/chrome/browser/in_process_webkit/indexed_db_dispatcher_host.h
@@ -15,8 +15,8 @@
class IndexedDBKey;
class SerializedScriptValue;
-struct ViewHostMsg_IndexedDatabaseOpen_Params;
struct ViewHostMsg_IDBDatabaseCreateObjectStore_Params;
+struct ViewHostMsg_IDBFactoryOpen_Params;
struct ViewHostMsg_IDBObjectStoreCreateIndex_Params;
namespace WebKit {
@@ -65,7 +65,7 @@ class IndexedDBDispatcherHost
// Message processing. Most of the work is delegated to the dispatcher hosts
// below.
void OnMessageReceivedWebKit(const IPC::Message& message);
- void OnIndexedDatabaseOpen(const ViewHostMsg_IndexedDatabaseOpen_Params& p);
+ void OnIDBFactoryOpen(const ViewHostMsg_IDBFactoryOpen_Params& p);
// Helper templates.
template <class ReturnType>
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index ea0a539..cb2b417 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -158,8 +158,8 @@
'renderer/renderer_webidbindex_impl.h',
'renderer/renderer_webidbobjectstore_impl.cc',
'renderer/renderer_webidbobjectstore_impl.h',
- 'renderer/renderer_webindexeddatabase_impl.cc',
- 'renderer/renderer_webindexeddatabase_impl.h',
+ 'renderer/renderer_webidbfactory_impl.cc',
+ 'renderer/renderer_webidbfactory_impl.h',
'renderer/renderer_webkitclient_impl.cc',
'renderer/renderer_webkitclient_impl.h',
'renderer/renderer_webstoragearea_impl.cc',
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index 1eab2cb..acdd77e 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -598,7 +598,7 @@ struct ViewMsg_DOMStorageEvent_Params {
};
// Used to open an indexed database.
-struct ViewHostMsg_IndexedDatabaseOpen_Params {
+struct ViewHostMsg_IDBFactoryOpen_Params {
// The routing ID of the view initiating the open.
int32 routing_id_;
@@ -2722,10 +2722,10 @@ struct ParamTraits<ViewMsg_DOMStorageEvent_Params> {
}
};
-// Traits for ViewHostMsg_IndexedDatabaseOpen_Params.
+// Traits for ViewHostMsg_IDBFactoryOpen_Params.
template <>
-struct ParamTraits<ViewHostMsg_IndexedDatabaseOpen_Params> {
- typedef ViewHostMsg_IndexedDatabaseOpen_Params param_type;
+struct ParamTraits<ViewHostMsg_IDBFactoryOpen_Params> {
+ typedef ViewHostMsg_IDBFactoryOpen_Params param_type;
static void Write(Message* m, const param_type& p) {
WriteParam(m, p.routing_id_);
WriteParam(m, p.response_id_);
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index deea4ef..b8ddb28 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -2196,9 +2196,9 @@ IPC_BEGIN_MESSAGES(ViewHost)
GURL /* url */,
bool /* something_cleared */)
- // WebIndexedDatabase::open() message.
- IPC_MESSAGE_CONTROL1(ViewHostMsg_IndexedDatabaseOpen,
- ViewHostMsg_IndexedDatabaseOpen_Params)
+ // WebIDBFactory::open() message.
+ IPC_MESSAGE_CONTROL1(ViewHostMsg_IDBFactoryOpen,
+ ViewHostMsg_IDBFactoryOpen_Params)
// WebIDBDatabase::name() message.
IPC_SYNC_MESSAGE_CONTROL1_1(ViewHostMsg_IDBDatabaseName,
diff --git a/chrome/renderer/indexed_db_dispatcher.cc b/chrome/renderer/indexed_db_dispatcher.cc
index d77903cf..a059512 100644
--- a/chrome/renderer/indexed_db_dispatcher.cc
+++ b/chrome/renderer/indexed_db_dispatcher.cc
@@ -49,7 +49,7 @@ bool IndexedDBDispatcher::OnMessageReceived(const IPC::Message& msg) {
return handled;
}
-void IndexedDBDispatcher::RequestIndexedDatabaseOpen(
+void IndexedDBDispatcher::RequestIDBFactoryOpen(
const string16& name, const string16& description,
WebIDBCallbacks* callbacks_ptr, const string16& origin,
WebFrame* web_frame) {
@@ -61,13 +61,13 @@ void IndexedDBDispatcher::RequestIndexedDatabaseOpen(
if (!render_view)
return; // We must be shutting down.
- ViewHostMsg_IndexedDatabaseOpen_Params params;
+ ViewHostMsg_IDBFactoryOpen_Params params;
params.routing_id_ = render_view->routing_id();
params.response_id_ = pending_callbacks_.Add(callbacks.release());
params.origin_ = origin;
params.name_ = name;
params.description_ = description;
- RenderThread::current()->Send(new ViewHostMsg_IndexedDatabaseOpen(params));
+ RenderThread::current()->Send(new ViewHostMsg_IDBFactoryOpen(params));
}
void IndexedDBDispatcher::RequestIDBDatabaseCreateObjectStore(
diff --git a/chrome/renderer/indexed_db_dispatcher.h b/chrome/renderer/indexed_db_dispatcher.h
index ff99f12..ed551ec 100644
--- a/chrome/renderer/indexed_db_dispatcher.h
+++ b/chrome/renderer/indexed_db_dispatcher.h
@@ -29,7 +29,7 @@ class IndexedDBDispatcher {
// handled.
bool OnMessageReceived(const IPC::Message& msg);
- void RequestIndexedDatabaseOpen(
+ void RequestIDBFactoryOpen(
const string16& name, const string16& description,
WebKit::WebIDBCallbacks* callbacks, const string16& origin,
WebKit::WebFrame* web_frame);
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index 03e468a..e1da1a8 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -56,7 +56,7 @@
#include "chrome/renderer/render_view.h"
#include "chrome/renderer/render_view_visitor.h"
#include "chrome/renderer/renderer_histogram_snapshots.h"
-#include "chrome/renderer/renderer_webindexeddatabase_impl.h"
+#include "chrome/renderer/renderer_webidbfactory_impl.h"
#include "chrome/renderer/renderer_webkitclient_impl.h"
#include "chrome/renderer/spellchecker/spellcheck.h"
#include "chrome/renderer/user_script_slave.h"
diff --git a/chrome/renderer/renderer_webindexeddatabase_impl.cc b/chrome/renderer/renderer_webindexeddatabase_impl.cc
index a0a5b8b..2ccf84a 100644
--- a/chrome/renderer/renderer_webindexeddatabase_impl.cc
+++ b/chrome/renderer/renderer_webindexeddatabase_impl.cc
@@ -2,30 +2,33 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/renderer/renderer_webindexeddatabase_impl.h"
+#include "chrome/renderer/renderer_webidbfactory_impl.h"
+#include "chrome/common/render_messages.h"
#include "chrome/renderer/render_thread.h"
#include "chrome/renderer/indexed_db_dispatcher.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebDOMStringList.h"
#include "third_party/WebKit/WebKit/chromium/public/WebString.h"
+using WebKit::WebDOMStringList;
using WebKit::WebFrame;
using WebKit::WebIDBCallbacks;
using WebKit::WebIDBDatabase;
using WebKit::WebSecurityOrigin;
using WebKit::WebString;
-RendererWebIndexedDatabaseImpl::RendererWebIndexedDatabaseImpl() {
+RendererWebIDBFactoryImpl::RendererWebIDBFactoryImpl() {
}
-RendererWebIndexedDatabaseImpl::~RendererWebIndexedDatabaseImpl() {
+RendererWebIDBFactoryImpl::~RendererWebIDBFactoryImpl() {
}
-void RendererWebIndexedDatabaseImpl::open(
+void RendererWebIDBFactoryImpl::open(
const WebString& name, const WebString& description,
WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin,
WebFrame* web_frame) {
IndexedDBDispatcher* dispatcher =
RenderThread::current()->indexed_db_dispatcher();
- dispatcher->RequestIndexedDatabaseOpen(
+ dispatcher->RequestIDBFactoryOpen(
name, description, callbacks, origin.databaseIdentifier(), web_frame);
}
diff --git a/chrome/renderer/renderer_webindexeddatabase_impl.h b/chrome/renderer/renderer_webindexeddatabase_impl.h
index 8703f53..de71220 100644
--- a/chrome/renderer/renderer_webindexeddatabase_impl.h
+++ b/chrome/renderer/renderer_webindexeddatabase_impl.h
@@ -2,30 +2,31 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_RENDERER_RENDERER_WEBINDEXEDDATABASE_IMPL_H_
-#define CHROME_RENDERER_RENDERER_WEBINDEXEDDATABASE_IMPL_H_
+#ifndef CHROME_RENDERER_RENDERER_WEBIDBFACTORY_IMPL_H_
+#define CHROME_RENDERER_RENDERER_WEBIDBFACTORY_IMPL_H_
#pragma once
#include "third_party/WebKit/WebKit/chromium/public/WebIDBCallbacks.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebIndexedDatabase.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebIDBFactory.h"
namespace WebKit {
+class WebDOMStringList;
class WebFrame;
class WebIDBDatabase;
class WebSecurityOrigin;
class WebString;
}
-class RendererWebIndexedDatabaseImpl : public WebKit::WebIndexedDatabase {
+class RendererWebIDBFactoryImpl : public WebKit::WebIDBFactory {
public:
- RendererWebIndexedDatabaseImpl();
- virtual ~RendererWebIndexedDatabaseImpl();
+ RendererWebIDBFactoryImpl();
+ virtual ~RendererWebIDBFactoryImpl();
- // See WebIndexedDatabase.h for documentation on these functions.
+ // See WebIDBFactory.h for documentation on these functions.
virtual void open(
const WebKit::WebString& name, const WebKit::WebString& description,
WebKit::WebIDBCallbacks* callbacks,
const WebKit::WebSecurityOrigin& origin, WebKit::WebFrame* web_frame);
};
-#endif // CHROME_RENDERER_RENDERER_WEBINDEXEDDATABASE_IMPL_H_
+#endif // CHROME_RENDERER_RENDERER_WEBIDBFACTORY_IMPL_H_
diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index f2d6a9e..8b91028 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -16,7 +16,7 @@
#include "chrome/renderer/net/renderer_net_predictor.h"
#include "chrome/renderer/render_thread.h"
#include "chrome/renderer/render_view.h"
-#include "chrome/renderer/renderer_webindexeddatabase_impl.h"
+#include "chrome/renderer/renderer_webidbfactory_impl.h"
#include "chrome/renderer/renderer_webstoragenamespace_impl.h"
#include "chrome/renderer/visitedlink_slave.h"
#include "chrome/renderer/webgles2context_impl.h"
@@ -26,7 +26,7 @@
#include "ipc/ipc_sync_message_filter.h"
#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
#include "third_party/WebKit/WebKit/chromium/public/WebGraphicsContext3D.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebIndexedDatabase.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebIDBFactory.h"
#include "third_party/WebKit/WebKit/chromium/public/WebStorageEventDispatcher.h"
#include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
#include "third_party/WebKit/WebKit/chromium/public/WebVector.h"
@@ -59,7 +59,7 @@
#endif
using WebKit::WebFrame;
-using WebKit::WebIndexedDatabase;
+using WebKit::WebIDBFactory;
using WebKit::WebKitClient;
using WebKit::WebStorageArea;
using WebKit::WebStorageEventDispatcher;
@@ -268,14 +268,14 @@ void RendererWebKitClientImpl::dispatchStorageEvent(
//------------------------------------------------------------------------------
-WebIndexedDatabase* RendererWebKitClientImpl::indexedDatabase() {
- if (!web_indexed_database_.get()) {
+WebIDBFactory* RendererWebKitClientImpl::idbFactory() {
+ if (!web_idb_factory_.get()) {
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess))
- web_indexed_database_.reset(WebIndexedDatabase::create());
+ web_idb_factory_.reset(WebIDBFactory::create());
else
- web_indexed_database_.reset(new RendererWebIndexedDatabaseImpl());
+ web_idb_factory_.reset(new RendererWebIDBFactoryImpl());
}
- return web_indexed_database_.get();
+ return web_idb_factory_.get();
}
//------------------------------------------------------------------------------
diff --git a/chrome/renderer/renderer_webkitclient_impl.h b/chrome/renderer/renderer_webkitclient_impl.h
index c93666c..71958b4 100644
--- a/chrome/renderer/renderer_webkitclient_impl.h
+++ b/chrome/renderer/renderer_webkitclient_impl.h
@@ -60,7 +60,7 @@ class RendererWebKitClientImpl : public webkit_glue::WebKitClientImpl {
unsigned key_size_index,
const WebKit::WebString& challenge,
const WebKit::WebURL& url);
- virtual WebKit::WebIndexedDatabase* indexedDatabase();
+ virtual WebKit::WebIDBFactory* idbFactory();
virtual WebKit::WebSharedWorkerRepository* sharedWorkerRepository();
virtual WebKit::WebGraphicsContext3D* createGraphicsContext3D();
@@ -93,7 +93,7 @@ class RendererWebKitClientImpl : public webkit_glue::WebKitClientImpl {
// to WorkerService on the browser thread.
scoped_ptr<WebSharedWorkerRepositoryImpl> shared_worker_repository_;
- scoped_ptr<WebKit::WebIndexedDatabase> web_indexed_database_;
+ scoped_ptr<WebKit::WebIDBFactory> web_idb_factory_;
};
#endif // CHROME_RENDERER_RENDERER_WEBKITCLIENT_IMPL_H_
generated by cgit v1.1 at 2025-03-10 00:29:47 +0000