summaryrefslogtreecommitdiffstats
path: root/webkit/glue/idb_bindings.cc
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/glue/idb_bindings.cc')
-rw-r--r--webkit/glue/idb_bindings.cc7
1 files changed, 2 insertions, 5 deletions
diff --git a/webkit/glue/idb_bindings.cc b/webkit/glue/idb_bindings.cc
index 633045e..3149c52 100644
--- a/webkit/glue/idb_bindings.cc
+++ b/webkit/glue/idb_bindings.cc
@@ -1,18 +1,17 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/memory/scoped_ptr.h"
#include "base/string16.h"
#include "base/utf_string_conversions.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKey.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKeyPath.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptValue.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
-#include "v8/include/v8.h"
namespace webkit_glue {
@@ -24,7 +23,6 @@ bool IDBKeysFromValuesAndKeyPath(
const std::vector<WebSerializedScriptValue>& serialized_script_values,
const string16& idb_key_path,
std::vector<WebIDBKey>* values) {
- 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
@@ -46,7 +44,6 @@ WebSerializedScriptValue InjectIDBKey(
const WebIDBKey& key,
const WebSerializedScriptValue& value,
const string16& idb_key_path) {
- v8::Locker lock;
return WebIDBKey::injectIDBKeyIntoSerializedValue(
key, value, WebIDBKeyPath::create(idb_key_path));
}