diff options
Diffstat (limited to 'webkit/glue')
-rw-r--r-- | webkit/glue/idb_bindings.cc | 69 | ||||
-rw-r--r-- | webkit/glue/idb_bindings.h | 25 | ||||
-rw-r--r-- | webkit/glue/webkit_glue.gypi | 2 |
3 files changed, 96 insertions, 0 deletions
diff --git a/webkit/glue/idb_bindings.cc b/webkit/glue/idb_bindings.cc new file mode 100644 index 0000000..fd26130 --- /dev/null +++ b/webkit/glue/idb_bindings.cc @@ -0,0 +1,69 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "webkit/glue/idb_bindings.h" + +#include "base/basictypes.h" +#include "base/scoped_ptr.h" +#include "base/string16.h" +#include "base/utf_string_conversions.h" +#include "third_party/WebKit/WebKit/chromium/public/WebIDBKey.h" +#include "third_party/WebKit/WebKit/chromium/public/WebIDBKeyPath.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSerializedScriptValue.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "v8/include/v8.h" + +namespace webkit_glue { + +using WebKit::WebIDBKey; +using WebKit::WebIDBKeyPath; +using WebKit::WebSerializedScriptValue; + +namespace { + +class LocalContext { + public: + LocalContext() + : context_(v8::Context::New()) { + context_->Enter(); + } + + virtual ~LocalContext() { + context_->Exit(); + context_.Dispose(); + } + + private: + v8::Locker lock_; + v8::HandleScope scope_; + v8::Persistent<v8::Context> context_; + + DISALLOW_COPY_AND_ASSIGN(LocalContext); +}; + +} // namespace + +bool IDBKeysFromValuesAndKeyPath( + const std::vector<WebSerializedScriptValue>& serialized_script_values, + const string16& idb_key_path, + std::vector<WebIDBKey>* values) { + LocalContext env; + WebIDBKeyPath web_idb_key_path = WebIDBKeyPath::create(idb_key_path); + bool error = web_idb_key_path.parseError() != 0; + // TODO(bulach): what to do when we have a parse error? For now, setting + // all values back as invalid and returning a boolean. + for (std::vector<WebSerializedScriptValue>::const_iterator i = + serialized_script_values.begin(); + i != serialized_script_values.end(); ++i) { + if (error) { + values->push_back(WebIDBKey::createInvalid()); + } else { + values->push_back( + WebIDBKey::createFromValueAndKeyPath(*i, web_idb_key_path)); + } + } + return error; +} + +} // namespace webkit_glue diff --git a/webkit/glue/idb_bindings.h b/webkit/glue/idb_bindings.h new file mode 100644 index 0000000..074595d --- /dev/null +++ b/webkit/glue/idb_bindings.h @@ -0,0 +1,25 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include <vector> + +#include "base/basictypes.h" +#include "base/string16.h" + +namespace WebKit { +class WebIDBKey; +class WebSerializedScriptValue; +} + +namespace webkit_glue { + +// Warning: this method holds a V8 lock, it should only be called within a +// sandbox. +bool IDBKeysFromValuesAndKeyPath( + const std::vector<WebKit::WebSerializedScriptValue>& + serialized_script_values, + const string16& idb_key_path, + std::vector<WebKit::WebIDBKey>* values); + +} // namespace webkit_glue diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index 035ed6d..02efafd 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -279,6 +279,8 @@ 'ftp_directory_listing_response_delegate.h', 'glue_serialize.cc', 'glue_serialize.h', + 'idb_bindings.cc', + 'idb_bindings.h', 'image_decoder.cc', 'image_decoder.h', 'image_resource_fetcher.cc', |