Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / html / HTMLKeygenElement.cpp

diff --git a/src/third_party/WebKit/Source/core/html/HTMLKeygenElement.cpp b/src/third_party/WebKit/Source/core/html/HTMLKeygenElement.cpp
index e6274fa..42963bd 100644 (file)
--- a/src/third_party/WebKit/Source/core/html/HTMLKeygenElement.cpp
+++ b/src/third_party/WebKit/Source/core/html/HTMLKeygenElement.cpp
@@ -33,7 +33,9 @@
 #include "core/html/FormDataList.h"
 #include "core/html/HTMLOptionElement.h"
 #include "core/html/HTMLSelectElement.h"
-#include "platform/SSLKeyGenerator.h"
+#include "platform/text/PlatformLocale.h"
+#include "public/platform/Platform.h"
+#include "public/platform/WebLocalizedString.h"
 #include "wtf/StdLibExtras.h"
 
 using namespace blink;
@@ -45,7 +47,6 @@ using namespace HTMLNames;
 HTMLKeygenElement::HTMLKeygenElement(Document& document, HTMLFormElement* form)
     : HTMLFormControlElementWithState(keygenTag, document, form)
 {
-    ScriptWrappable::init(this);
 }
 
 PassRefPtrWillBeRawPtr<HTMLKeygenElement> HTMLKeygenElement::create(Document& document, HTMLFormElement* form)
@@ -60,7 +61,9 @@ void HTMLKeygenElement::didAddUserAgentShadowRoot(ShadowRoot& root)
     DEFINE_STATIC_LOCAL(AtomicString, keygenSelectPseudoId, ("-webkit-keygen-select", AtomicString::ConstructFromLiteral));
 
     Vector<String> keys;
-    getSupportedKeySizes(locale(), keys);
+    keys.reserveCapacity(2);
+    keys.append(locale().queryString(WebLocalizedString::KeygenMenuHighGradeKeySize));
+    keys.append(locale().queryString(WebLocalizedString::KeygenMenuMediumGradeKeySize));
 
     // Create a select element with one option element for each key size.
     RefPtrWillBeRawPtr<HTMLSelectElement> select = HTMLSelectElement::create(document());
@@ -89,7 +92,7 @@ bool HTMLKeygenElement::appendFormData(FormDataList& encoding, bool)
     const AtomicString& keyType = fastGetAttribute(keytypeAttr);
     if (!keyType.isNull() && !equalIgnoringCase(keyType, "rsa"))
         return false;
-    String value = signedPublicKeyAndChallengeString(shadowSelect()->selectedIndex(), fastGetAttribute(challengeAttr), document().baseURL());
+    String value = Platform::current()->signedPublicKeyAndChallengeString(shadowSelect()->selectedIndex(), fastGetAttribute(challengeAttr), document().baseURL());
     if (value.isNull())
         return false;
     encoding.appendData(name(), value.utf8());