diff options
| author | Iain Merrick <husky@google.com> | 2010-11-01 12:19:54 +0000 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-11-03 10:21:10 +0000 |
| commit | 731df977c0511bca2206b5f333555b1205ff1f43 (patch) | |
| tree | 0e750b949b3f00a1ac11fda25d3c2de512f2b465 /webkit/glue/idb_bindings.cc | |
| parent | 5add15e10e7bb80512f2c597ca57221314abe577 (diff) | |
| download | external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.zip external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.gz external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.bz2 | |
Merge Chromium at r63472 : Initial merge by git.
Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
Diffstat (limited to 'webkit/glue/idb_bindings.cc')
| -rw-r--r-- | webkit/glue/idb_bindings.cc | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/webkit/glue/idb_bindings.cc b/webkit/glue/idb_bindings.cc index fd26130..4af085f 100644 --- a/webkit/glue/idb_bindings.cc +++ b/webkit/glue/idb_bindings.cc @@ -20,35 +20,11 @@ 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; + v8::Locker lock; 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 |