diff --git a/src/core/config/embedded_android.pri b/src/core/config/embedded_android.pri
index 6ffa1c07733e5ffd4d846a2f06b9b50ea7e600d1..87870878618d78592636544a3add442d014a6e10 100644
--- a/src/core/config/embedded_android.pri
+++ b/src/core/config/embedded_android.pri
@@ -12,6 +12,7 @@ GYP_CONFIG += \
build_ffmpegsumo=0 \
configuration_policy=0 \
disable_nacl=1 \
+ embedded=1 \
enable_autofill_dialog=0 \
enable_automation=0 \
enable_background=0 \
@@ -30,7 +31,6 @@ GYP_CONFIG += \
enable_webrtc=0 \
gcc_version=46 \
gtest_target_type=none \
- icu_use_data_file_flag=0 \
input_speech=0 \
java_bridge=0 \
media_use_ffmpeg=0 \
@@ -44,6 +44,7 @@ GYP_CONFIG += \
remoting=0 \
safe_browsing=0 \
skia_os=android \
+ test_isolation_mode=noop \
use_aura=0 \
use_cairo=0 \
use_canvas_skia=0 \
@@ -58,11 +59,12 @@ GYP_CONFIG += \
use_libffmpeg=0 \
use_openmax_dl_fft=0 \
use_openssl=1 \
+ use_openssl_certs=1 \
use_ozone=0 \
use_pango=0 \
use_pulseaudio=0 \
use_system_expat=1 \
- use_system_icu=1 \
+ use_system_icu=0 \
use_system_libjpeg=0 \
use_system_skia=0 \
use_system_sqlite=0 \
diff --git a/src/core/qtwebengine.gypi b/src/core/qtwebengine.gypi
index ba08c72c1e3f4bb6f72d44bd1d392bf25eb137d9..17287669fa11c9d33a75eb0a223f7c9a434dc475 100644
--- a/src/core/qtwebengine.gypi
+++ b/src/core/qtwebengine.gypi
@@ -59,6 +59,7 @@
'conditions': [
['qt_os=="embedded_android"', {
'dependencies': [
+ '<(chromium_src_dir)/ui/ozone/ozone.gyp:ozone_base',
'<(chromium_src_dir)/third_party/ashmem/ashmem.gyp:ashmem',
'<(chromium_src_dir)/third_party/freetype/freetype.gyp:ft2',
'<(chromium_src_dir)/third_party/android_tools/ndk/android_tools_ndk.gyp:cpu_features',
diff --git a/src/core/render_widget_host_view_qt.h b/src/core/render_widget_host_view_qt.h
index 855a85fff3f99f3a9e220afcec9fff60e31d41ab..301ff2df90ccd0d02b6e583681cab58def7e86fc 100644
--- a/src/core/render_widget_host_view_qt.h
+++ b/src/core/render_widget_host_view_qt.h
@@ -186,7 +186,8 @@ public:
#if defined(OS_ANDROID)
virtual void ShowDisambiguationPopup(const gfx::Rect&, const SkBitmap&) Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED }
- virtual void HasTouchEventHandlers(bool) Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED }
+ virtual void LockCompositingSurface() Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED }
+ virtual void UnlockCompositingSurface() Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED }
#endif // defined(OS_ANDROID)
#if defined(OS_WIN)
diff --git a/src/core/surface_factory_qt.cpp b/src/core/surface_factory_qt.cpp
index ca48da46e000ad1cf8d2d87d6e4a482ed23f73a3..85b9eb799ab3a4c236661d9ccdfcf93b75c0c41d 100644
--- a/src/core/surface_factory_qt.cpp
+++ b/src/core/surface_factory_qt.cpp
@@ -36,6 +36,7 @@
#include "surface_factory_qt.h"
+#include "gl_context_qt.h"
#include "type_conversion.h"
#include "base/files/file_path.h"
@@ -95,7 +96,7 @@ bool SurfaceFactoryQt::LoadEGLGLES2Bindings(AddGLLibraryCallback add_gl_library,
intptr_t SurfaceFactoryQt::GetNativeDisplay()
{
- static void *display = qApp->platformNativeInterface()->nativeResourceForIntegration(QByteArrayLiteral("nativedisplay"));
+ static void *display = GLContextHelper::getNativeDisplay();
if (display)
return reinterpret_cast<intptr_t>(display);
diff --git a/src/core/surface_factory_qt.h b/src/core/surface_factory_qt.h
index cf9a0087563031728b30a84f869519733379cc8e..1b2ec744d4abe7793132ea7bb9df36b9496a0635 100644
--- a/src/core/surface_factory_qt.h
+++ b/src/core/surface_factory_qt.h
@@ -39,21 +39,20 @@
#if defined(USE_OZONE) || defined(OS_ANDROID)
-#include "ui/gfx/ozone/surface_factory_ozone.h"
+#include "ui/ozone/public/surface_factory_ozone.h"
#include <QtGlobal>
class SurfaceFactoryQt
- : public gfx::SurfaceFactoryOzone
+ : public ui::SurfaceFactoryOzone
{
virtual bool LoadEGLGLES2Bindings(AddGLLibraryCallback add_gl_library, SetGLGetProcAddressProcCallback set_gl_get_proc_address) Q_DECL_OVERRIDE;
virtual intptr_t GetNativeDisplay() Q_DECL_OVERRIDE;
- virtual gfx::SurfaceFactoryOzone::HardwareState InitializeHardware() Q_DECL_OVERRIDE { return gfx::SurfaceFactoryOzone::INITIALIZED; }
+ virtual ui::SurfaceFactoryOzone::HardwareState InitializeHardware() Q_DECL_OVERRIDE { return ui::SurfaceFactoryOzone::INITIALIZED; }
virtual void ShutdownHardware() Q_DECL_OVERRIDE {}
virtual gfx::AcceleratedWidget GetAcceleratedWidget() Q_DECL_OVERRIDE { return 0; }
virtual gfx::AcceleratedWidget RealizeAcceleratedWidget(gfx::AcceleratedWidget w) Q_DECL_OVERRIDE { return 0; }
virtual bool AttemptToResizeAcceleratedWidget(gfx::AcceleratedWidget w, const gfx::Rect& bounds) Q_DECL_OVERRIDE { return false; }
- virtual gfx::VSyncProvider* GetVSyncProvider(gfx::AcceleratedWidget w) Q_DECL_OVERRIDE { return NULL; }
};
#endif
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index 669beccb40b33f06acbda2a4090b54b3b22de75e..7c0a45b68b2a7cc83458f5255a0176389a8b5c7f 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -58,6 +58,7 @@
#include "content/utility/in_process_utility_thread.h"
#include "gpu/command_buffer/service/gpu_switches.h"
#include "ui/events/event_switches.h"
+#include "ui/native_theme/native_theme_switches.h"
#include "ui/gl/gl_switches.h"
#if defined(OS_WIN)
#include "sandbox/win/src/sandbox_types.h"
@@ -144,23 +145,18 @@ WebEngineContext::WebEngineContext()
#if defined(QTWEBENGINE_MOBILE_SWITCHES)
// Inspired from the Android port's default switches
- parsedCommandLine->AppendSwitch(switches::kEnableOverlayScrollbars);
+ parsedCommandLine->AppendSwitch(switches::kEnableOverlayScrollbar);
parsedCommandLine->AppendSwitch(switches::kEnableGestureTapHighlight);
parsedCommandLine->AppendSwitch(switches::kEnablePinch);
parsedCommandLine->AppendSwitch(switches::kEnableViewport);
parsedCommandLine->AppendSwitch(switches::kEnableViewportMeta);
parsedCommandLine->AppendSwitch(switches::kEnableSmoothScrolling);
- parsedCommandLine->AppendSwitch(switches::kDisableAcceleratedVideo);
- parsedCommandLine->AppendSwitch(switches::kDisableAudio);
+ parsedCommandLine->AppendSwitch(switches::kDisableAcceleratedVideoDecode);
parsedCommandLine->AppendSwitch(switches::kEnableAcceleratedOverflowScroll);
parsedCommandLine->AppendSwitch(switches::kEnableCompositingForFixedPosition);
- parsedCommandLine->AppendSwitch(switches::kEnableAcceleratedScrollableFrames);
- parsedCommandLine->AppendSwitch(switches::kEnableCompositedScrollingForFrames);
- parsedCommandLine->AppendSwitch(switches::kForceCompositingMode);
parsedCommandLine->AppendSwitch(switches::kDisableGpuShaderDiskCache);
parsedCommandLine->AppendSwitch(switches::kDisable2dCanvasAntialiasing);
- parsedCommandLine->AppendSwitch(switches::kEnableDeadlineScheduling);
- parsedCommandLine->AppendSwitch(cc::switches::kEnableImplSidePainting);
+ parsedCommandLine->AppendSwitch(switches::kEnableImplSidePainting);
parsedCommandLine->AppendSwitch(cc::switches::kDisableCompositedAntialiasing);
parsedCommandLine->AppendSwitchASCII(switches::kProfilerTiming, switches::kProfilerTimingDisabledValue);
@@ -170,7 +166,6 @@ WebEngineContext::WebEngineContext()
// On eAndroid we use this to get the native display
// from Qt in GLSurfaceEGL::InitializeOneOff.
m_surfaceFactory.reset(new SurfaceFactoryQt());
- gfx::SurfaceFactoryOzone::SetInstance(m_surfaceFactory.get());
#endif
GLContextHelper::initialize();
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
index 28bc4307f2ea1276c88d4c7002724b6015eccbb1..2c4b9e0c2c3de6835d7f6608effed76886e7cca9 100644
--- a/tools/qmake/mkspecs/features/functions.prf
+++ b/tools/qmake/mkspecs/features/functions.prf
@@ -4,6 +4,7 @@ defineTest(isPlatformSupported) {
win32: !contains(QT_CONFIG, angle): return(false)
linux-g++|win32-msvc2013|macx-clang: return(true)
+ android-g++-b2qt: return(true)
return(false)
}