diff options
| author | Paulo Pinheiro <paulovap.os@gmail.com> | 2015-03-10 15:16:28 -0300 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-04-16 13:27:03 +0000 |
| commit | 2c246e60e886b082e7438cf8f68cdc22bc919fd9 (patch) | |
| tree | 6c96040900b6b588f865516cde419737d60d38d8 /src/core/chromium_overrides.cpp | |
| parent | 975401e71ce14532a543a6f8fb9a35e5390db32a (diff) | |
Update support for Shockwave Flash plugin.
Add necessary support to make Flash plugin work
properly and be able to navigate on urls and
load fonts from system. Support for fullscreen
mode still missing.
Change-Id: Id948cde47b852332e1a4f5a73e781f01d27223f8
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'src/core/chromium_overrides.cpp')
| -rw-r--r-- | src/core/chromium_overrides.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp index bd76025ea..3e2008bbf 100644 --- a/src/core/chromium_overrides.cpp +++ b/src/core/chromium_overrides.cpp @@ -47,6 +47,8 @@ #include <QGuiApplication> #include <QScreen> #include <QWindow> +#include <QFontDatabase> +#include <QStringList> #if defined(OS_ANDROID) #include "media/video/capture/fake_video_capture_device.h" @@ -119,8 +121,17 @@ namespace content { // content/common/font_list.h scoped_ptr<base::ListValue> GetFontList_SlowBlocking() { - QT_NOT_USED - return scoped_ptr<base::ListValue>(new base::ListValue); + scoped_ptr<base::ListValue> font_list(new base::ListValue); + + QFontDatabase database; + for (auto family : database.families()){ + base::ListValue* font_item = new base::ListValue(); + font_item->Append(new base::StringValue(family.toStdString())); + font_item->Append(new base::StringValue(family.toStdString())); // should be localized name. + // TODO: Support localized family names. + font_list->Append(font_item); + } + return font_list.Pass(); } #if defined(ENABLE_PLUGINS) |