diff options
| -rw-r--r-- | src/core/config/embedded_android.pri | 67 | ||||
| -rw-r--r-- | src/core/gyp_run.pro | 2 | ||||
| -rw-r--r-- | src/core/web_engine_context.cpp | 8 |
3 files changed, 74 insertions, 3 deletions
diff --git a/src/core/config/embedded_android.pri b/src/core/config/embedded_android.pri index b2d0eb3ee..1a537e8bf 100644 --- a/src/core/config/embedded_android.pri +++ b/src/core/config/embedded_android.pri @@ -5,3 +5,70 @@ TOOLCHAIN_SYSROOT = $$ANDROID_BUILD_TOP GYP_ARGS += "-D qt_os=\"embedded_android\" -D android_src=\"$${TOOLCHAIN_SYSROOT}\" -D android_toolchain=\"$${ANDROID_TOOLCHAIN}\"" \ "-D android_ndk_root=\"$${TOOLCHAIN_SYSROOT}\" -D android_product_out=\"$${ANDROID_PRODUCT_OUT}\"" + +GYP_CONFIG += \ + OS=android_no_sdk \ + android_use_tcmalloc=0 \ + android_webview_build=0 \ + build_ffmpegsumo=0 \ + configuration_policy=0 \ + disable_nacl=1 \ + enable_autofill_dialog=0 \ + enable_automation=0 \ + enable_background=0 \ + enable_captive_portal_detection=0 \ + enable_extensions=0 \ + enable_google_now=0 \ + enable_language_detection=0 \ + enable_managed_users=0 \ + enable_plugin_installation=0 \ + enable_plugins=0 \ + enable_printing=0 \ + enable_session_service=0 \ + enable_spellcheck=0 \ + enable_task_manager=0 \ + enable_themes=0 \ + enable_webrtc=0 \ + gcc_version=46 \ + gtest_target_type=none \ + icu_use_data_file_flag=0 \ + input_speech=0 \ + java_bridge=0 \ + linux_use_tcmalloc=0 \ + media_use_ffmpeg=0 \ + media_use_libvpx=0 \ + native_discardable_memory=1 \ + native_memory_pressure_signals=1 \ + notifications=0 \ + p2p_apis=0 \ + posix_avoid_mmap=1 \ + proprietary_codecs=0 \ + remoting=0 \ + safe_browsing=0 \ + skia_os=android \ + use_aura=0 \ + use_cairo=0 \ + use_canvas_skia=0 \ + use_cups=0 \ + use_default_render_theme=0 \ + use_ffmpeg=0 \ + use_gconf=0 \ + use_gio=0 \ + use_glib=0 \ + use_gnome_keyring=0 \ + use_kerberos=0 \ + use_libffmpeg=0 \ + use_openmax_dl_fft=0 \ + use_openssl=1 \ + use_ozone=0 \ + use_pango=0 \ + use_pulseaudio=0 \ + use_system_expat=1 \ + use_system_icu=1 \ + use_system_libjpeg=0 \ + use_system_skia=0 \ + use_system_sqlite=0 \ + use_system_stlport=0 \ + use_x11=0 \ + v8_use_snapshot=false \ + want_separate_host_toolset=0 \ diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro index 515febeb8..43801c8ae 100644 --- a/src/core/gyp_run.pro +++ b/src/core/gyp_run.pro @@ -7,8 +7,8 @@ TEMPLATE = aux cross_compile { GYP_ARGS = "-D qt_cross_compile=1" posix: GYP_ARGS += "-D os_posix=1" - linux: include(config/embedded_linux.pri) android: include(config/embedded_android.pri) + else:linux: include(config/embedded_linux.pri) } else { # !cross_compile GYP_ARGS = "-D qt_cross_compile=0" diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index faf40f1ce..e6c9f70cf 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -60,6 +60,7 @@ #include "content/utility/in_process_utility_thread.h" #include "content/renderer/in_process_renderer_thread.h" #include "content/gpu/in_process_gpu_thread.h" +#include "ui/events/event_switches.h" #include "ui/gl/gl_switches.h" #include "gpu/command_buffer/service/gpu_switches.h" #include "sandbox/win/src/sandbox_types.h" @@ -136,8 +137,10 @@ WebEngineContext::WebEngineContext() parsedCommandLine->AppendSwitch(switches::kEnableOverlayScrollbars); parsedCommandLine->AppendSwitch(switches::kEnableGestureTapHighlight); parsedCommandLine->AppendSwitch(switches::kEnablePinch); - parsedCommandLine->AppendSwitch(switches::kEnableFixedLayout); parsedCommandLine->AppendSwitch(switches::kEnableViewport); + parsedCommandLine->AppendSwitch(switches::kEnableViewportMeta); + parsedCommandLine->AppendSwitch(switches::kEnableScrollPrediction); + parsedCommandLine->AppendSwitch(switches::kEnableSmoothScrolling); parsedCommandLine->AppendSwitch(switches::kDisableAcceleratedVideo); parsedCommandLine->AppendSwitch(switches::kDisableAudio); parsedCommandLine->AppendSwitch(switches::kEnableAcceleratedOverflowScroll); @@ -150,7 +153,8 @@ WebEngineContext::WebEngineContext() parsedCommandLine->AppendSwitch(switches::kEnableDeadlineScheduling); parsedCommandLine->AppendSwitch(cc::switches::kDisableImplSidePainting); parsedCommandLine->AppendSwitch(cc::switches::kDisableCompositedAntialiasing); - parsedCommandLine->AppendSwitch(cc::switches::kDisable4444Textures); + + parsedCommandLine->AppendSwitchASCII(switches::kProfilerTiming, switches::kProfilerTimingDisabledValue); #endif GLContextHelper::initialize(); |