summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--webkit/api/src/ChromiumBridge.cpp9
2 files changed, 10 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index b51f2f2..900a801 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "49946",
+ "webkit_revision": "49947",
"ffmpeg_revision": "28488",
}
diff --git a/webkit/api/src/ChromiumBridge.cpp b/webkit/api/src/ChromiumBridge.cpp
index 34e596e..e227683 100644
--- a/webkit/api/src/ChromiumBridge.cpp
+++ b/webkit/api/src/ChromiumBridge.cpp
@@ -264,6 +264,15 @@ long long ChromiumBridge::databaseGetFileSize(const String& fileName)
}
#endif
+// Keygen ---------------------------------------------------------------------
+
+String ChromiumBridge::signedPublicKeyAndChallengeString(
+ unsigned keySizeIndex, const String& challenge, const KURL& url)
+{
+ notImplemented();
+ return String();
+}
+
// Language -------------------------------------------------------------------
String ChromiumBridge::computedDefaultLanguage()