diff options
| author | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-22 22:01:33 +0000 |
|---|---|---|
| committer | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-22 22:01:33 +0000 |
| commit | 09e005b26c37dd2e901ce822e72e77ab01742ea5 (patch) | |
| tree | ec4e4f452e8a0310cc0240b7ef3784bfaaa38431 | |
| parent | 405dfb4047a28defa718f5d2d6e7fa16497f927b (diff) | |
| download | chromium_src-09e005b26c37dd2e901ce822e72e77ab01742ea5.zip chromium_src-09e005b26c37dd2e901ce822e72e77ab01742ea5.tar.gz chromium_src-09e005b26c37dd2e901ce822e72e77ab01742ea5.tar.bz2 | |
Webkit roll 49946:49947, also wtc's change (http://codereview.chromium.org/315017)
BUG=none
TEST=none
TBR=wtc
Review URL: http://codereview.chromium.org/314013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29828 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/api/src/ChromiumBridge.cpp | 9 |
2 files changed, 10 insertions, 1 deletions
@@ -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() |