diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2011-07-20 16:36:45 -0700 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2011-07-21 09:24:53 -0700 |
| commit | d20466cbeb31c73eace8f0c4eb6c717b1e1ae540 (patch) | |
| tree | e8621919a689be4699820f68692e8296e418cf5b /Source/WebKit/android/jni/WebCoreFrameBridge.h | |
| parent | 4f25266c21bdd7dcd9996807fae04f7dfb0373de (diff) | |
| download | external_webkit-d20466cbeb31c73eace8f0c4eb6c717b1e1ae540.zip external_webkit-d20466cbeb31c73eace8f0c4eb6c717b1e1ae540.tar.gz external_webkit-d20466cbeb31c73eace8f0c4eb6c717b1e1ae540.tar.bz2 | |
Safely convert punycode IDN to Unicode for display.
Use chromium's net::IDNToUnicode to accomplish this, which adopts
safe measures for converting.
issue: 4384726
Change-Id: If265a849ff0e9d6782705fc1639391bab9e6bcab
Diffstat (limited to 'Source/WebKit/android/jni/WebCoreFrameBridge.h')
| -rw-r--r-- | Source/WebKit/android/jni/WebCoreFrameBridge.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.h b/Source/WebKit/android/jni/WebCoreFrameBridge.h index acf4eb4..0a8fe8b 100644 --- a/Source/WebKit/android/jni/WebCoreFrameBridge.h +++ b/Source/WebKit/android/jni/WebCoreFrameBridge.h @@ -160,7 +160,11 @@ class WebFrame : public WebCoreRefObject { void saveFormData(WebCore::HTMLFormElement*); const WebCore::RenderSkinAndroid* renderSkins() const { return m_renderSkins; } void setRenderSkins(const WebCore::RenderSkinAndroid* skins) { m_renderSkins = skins; } -private: + + // Convert a URL from potential punycode I18nDomainName to safe to-be-displayed Unicode. + static WTF::String convertIDNToUnicode(const WebCore::KURL& kurl); + + private: struct JavaBrowserFrame; JavaBrowserFrame* mJavaFrame; WebCore::Page* mPage; |