diff options
| author | Andrei Popescu <andreip@google.com> | 2009-11-24 12:04:22 +0000 |
|---|---|---|
| committer | Andrei Popescu <andreip@google.com> | 2009-11-25 16:11:39 +0000 |
| commit | 1890130f485b2a3365409653a1b83396a02eed94 (patch) | |
| tree | 1c473fd65e1f872ec60647cbc47166de0c66c437 /WebCore/platform/android/SSLKeyGeneratorAndroid.cpp | |
| parent | fb5979ac6e2238d5ae16f43cca16e6a0932a4279 (diff) | |
| download | external_webkit-1890130f485b2a3365409653a1b83396a02eed94.zip external_webkit-1890130f485b2a3365409653a1b83396a02eed94.tar.gz external_webkit-1890130f485b2a3365409653a1b83396a02eed94.tar.bz2 | |
Update files in platform/android to match what was upstreamed in
https://bugs.webkit.org/show_bug.cgi?id=31825
https://bugs.webkit.org/show_bug.cgi?id=31831
Diffstat (limited to 'WebCore/platform/android/SSLKeyGeneratorAndroid.cpp')
| -rw-r--r-- | WebCore/platform/android/SSLKeyGeneratorAndroid.cpp | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/WebCore/platform/android/SSLKeyGeneratorAndroid.cpp b/WebCore/platform/android/SSLKeyGeneratorAndroid.cpp index 0279909..287d5c4 100644 --- a/WebCore/platform/android/SSLKeyGeneratorAndroid.cpp +++ b/WebCore/platform/android/SSLKeyGeneratorAndroid.cpp @@ -23,31 +23,21 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include "config.h" #include "SSLKeyGenerator.h" -#include "JavaSharedClient.h" -#include "KeyGeneratorClient.h" +#include "PlatformBridge.h" namespace WebCore { void getSupportedKeySizes(Vector<String>& keys) { - if (android::JavaSharedClient::GetKeyGeneratorClient()) { - keys = android::JavaSharedClient::GetKeyGeneratorClient()-> - getSupportedKeyStrengthList(); - } + keys = PlatformBridge::getSupportedKeyStrengthList(); } -String signedPublicKeyAndChallengeString(unsigned index, - const String& challenge, const KURL& url) +String signedPublicKeyAndChallengeString(unsigned index, const String& challenge, const KURL& url) { - if (android::JavaSharedClient::GetKeyGeneratorClient()) { - return android::JavaSharedClient::GetKeyGeneratorClient()-> - getSignedPublicKeyAndChallengeString(index, challenge, url); - } - return String(); + return PlatformBridge::getSignedPublicKeyAndChallengeString(index, challenge, url); } } |