From e8b154fd68f9b33be40a3590e58347f353835f5c Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Fri, 27 Aug 2010 11:02:25 +0100
Subject: Merge WebKit at r66079 : Initial merge by git

Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
---
 WebKit/chromium/src/ChromiumBridge.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'WebKit/chromium/src/ChromiumBridge.cpp')

diff --git a/WebKit/chromium/src/ChromiumBridge.cpp b/WebKit/chromium/src/ChromiumBridge.cpp
index 5b18e82..33f405d 100644
--- a/WebKit/chromium/src/ChromiumBridge.cpp
+++ b/WebKit/chromium/src/ChromiumBridge.cpp
@@ -44,6 +44,7 @@
 #include "WebFileUtilities.h"
 #include "WebFrameClient.h"
 #include "WebFrameImpl.h"
+#include "WebIDBKey.h"
 #include "WebImage.h"
 #include "WebKit.h"
 #include "WebKitClient.h"
@@ -51,6 +52,7 @@
 #include "WebPluginContainerImpl.h"
 #include "WebPluginListBuilderImpl.h"
 #include "WebSandboxSupport.h"
+#include "WebSerializedScriptValue.h"
 #include "WebScreenInfo.h"
 #include "WebString.h"
 #include "WebURL.h"
@@ -500,6 +502,18 @@ PassRefPtr<IDBFactoryBackendInterface> ChromiumBridge::idbFactory()
     return IDBFactoryBackendProxy::create();
 }
 
+void ChromiumBridge::createIDBKeysFromSerializedValuesAndKeyPath(const Vector<RefPtr<SerializedScriptValue> >& values, const String& keyPath, Vector<RefPtr<IDBKey> >& keys)
+{
+    WebVector<WebSerializedScriptValue> webValues = values;
+    WebVector<WebIDBKey> webKeys;
+    webKitClient()->createIDBKeysFromSerializedValuesAndKeyPath(webValues, WebString(keyPath), webKeys);
+
+    size_t webKeysSize = webKeys.size();
+    keys.reserveCapacity(webKeysSize);
+    for (size_t i = 0; i < webKeysSize; ++i)
+        keys.append(PassRefPtr<IDBKey>(webKeys[i]));
+}
+
 // Keygen ---------------------------------------------------------------------
 
 String ChromiumBridge::signedPublicKeyAndChallengeString(
-- 
cgit v1.1