Merge from Chromium at DEPS revision 39.0.2171.44
This commit was generated by merge_to_master.py.
Change-Id: I12ecf158017b8be5f9a1d33f4152e5a3c812cb7f
diff --git a/android_webview/android_webview_common.target.darwin-arm.mk b/android_webview/android_webview_common.target.darwin-arm.mk
index c1aba6b..100e327 100644
--- a/android_webview/android_webview_common.target.darwin-arm.mk
+++ b/android_webview/android_webview_common.target.darwin-arm.mk
@@ -170,6 +170,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -329,6 +330,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/android_webview/android_webview_common.target.darwin-arm64.mk b/android_webview/android_webview_common.target.darwin-arm64.mk
index 9ce0d3b..7873d2e 100644
--- a/android_webview/android_webview_common.target.darwin-arm64.mk
+++ b/android_webview/android_webview_common.target.darwin-arm64.mk
@@ -159,6 +159,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -306,6 +307,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/android_webview/android_webview_common.target.darwin-mips.mk b/android_webview/android_webview_common.target.darwin-mips.mk
index 24b21d3..3a97f2d 100644
--- a/android_webview/android_webview_common.target.darwin-mips.mk
+++ b/android_webview/android_webview_common.target.darwin-mips.mk
@@ -162,6 +162,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -313,6 +314,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/android_webview/android_webview_common.target.darwin-x86.mk b/android_webview/android_webview_common.target.darwin-x86.mk
index a89e18c..e66d988 100644
--- a/android_webview/android_webview_common.target.darwin-x86.mk
+++ b/android_webview/android_webview_common.target.darwin-x86.mk
@@ -165,6 +165,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -318,6 +319,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/android_webview/android_webview_common.target.darwin-x86_64.mk b/android_webview/android_webview_common.target.darwin-x86_64.mk
index 0dac4d3..7d32438 100644
--- a/android_webview/android_webview_common.target.darwin-x86_64.mk
+++ b/android_webview/android_webview_common.target.darwin-x86_64.mk
@@ -164,6 +164,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -316,6 +317,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/android_webview/android_webview_common.target.linux-arm.mk b/android_webview/android_webview_common.target.linux-arm.mk
index c1aba6b..100e327 100644
--- a/android_webview/android_webview_common.target.linux-arm.mk
+++ b/android_webview/android_webview_common.target.linux-arm.mk
@@ -170,6 +170,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -329,6 +330,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/android_webview/android_webview_common.target.linux-arm64.mk b/android_webview/android_webview_common.target.linux-arm64.mk
index 9ce0d3b..7873d2e 100644
--- a/android_webview/android_webview_common.target.linux-arm64.mk
+++ b/android_webview/android_webview_common.target.linux-arm64.mk
@@ -159,6 +159,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -306,6 +307,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/android_webview/android_webview_common.target.linux-mips.mk b/android_webview/android_webview_common.target.linux-mips.mk
index 24b21d3..3a97f2d 100644
--- a/android_webview/android_webview_common.target.linux-mips.mk
+++ b/android_webview/android_webview_common.target.linux-mips.mk
@@ -162,6 +162,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -313,6 +314,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/android_webview/android_webview_common.target.linux-x86.mk b/android_webview/android_webview_common.target.linux-x86.mk
index a89e18c..e66d988 100644
--- a/android_webview/android_webview_common.target.linux-x86.mk
+++ b/android_webview/android_webview_common.target.linux-x86.mk
@@ -165,6 +165,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -318,6 +319,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/android_webview/android_webview_common.target.linux-x86_64.mk b/android_webview/android_webview_common.target.linux-x86_64.mk
index 0dac4d3..7d32438 100644
--- a/android_webview/android_webview_common.target.linux-x86_64.mk
+++ b/android_webview/android_webview_common.target.linux-x86_64.mk
@@ -164,6 +164,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -316,6 +317,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc
index 098ce73ea..bfb42f5 100644
--- a/android_webview/browser/aw_browser_context.cc
+++ b/android_webview/browser/aw_browser_context.cc
@@ -20,6 +20,7 @@
#include "components/data_reduction_proxy/browser/data_reduction_proxy_params.h"
#include "components/data_reduction_proxy/browser/data_reduction_proxy_prefs.h"
#include "components/data_reduction_proxy/browser/data_reduction_proxy_settings.h"
+#include "components/data_reduction_proxy/browser/data_reduction_proxy_statistics_prefs.h"
#include "components/user_prefs/user_prefs.h"
#include "components/visitedlink/browser/visitedlink_master.h"
#include "content/public/browser/browser_thread.h"
@@ -94,6 +95,10 @@
context->GetDataReductionProxySettings();
if (proxy_settings == NULL)
return;
+
+ context->CreateDataReductionProxyStatisticsIfNecessary();
+ proxy_settings->SetDataReductionProxyStatisticsPrefs(
+ context->data_reduction_proxy_statistics_.get());
proxy_settings->SetDataReductionProxyEnabled(data_reduction_proxy_enabled_);
}
@@ -213,8 +218,7 @@
user_pref_service_.get(),
GetRequestContext());
- data_reduction_proxy_settings_->SetDataReductionProxyEnabled(
- data_reduction_proxy_enabled_);
+ SetDataReductionProxyEnabled(data_reduction_proxy_enabled_);
}
}
@@ -294,4 +298,19 @@
enumerator->OnComplete(true);
}
+void AwBrowserContext::CreateDataReductionProxyStatisticsIfNecessary() {
+ DCHECK(user_pref_service_.get());
+
+ if (!data_reduction_proxy_statistics_.get()) {
+ // We don't care about commit_delay for now. It is just a dummy value.
+ base::TimeDelta commit_delay = base::TimeDelta::FromMinutes(60);
+ data_reduction_proxy_statistics_ =
+ scoped_ptr<data_reduction_proxy::DataReductionProxyStatisticsPrefs>(
+ new data_reduction_proxy::DataReductionProxyStatisticsPrefs(
+ user_pref_service_.get(),
+ base::MessageLoopProxy::current(),
+ commit_delay));
+ }
+}
+
} // namespace android_webview
diff --git a/android_webview/browser/aw_browser_context.h b/android_webview/browser/aw_browser_context.h
index b099e21..76ad8b6 100644
--- a/android_webview/browser/aw_browser_context.h
+++ b/android_webview/browser/aw_browser_context.h
@@ -30,6 +30,7 @@
namespace data_reduction_proxy {
class DataReductionProxyConfigurator;
class DataReductionProxySettings;
+class DataReductionProxyStatisticsPrefs;
}
namespace net {
@@ -116,6 +117,7 @@
const scoped_refptr<URLEnumerator>& enumerator) OVERRIDE;
private:
+ void CreateDataReductionProxyStatisticsIfNecessary();
static bool data_reduction_proxy_enabled_;
// The file path where data for this context is persisted.
@@ -136,6 +138,8 @@
scoped_ptr<data_reduction_proxy::DataReductionProxyConfigurator>
data_reduction_proxy_configurator_;
+ scoped_ptr<data_reduction_proxy::DataReductionProxyStatisticsPrefs>
+ data_reduction_proxy_statistics_;
scoped_ptr<data_reduction_proxy::DataReductionProxySettings>
data_reduction_proxy_settings_;
diff --git a/android_webview/browser/browser_view_renderer.cc b/android_webview/browser/browser_view_renderer.cc
index d0c42a2..a3b657d 100644
--- a/android_webview/browser/browser_view_renderer.cc
+++ b/android_webview/browser/browser_view_renderer.cc
@@ -96,7 +96,9 @@
g_tile_area = 256 * 256;
// Also use a high tile limit since there are no file descriptor issues.
- GlobalTileManager::GetInstance()->SetTileLimit(1000);
+ // There is no need to limit number of tiles, so use an effectively
+ // unlimited value as the limit.
+ GlobalTileManager::GetInstance()->SetTileLimit(10 * 1000 * 1000);
return;
}
diff --git a/android_webview/libwebviewchromium.target.darwin-arm.mk b/android_webview/libwebviewchromium.target.darwin-arm.mk
index fff7166..05354ee 100644
--- a/android_webview/libwebviewchromium.target.darwin-arm.mk
+++ b/android_webview/libwebviewchromium.target.darwin-arm.mk
@@ -345,14 +345,14 @@
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_video_render_module_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_video_render_module_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_usrsctp_usrsctplib_gyp,,,$(GYP_VAR_PREFIX))/third_party_usrsctp_usrsctplib_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libjingle_libpeerconnection_gyp,,,$(GYP_VAR_PREFIX))/third_party_libjingle_libpeerconnection_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_voice_engine_voice_engine_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_voice_engine_voice_engine_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_conference_mixer_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_conference_mixer_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_processing_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_processing_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audioproc_debug_proto_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audioproc_debug_proto_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_processing_neon_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_processing_neon_gyp.a \
$(call intermediates-dir-for,GYP,third_party_webrtc_modules_audio_processing_gen_nsx_core_neon_offsets_h_gyp,,,$(GYP_VAR_PREFIX))/gen_nsx_core_neon_offsets_h.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,lib_core_neon_offsets,,,$(GYP_VAR_PREFIX))/lib_core_neon_offsets.a \
$(call intermediates-dir-for,GYP,third_party_webrtc_modules_audio_processing_gen_aecm_core_neon_offsets_h_gyp,,,$(GYP_VAR_PREFIX))/gen_aecm_core_neon_offsets_h.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_voice_engine_voice_engine_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_voice_engine_voice_engine_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_conference_mixer_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_conference_mixer_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_device_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_device_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_bitrate_controller_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_bitrate_controller_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_rtp_rtcp_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_rtp_rtcp_gyp.a \
@@ -865,12 +865,12 @@
third_party_webrtc_modules_video_render_module_gyp \
third_party_usrsctp_usrsctplib_gyp \
third_party_libjingle_libpeerconnection_gyp \
- third_party_webrtc_voice_engine_voice_engine_gyp \
- third_party_webrtc_modules_audio_conference_mixer_gyp \
third_party_webrtc_modules_audio_processing_gyp \
third_party_webrtc_modules_audioproc_debug_proto_gyp \
third_party_webrtc_modules_audio_processing_neon_gyp \
lib_core_neon_offsets \
+ third_party_webrtc_voice_engine_voice_engine_gyp \
+ third_party_webrtc_modules_audio_conference_mixer_gyp \
third_party_webrtc_modules_audio_device_gyp \
third_party_webrtc_modules_bitrate_controller_gyp \
third_party_webrtc_modules_rtp_rtcp_gyp \
diff --git a/android_webview/libwebviewchromium.target.darwin-arm64.mk b/android_webview/libwebviewchromium.target.darwin-arm64.mk
index f6d6675..017db3f 100644
--- a/android_webview/libwebviewchromium.target.darwin-arm64.mk
+++ b/android_webview/libwebviewchromium.target.darwin-arm64.mk
@@ -336,10 +336,10 @@
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_video_render_module_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_video_render_module_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_usrsctp_usrsctplib_gyp,,,$(GYP_VAR_PREFIX))/third_party_usrsctp_usrsctplib_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libjingle_libpeerconnection_gyp,,,$(GYP_VAR_PREFIX))/third_party_libjingle_libpeerconnection_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_voice_engine_voice_engine_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_voice_engine_voice_engine_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_conference_mixer_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_conference_mixer_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_processing_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_processing_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audioproc_debug_proto_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audioproc_debug_proto_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_voice_engine_voice_engine_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_voice_engine_voice_engine_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_conference_mixer_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_conference_mixer_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_device_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_device_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_bitrate_controller_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_bitrate_controller_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_rtp_rtcp_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_rtp_rtcp_gyp.a \
@@ -812,10 +812,10 @@
third_party_webrtc_modules_video_render_module_gyp \
third_party_usrsctp_usrsctplib_gyp \
third_party_libjingle_libpeerconnection_gyp \
- third_party_webrtc_voice_engine_voice_engine_gyp \
- third_party_webrtc_modules_audio_conference_mixer_gyp \
third_party_webrtc_modules_audio_processing_gyp \
third_party_webrtc_modules_audioproc_debug_proto_gyp \
+ third_party_webrtc_voice_engine_voice_engine_gyp \
+ third_party_webrtc_modules_audio_conference_mixer_gyp \
third_party_webrtc_modules_audio_device_gyp \
third_party_webrtc_modules_bitrate_controller_gyp \
third_party_webrtc_modules_rtp_rtcp_gyp \
diff --git a/android_webview/libwebviewchromium.target.darwin-mips.mk b/android_webview/libwebviewchromium.target.darwin-mips.mk
index 1e72dcf..0de7f10 100644
--- a/android_webview/libwebviewchromium.target.darwin-mips.mk
+++ b/android_webview/libwebviewchromium.target.darwin-mips.mk
@@ -334,10 +334,10 @@
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_video_render_module_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_video_render_module_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_usrsctp_usrsctplib_gyp,,,$(GYP_VAR_PREFIX))/third_party_usrsctp_usrsctplib_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libjingle_libpeerconnection_gyp,,,$(GYP_VAR_PREFIX))/third_party_libjingle_libpeerconnection_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_voice_engine_voice_engine_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_voice_engine_voice_engine_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_conference_mixer_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_conference_mixer_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_processing_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_processing_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audioproc_debug_proto_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audioproc_debug_proto_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_voice_engine_voice_engine_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_voice_engine_voice_engine_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_conference_mixer_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_conference_mixer_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_device_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_device_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_bitrate_controller_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_bitrate_controller_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_rtp_rtcp_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_rtp_rtcp_gyp.a \
@@ -818,10 +818,10 @@
third_party_webrtc_modules_video_render_module_gyp \
third_party_usrsctp_usrsctplib_gyp \
third_party_libjingle_libpeerconnection_gyp \
- third_party_webrtc_voice_engine_voice_engine_gyp \
- third_party_webrtc_modules_audio_conference_mixer_gyp \
third_party_webrtc_modules_audio_processing_gyp \
third_party_webrtc_modules_audioproc_debug_proto_gyp \
+ third_party_webrtc_voice_engine_voice_engine_gyp \
+ third_party_webrtc_modules_audio_conference_mixer_gyp \
third_party_webrtc_modules_audio_device_gyp \
third_party_webrtc_modules_bitrate_controller_gyp \
third_party_webrtc_modules_rtp_rtcp_gyp \
diff --git a/android_webview/libwebviewchromium.target.darwin-x86.mk b/android_webview/libwebviewchromium.target.darwin-x86.mk
index d66cda1..7ad018b 100644
--- a/android_webview/libwebviewchromium.target.darwin-x86.mk
+++ b/android_webview/libwebviewchromium.target.darwin-x86.mk
@@ -345,11 +345,11 @@
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_video_render_module_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_video_render_module_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_usrsctp_usrsctplib_gyp,,,$(GYP_VAR_PREFIX))/third_party_usrsctp_usrsctplib_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libjingle_libpeerconnection_gyp,,,$(GYP_VAR_PREFIX))/third_party_libjingle_libpeerconnection_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_voice_engine_voice_engine_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_voice_engine_voice_engine_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_conference_mixer_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_conference_mixer_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_processing_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_processing_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audioproc_debug_proto_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audioproc_debug_proto_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_processing_sse2_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_processing_sse2_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_voice_engine_voice_engine_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_voice_engine_voice_engine_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_conference_mixer_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_conference_mixer_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_device_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_device_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_bitrate_controller_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_bitrate_controller_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_rtp_rtcp_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_rtp_rtcp_gyp.a \
@@ -847,11 +847,11 @@
third_party_webrtc_modules_video_render_module_gyp \
third_party_usrsctp_usrsctplib_gyp \
third_party_libjingle_libpeerconnection_gyp \
- third_party_webrtc_voice_engine_voice_engine_gyp \
- third_party_webrtc_modules_audio_conference_mixer_gyp \
third_party_webrtc_modules_audio_processing_gyp \
third_party_webrtc_modules_audioproc_debug_proto_gyp \
third_party_webrtc_modules_audio_processing_sse2_gyp \
+ third_party_webrtc_voice_engine_voice_engine_gyp \
+ third_party_webrtc_modules_audio_conference_mixer_gyp \
third_party_webrtc_modules_audio_device_gyp \
third_party_webrtc_modules_bitrate_controller_gyp \
third_party_webrtc_modules_rtp_rtcp_gyp \
diff --git a/android_webview/libwebviewchromium.target.darwin-x86_64.mk b/android_webview/libwebviewchromium.target.darwin-x86_64.mk
index e873c2f..d3b5992 100644
--- a/android_webview/libwebviewchromium.target.darwin-x86_64.mk
+++ b/android_webview/libwebviewchromium.target.darwin-x86_64.mk
@@ -345,11 +345,11 @@
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_video_render_module_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_video_render_module_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_usrsctp_usrsctplib_gyp,,,$(GYP_VAR_PREFIX))/third_party_usrsctp_usrsctplib_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libjingle_libpeerconnection_gyp,,,$(GYP_VAR_PREFIX))/third_party_libjingle_libpeerconnection_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_voice_engine_voice_engine_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_voice_engine_voice_engine_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_conference_mixer_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_conference_mixer_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_processing_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_processing_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audioproc_debug_proto_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audioproc_debug_proto_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_processing_sse2_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_processing_sse2_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_voice_engine_voice_engine_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_voice_engine_voice_engine_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_conference_mixer_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_conference_mixer_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_device_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_device_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_bitrate_controller_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_bitrate_controller_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_rtp_rtcp_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_rtp_rtcp_gyp.a \
@@ -845,11 +845,11 @@
third_party_webrtc_modules_video_render_module_gyp \
third_party_usrsctp_usrsctplib_gyp \
third_party_libjingle_libpeerconnection_gyp \
- third_party_webrtc_voice_engine_voice_engine_gyp \
- third_party_webrtc_modules_audio_conference_mixer_gyp \
third_party_webrtc_modules_audio_processing_gyp \
third_party_webrtc_modules_audioproc_debug_proto_gyp \
third_party_webrtc_modules_audio_processing_sse2_gyp \
+ third_party_webrtc_voice_engine_voice_engine_gyp \
+ third_party_webrtc_modules_audio_conference_mixer_gyp \
third_party_webrtc_modules_audio_device_gyp \
third_party_webrtc_modules_bitrate_controller_gyp \
third_party_webrtc_modules_rtp_rtcp_gyp \
diff --git a/android_webview/libwebviewchromium.target.linux-arm.mk b/android_webview/libwebviewchromium.target.linux-arm.mk
index fff7166..05354ee 100644
--- a/android_webview/libwebviewchromium.target.linux-arm.mk
+++ b/android_webview/libwebviewchromium.target.linux-arm.mk
@@ -345,14 +345,14 @@
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_video_render_module_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_video_render_module_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_usrsctp_usrsctplib_gyp,,,$(GYP_VAR_PREFIX))/third_party_usrsctp_usrsctplib_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libjingle_libpeerconnection_gyp,,,$(GYP_VAR_PREFIX))/third_party_libjingle_libpeerconnection_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_voice_engine_voice_engine_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_voice_engine_voice_engine_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_conference_mixer_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_conference_mixer_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_processing_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_processing_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audioproc_debug_proto_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audioproc_debug_proto_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_processing_neon_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_processing_neon_gyp.a \
$(call intermediates-dir-for,GYP,third_party_webrtc_modules_audio_processing_gen_nsx_core_neon_offsets_h_gyp,,,$(GYP_VAR_PREFIX))/gen_nsx_core_neon_offsets_h.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,lib_core_neon_offsets,,,$(GYP_VAR_PREFIX))/lib_core_neon_offsets.a \
$(call intermediates-dir-for,GYP,third_party_webrtc_modules_audio_processing_gen_aecm_core_neon_offsets_h_gyp,,,$(GYP_VAR_PREFIX))/gen_aecm_core_neon_offsets_h.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_voice_engine_voice_engine_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_voice_engine_voice_engine_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_conference_mixer_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_conference_mixer_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_device_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_device_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_bitrate_controller_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_bitrate_controller_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_rtp_rtcp_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_rtp_rtcp_gyp.a \
@@ -865,12 +865,12 @@
third_party_webrtc_modules_video_render_module_gyp \
third_party_usrsctp_usrsctplib_gyp \
third_party_libjingle_libpeerconnection_gyp \
- third_party_webrtc_voice_engine_voice_engine_gyp \
- third_party_webrtc_modules_audio_conference_mixer_gyp \
third_party_webrtc_modules_audio_processing_gyp \
third_party_webrtc_modules_audioproc_debug_proto_gyp \
third_party_webrtc_modules_audio_processing_neon_gyp \
lib_core_neon_offsets \
+ third_party_webrtc_voice_engine_voice_engine_gyp \
+ third_party_webrtc_modules_audio_conference_mixer_gyp \
third_party_webrtc_modules_audio_device_gyp \
third_party_webrtc_modules_bitrate_controller_gyp \
third_party_webrtc_modules_rtp_rtcp_gyp \
diff --git a/android_webview/libwebviewchromium.target.linux-arm64.mk b/android_webview/libwebviewchromium.target.linux-arm64.mk
index f6d6675..017db3f 100644
--- a/android_webview/libwebviewchromium.target.linux-arm64.mk
+++ b/android_webview/libwebviewchromium.target.linux-arm64.mk
@@ -336,10 +336,10 @@
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_video_render_module_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_video_render_module_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_usrsctp_usrsctplib_gyp,,,$(GYP_VAR_PREFIX))/third_party_usrsctp_usrsctplib_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libjingle_libpeerconnection_gyp,,,$(GYP_VAR_PREFIX))/third_party_libjingle_libpeerconnection_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_voice_engine_voice_engine_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_voice_engine_voice_engine_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_conference_mixer_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_conference_mixer_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_processing_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_processing_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audioproc_debug_proto_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audioproc_debug_proto_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_voice_engine_voice_engine_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_voice_engine_voice_engine_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_conference_mixer_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_conference_mixer_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_device_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_device_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_bitrate_controller_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_bitrate_controller_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_rtp_rtcp_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_rtp_rtcp_gyp.a \
@@ -812,10 +812,10 @@
third_party_webrtc_modules_video_render_module_gyp \
third_party_usrsctp_usrsctplib_gyp \
third_party_libjingle_libpeerconnection_gyp \
- third_party_webrtc_voice_engine_voice_engine_gyp \
- third_party_webrtc_modules_audio_conference_mixer_gyp \
third_party_webrtc_modules_audio_processing_gyp \
third_party_webrtc_modules_audioproc_debug_proto_gyp \
+ third_party_webrtc_voice_engine_voice_engine_gyp \
+ third_party_webrtc_modules_audio_conference_mixer_gyp \
third_party_webrtc_modules_audio_device_gyp \
third_party_webrtc_modules_bitrate_controller_gyp \
third_party_webrtc_modules_rtp_rtcp_gyp \
diff --git a/android_webview/libwebviewchromium.target.linux-mips.mk b/android_webview/libwebviewchromium.target.linux-mips.mk
index 1e72dcf..0de7f10 100644
--- a/android_webview/libwebviewchromium.target.linux-mips.mk
+++ b/android_webview/libwebviewchromium.target.linux-mips.mk
@@ -334,10 +334,10 @@
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_video_render_module_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_video_render_module_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_usrsctp_usrsctplib_gyp,,,$(GYP_VAR_PREFIX))/third_party_usrsctp_usrsctplib_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libjingle_libpeerconnection_gyp,,,$(GYP_VAR_PREFIX))/third_party_libjingle_libpeerconnection_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_voice_engine_voice_engine_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_voice_engine_voice_engine_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_conference_mixer_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_conference_mixer_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_processing_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_processing_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audioproc_debug_proto_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audioproc_debug_proto_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_voice_engine_voice_engine_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_voice_engine_voice_engine_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_conference_mixer_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_conference_mixer_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_device_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_device_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_bitrate_controller_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_bitrate_controller_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_rtp_rtcp_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_rtp_rtcp_gyp.a \
@@ -818,10 +818,10 @@
third_party_webrtc_modules_video_render_module_gyp \
third_party_usrsctp_usrsctplib_gyp \
third_party_libjingle_libpeerconnection_gyp \
- third_party_webrtc_voice_engine_voice_engine_gyp \
- third_party_webrtc_modules_audio_conference_mixer_gyp \
third_party_webrtc_modules_audio_processing_gyp \
third_party_webrtc_modules_audioproc_debug_proto_gyp \
+ third_party_webrtc_voice_engine_voice_engine_gyp \
+ third_party_webrtc_modules_audio_conference_mixer_gyp \
third_party_webrtc_modules_audio_device_gyp \
third_party_webrtc_modules_bitrate_controller_gyp \
third_party_webrtc_modules_rtp_rtcp_gyp \
diff --git a/android_webview/libwebviewchromium.target.linux-x86.mk b/android_webview/libwebviewchromium.target.linux-x86.mk
index d66cda1..7ad018b 100644
--- a/android_webview/libwebviewchromium.target.linux-x86.mk
+++ b/android_webview/libwebviewchromium.target.linux-x86.mk
@@ -345,11 +345,11 @@
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_video_render_module_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_video_render_module_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_usrsctp_usrsctplib_gyp,,,$(GYP_VAR_PREFIX))/third_party_usrsctp_usrsctplib_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libjingle_libpeerconnection_gyp,,,$(GYP_VAR_PREFIX))/third_party_libjingle_libpeerconnection_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_voice_engine_voice_engine_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_voice_engine_voice_engine_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_conference_mixer_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_conference_mixer_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_processing_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_processing_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audioproc_debug_proto_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audioproc_debug_proto_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_processing_sse2_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_processing_sse2_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_voice_engine_voice_engine_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_voice_engine_voice_engine_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_conference_mixer_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_conference_mixer_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_device_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_device_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_bitrate_controller_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_bitrate_controller_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_rtp_rtcp_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_rtp_rtcp_gyp.a \
@@ -847,11 +847,11 @@
third_party_webrtc_modules_video_render_module_gyp \
third_party_usrsctp_usrsctplib_gyp \
third_party_libjingle_libpeerconnection_gyp \
- third_party_webrtc_voice_engine_voice_engine_gyp \
- third_party_webrtc_modules_audio_conference_mixer_gyp \
third_party_webrtc_modules_audio_processing_gyp \
third_party_webrtc_modules_audioproc_debug_proto_gyp \
third_party_webrtc_modules_audio_processing_sse2_gyp \
+ third_party_webrtc_voice_engine_voice_engine_gyp \
+ third_party_webrtc_modules_audio_conference_mixer_gyp \
third_party_webrtc_modules_audio_device_gyp \
third_party_webrtc_modules_bitrate_controller_gyp \
third_party_webrtc_modules_rtp_rtcp_gyp \
diff --git a/android_webview/libwebviewchromium.target.linux-x86_64.mk b/android_webview/libwebviewchromium.target.linux-x86_64.mk
index e873c2f..d3b5992 100644
--- a/android_webview/libwebviewchromium.target.linux-x86_64.mk
+++ b/android_webview/libwebviewchromium.target.linux-x86_64.mk
@@ -345,11 +345,11 @@
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_video_render_module_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_video_render_module_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_usrsctp_usrsctplib_gyp,,,$(GYP_VAR_PREFIX))/third_party_usrsctp_usrsctplib_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libjingle_libpeerconnection_gyp,,,$(GYP_VAR_PREFIX))/third_party_libjingle_libpeerconnection_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_voice_engine_voice_engine_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_voice_engine_voice_engine_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_conference_mixer_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_conference_mixer_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_processing_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_processing_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audioproc_debug_proto_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audioproc_debug_proto_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_processing_sse2_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_processing_sse2_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_voice_engine_voice_engine_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_voice_engine_voice_engine_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_conference_mixer_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_conference_mixer_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_audio_device_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_audio_device_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_bitrate_controller_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_bitrate_controller_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_webrtc_modules_rtp_rtcp_gyp,,,$(GYP_VAR_PREFIX))/third_party_webrtc_modules_rtp_rtcp_gyp.a \
@@ -845,11 +845,11 @@
third_party_webrtc_modules_video_render_module_gyp \
third_party_usrsctp_usrsctplib_gyp \
third_party_libjingle_libpeerconnection_gyp \
- third_party_webrtc_voice_engine_voice_engine_gyp \
- third_party_webrtc_modules_audio_conference_mixer_gyp \
third_party_webrtc_modules_audio_processing_gyp \
third_party_webrtc_modules_audioproc_debug_proto_gyp \
third_party_webrtc_modules_audio_processing_sse2_gyp \
+ third_party_webrtc_voice_engine_voice_engine_gyp \
+ third_party_webrtc_modules_audio_conference_mixer_gyp \
third_party_webrtc_modules_audio_device_gyp \
third_party_webrtc_modules_bitrate_controller_gyp \
third_party_webrtc_modules_rtp_rtcp_gyp \
diff --git a/android_webview/native/webview_native.target.darwin-arm.mk b/android_webview/native/webview_native.target.darwin-arm.mk
index e65e150..0e033ee 100644
--- a/android_webview/native/webview_native.target.darwin-arm.mk
+++ b/android_webview/native/webview_native.target.darwin-arm.mk
@@ -142,6 +142,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -283,6 +284,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/android_webview/native/webview_native.target.darwin-arm64.mk b/android_webview/native/webview_native.target.darwin-arm64.mk
index 8261cb9..56fd463 100644
--- a/android_webview/native/webview_native.target.darwin-arm64.mk
+++ b/android_webview/native/webview_native.target.darwin-arm64.mk
@@ -131,6 +131,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -260,6 +261,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/android_webview/native/webview_native.target.darwin-mips.mk b/android_webview/native/webview_native.target.darwin-mips.mk
index 5d4426c..ea260de 100644
--- a/android_webview/native/webview_native.target.darwin-mips.mk
+++ b/android_webview/native/webview_native.target.darwin-mips.mk
@@ -134,6 +134,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -267,6 +268,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/android_webview/native/webview_native.target.darwin-x86.mk b/android_webview/native/webview_native.target.darwin-x86.mk
index e8be40c..c3ecb0f 100644
--- a/android_webview/native/webview_native.target.darwin-x86.mk
+++ b/android_webview/native/webview_native.target.darwin-x86.mk
@@ -136,6 +136,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -270,6 +271,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/android_webview/native/webview_native.target.darwin-x86_64.mk b/android_webview/native/webview_native.target.darwin-x86_64.mk
index 70661fc..505b0ae 100644
--- a/android_webview/native/webview_native.target.darwin-x86_64.mk
+++ b/android_webview/native/webview_native.target.darwin-x86_64.mk
@@ -136,6 +136,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -270,6 +271,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/android_webview/native/webview_native.target.linux-arm.mk b/android_webview/native/webview_native.target.linux-arm.mk
index e65e150..0e033ee 100644
--- a/android_webview/native/webview_native.target.linux-arm.mk
+++ b/android_webview/native/webview_native.target.linux-arm.mk
@@ -142,6 +142,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -283,6 +284,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/android_webview/native/webview_native.target.linux-arm64.mk b/android_webview/native/webview_native.target.linux-arm64.mk
index 8261cb9..56fd463 100644
--- a/android_webview/native/webview_native.target.linux-arm64.mk
+++ b/android_webview/native/webview_native.target.linux-arm64.mk
@@ -131,6 +131,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -260,6 +261,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/android_webview/native/webview_native.target.linux-mips.mk b/android_webview/native/webview_native.target.linux-mips.mk
index 5d4426c..ea260de 100644
--- a/android_webview/native/webview_native.target.linux-mips.mk
+++ b/android_webview/native/webview_native.target.linux-mips.mk
@@ -134,6 +134,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -267,6 +268,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/android_webview/native/webview_native.target.linux-x86.mk b/android_webview/native/webview_native.target.linux-x86.mk
index e8be40c..c3ecb0f 100644
--- a/android_webview/native/webview_native.target.linux-x86.mk
+++ b/android_webview/native/webview_native.target.linux-x86.mk
@@ -136,6 +136,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -270,6 +271,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/android_webview/native/webview_native.target.linux-x86_64.mk b/android_webview/native/webview_native.target.linux-x86_64.mk
index 70661fc..505b0ae 100644
--- a/android_webview/native/webview_native.target.linux-x86_64.mk
+++ b/android_webview/native/webview_native.target.linux-x86_64.mk
@@ -136,6 +136,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -270,6 +271,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java b/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java
index 2d7c1a1..2da8595 100644
--- a/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java
+++ b/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java
@@ -83,7 +83,7 @@
}
/**
- * @see android.view.View#setTextDirection(int)
+ * @see android.view.View#setTextAlignment(int)
*/
public static void setTextAlignment(View view, int textAlignment) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
@@ -94,6 +94,17 @@
}
/**
+ * @see android.view.View#setTextDirection(int)
+ */
+ public static void setTextDirection(View view, int textDirection) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+ view.setTextDirection(textDirection);
+ } else {
+ // Do nothing. RTL text isn't supported before JB MR1.
+ }
+ }
+
+ /**
* @see android.view.ViewGroup.MarginLayoutParams#setMarginEnd(int)
*/
public static void setMarginEnd(MarginLayoutParams layoutParams, int end) {
diff --git a/base/android/java/src/org/chromium/base/SysUtils.java b/base/android/java/src/org/chromium/base/SysUtils.java
index 1108d9e..1c8378c 100644
--- a/base/android/java/src/org/chromium/base/SysUtils.java
+++ b/base/android/java/src/org/chromium/base/SysUtils.java
@@ -103,15 +103,12 @@
}
private static boolean detectLowEndDevice() {
- if (CommandLine.isInitialized()) {
- if (CommandLine.getInstance().hasSwitch(BaseSwitches.LOW_END_DEVICE_MODE)) {
- int mode = Integer.parseInt(CommandLine.getInstance().getSwitchValue(
- BaseSwitches.LOW_END_DEVICE_MODE));
- if (mode == 1)
- return true;
- if (mode == 0)
- return false;
- }
+ assert CommandLine.isInitialized();
+ if (CommandLine.getInstance().hasSwitch(BaseSwitches.LOW_END_DEVICE_MODE)) {
+ int mode = Integer.parseInt(CommandLine.getInstance().getSwitchValue(
+ BaseSwitches.LOW_END_DEVICE_MODE));
+ if (mode == 1) return true;
+ if (mode == 0) return false;
}
if (Build.VERSION.SDK_INT <= ANDROID_LOW_MEMORY_ANDROID_SDK_THRESHOLD) {
diff --git a/build/android/pylib/gtest/setup.py b/build/android/pylib/gtest/setup.py
index 6a9e65b..2782859 100644
--- a/build/android/pylib/gtest/setup.py
+++ b/build/android/pylib/gtest/setup.py
@@ -118,6 +118,7 @@
'--config-variable', 'component', 'static_library',
'--config-variable', 'fastbuild', '0',
'--config-variable', 'icu_use_data_file_flag', '1',
+ '--config-variable', 'libpeer_target_type', 'static_library',
# TODO(maruel): This may not be always true.
'--config-variable', 'target_arch', 'arm',
'--config-variable', 'use_openssl', '0',
diff --git a/build/util/LASTCHANGE b/build/util/LASTCHANGE
index ac0aab7..69ef3a2 100644
--- a/build/util/LASTCHANGE
+++ b/build/util/LASTCHANGE
@@ -1 +1 @@
-LASTCHANGE=e50fd9aa357e
+LASTCHANGE=5a29759aab0d
diff --git a/build/util/LASTCHANGE.blink b/build/util/LASTCHANGE.blink
index 46f3a55..a1c9ac9 100644
--- a/build/util/LASTCHANGE.blink
+++ b/build/util/LASTCHANGE.blink
@@ -1 +1 @@
-LASTCHANGE=184215
+LASTCHANGE=184502
diff --git a/cc/animation/animation.cc b/cc/animation/animation.cc
index 5fe5b8c..5e4bc1e 100644
--- a/cc/animation/animation.cc
+++ b/cc/animation/animation.cc
@@ -192,10 +192,11 @@
DCHECK_GE(iteration_start_, 0);
double active_time = ConvertToActiveTime(monotonic_time);
+ double start_offset = iteration_start_ * curve_->Duration();
- // Return 0 if we are before the start of the animation
+ // Return start offset if we are before the start of the animation
if (active_time < 0)
- return 0;
+ return start_offset;
// Always return zero if we have no iterations.
if (!iterations_)
@@ -207,7 +208,6 @@
double repeated_duration = iterations_ * curve_->Duration();
double active_duration = repeated_duration / std::abs(playback_rate_);
- double start_offset = iteration_start_ * curve_->Duration();
// Check if we are past active duration
if (iterations_ > 0 && active_time >= active_duration)
diff --git a/cc/animation/animation_unittest.cc b/cc/animation/animation_unittest.cc
index 378bb7e..6e0d1f2 100644
--- a/cc/animation/animation_unittest.cc
+++ b/cc/animation/animation_unittest.cc
@@ -620,6 +620,7 @@
TEST(AnimationTest, TrimTimeIterationStart) {
scoped_ptr<Animation> anim(CreateAnimation(2, 1, 1));
anim->set_iteration_start(0.5);
+ EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(-1.0)));
EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(0.0)));
EXPECT_EQ(0.0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(0.5)));
EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(1.0)));
@@ -632,6 +633,7 @@
scoped_ptr<Animation> anim(CreateAnimation(2, 1, 1));
anim->set_direction(Animation::Alternate);
anim->set_iteration_start(0.3);
+ EXPECT_EQ(0.3, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(-1.0)));
EXPECT_EQ(0.3, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(0.0)));
EXPECT_EQ(0.8, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(0.5)));
EXPECT_EQ(1.0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(0.7)));
@@ -644,6 +646,7 @@
scoped_ptr<Animation> anim(CreateAnimation(3, 1, 1));
anim->set_direction(Animation::Alternate);
anim->set_iteration_start(1);
+ EXPECT_EQ(1.0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(-1.0)));
EXPECT_EQ(1.0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(0.0)));
EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(0.5)));
EXPECT_EQ(0.0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(1.0)));
diff --git a/cc/animation/layer_animation_controller.cc b/cc/animation/layer_animation_controller.cc
index d3f0cca..73e3d5a 100644
--- a/cc/animation/layer_animation_controller.cc
+++ b/cc/animation/layer_animation_controller.cc
@@ -287,6 +287,7 @@
Animation::TargetProperty target_property) const {
for (size_t i = 0; i < animations_.size(); ++i) {
if (!animations_[i]->is_finished() &&
+ animations_[i]->InEffect(last_tick_time_) &&
animations_[i]->target_property() == target_property)
return true;
}
diff --git a/cc/animation/layer_animation_controller_unittest.cc b/cc/animation/layer_animation_controller_unittest.cc
index 4cb1b6b..66a20d3 100644
--- a/cc/animation/layer_animation_controller_unittest.cc
+++ b/cc/animation/layer_animation_controller_unittest.cc
@@ -2332,5 +2332,51 @@
EXPECT_EQ(1.f, dummy_impl.opacity());
}
+TEST(LayerAnimationControllerTest, TestIsAnimatingProperty) {
+ FakeLayerAnimationValueObserver dummy;
+ scoped_refptr<LayerAnimationController> controller(
+ LayerAnimationController::Create(0));
+ controller->AddValueObserver(&dummy);
+
+ scoped_ptr<Animation> animation(CreateAnimation(
+ scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 0.f, 1.f)).Pass(),
+ 1,
+ Animation::Opacity));
+ controller->AddAnimation(animation.Pass());
+ controller->Animate(kInitialTickTime);
+ EXPECT_TRUE(controller->IsAnimatingProperty(Animation::Opacity));
+ controller->UpdateState(true, nullptr);
+ EXPECT_TRUE(controller->HasActiveAnimation());
+ EXPECT_TRUE(controller->IsAnimatingProperty(Animation::Opacity));
+ EXPECT_FALSE(controller->IsAnimatingProperty(Animation::Filter));
+ EXPECT_EQ(0.f, dummy.opacity());
+}
+
+TEST(LayerAnimationControllerTest, TestIsAnimatingPropertyTimeOffsetFillMode) {
+ FakeLayerAnimationValueObserver dummy;
+ scoped_refptr<LayerAnimationController> controller(
+ LayerAnimationController::Create(0));
+ controller->AddValueObserver(&dummy);
+
+ scoped_ptr<Animation> animation(CreateAnimation(
+ scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 0.f, 1.f)).Pass(),
+ 1,
+ Animation::Opacity));
+ animation->set_fill_mode(Animation::FillModeNone);
+ animation->set_time_offset(TimeDelta::FromMilliseconds(-2000));
+ controller->AddAnimation(animation.Pass());
+
+ controller->Animate(kInitialTickTime);
+ controller->UpdateState(true, nullptr);
+ EXPECT_FALSE(controller->IsAnimatingProperty(Animation::Opacity));
+ EXPECT_TRUE(controller->HasActiveAnimation());
+ EXPECT_FALSE(controller->IsAnimatingProperty(Animation::Opacity));
+ EXPECT_FALSE(controller->IsAnimatingProperty(Animation::Filter));
+
+ controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(2000));
+ controller->UpdateState(true, nullptr);
+ EXPECT_TRUE(controller->IsAnimatingProperty(Animation::Opacity));
+}
+
} // namespace
} // namespace cc
diff --git a/cc/blink/cc_blink.target.darwin-arm.mk b/cc/blink/cc_blink.target.darwin-arm.mk
index 19ac2d0..6a4681b 100644
--- a/cc/blink/cc_blink.target.darwin-arm.mk
+++ b/cc/blink/cc_blink.target.darwin-arm.mk
@@ -133,6 +133,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -285,6 +286,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/cc/blink/cc_blink.target.darwin-arm64.mk b/cc/blink/cc_blink.target.darwin-arm64.mk
index 27a17db..d261418 100644
--- a/cc/blink/cc_blink.target.darwin-arm64.mk
+++ b/cc/blink/cc_blink.target.darwin-arm64.mk
@@ -122,6 +122,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -262,6 +263,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/cc/blink/cc_blink.target.darwin-mips.mk b/cc/blink/cc_blink.target.darwin-mips.mk
index 37c01d0..3d5555c 100644
--- a/cc/blink/cc_blink.target.darwin-mips.mk
+++ b/cc/blink/cc_blink.target.darwin-mips.mk
@@ -126,6 +126,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -271,6 +272,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/cc/blink/cc_blink.target.darwin-x86.mk b/cc/blink/cc_blink.target.darwin-x86.mk
index 2935ca3..562ae96 100644
--- a/cc/blink/cc_blink.target.darwin-x86.mk
+++ b/cc/blink/cc_blink.target.darwin-x86.mk
@@ -128,6 +128,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -274,6 +275,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/cc/blink/cc_blink.target.darwin-x86_64.mk b/cc/blink/cc_blink.target.darwin-x86_64.mk
index d6c10c7..7d694db 100644
--- a/cc/blink/cc_blink.target.darwin-x86_64.mk
+++ b/cc/blink/cc_blink.target.darwin-x86_64.mk
@@ -127,6 +127,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -272,6 +273,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/cc/blink/cc_blink.target.linux-arm.mk b/cc/blink/cc_blink.target.linux-arm.mk
index 19ac2d0..6a4681b 100644
--- a/cc/blink/cc_blink.target.linux-arm.mk
+++ b/cc/blink/cc_blink.target.linux-arm.mk
@@ -133,6 +133,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -285,6 +286,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/cc/blink/cc_blink.target.linux-arm64.mk b/cc/blink/cc_blink.target.linux-arm64.mk
index 27a17db..d261418 100644
--- a/cc/blink/cc_blink.target.linux-arm64.mk
+++ b/cc/blink/cc_blink.target.linux-arm64.mk
@@ -122,6 +122,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -262,6 +263,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/cc/blink/cc_blink.target.linux-mips.mk b/cc/blink/cc_blink.target.linux-mips.mk
index 37c01d0..3d5555c 100644
--- a/cc/blink/cc_blink.target.linux-mips.mk
+++ b/cc/blink/cc_blink.target.linux-mips.mk
@@ -126,6 +126,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -271,6 +272,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/cc/blink/cc_blink.target.linux-x86.mk b/cc/blink/cc_blink.target.linux-x86.mk
index 2935ca3..562ae96 100644
--- a/cc/blink/cc_blink.target.linux-x86.mk
+++ b/cc/blink/cc_blink.target.linux-x86.mk
@@ -128,6 +128,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -274,6 +275,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/cc/blink/cc_blink.target.linux-x86_64.mk b/cc/blink/cc_blink.target.linux-x86_64.mk
index d6c10c7..7d694db 100644
--- a/cc/blink/cc_blink.target.linux-x86_64.mk
+++ b/cc/blink/cc_blink.target.linux-x86_64.mk
@@ -127,6 +127,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -272,6 +273,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/cc/cc.target.darwin-arm.mk b/cc/cc.target.darwin-arm.mk
index 84f369a..da6964a 100644
--- a/cc/cc.target.darwin-arm.mk
+++ b/cc/cc.target.darwin-arm.mk
@@ -322,6 +322,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -458,6 +459,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/cc/cc.target.darwin-arm64.mk b/cc/cc.target.darwin-arm64.mk
index 9da4d16..d36b08a 100644
--- a/cc/cc.target.darwin-arm64.mk
+++ b/cc/cc.target.darwin-arm64.mk
@@ -311,6 +311,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -435,6 +436,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/cc/cc.target.darwin-mips.mk b/cc/cc.target.darwin-mips.mk
index b082117..532e83f 100644
--- a/cc/cc.target.darwin-mips.mk
+++ b/cc/cc.target.darwin-mips.mk
@@ -314,6 +314,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -442,6 +443,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/cc/cc.target.darwin-x86.mk b/cc/cc.target.darwin-x86.mk
index 21d8532..a35cbca 100644
--- a/cc/cc.target.darwin-x86.mk
+++ b/cc/cc.target.darwin-x86.mk
@@ -317,6 +317,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -447,6 +448,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/cc/cc.target.darwin-x86_64.mk b/cc/cc.target.darwin-x86_64.mk
index d899bf9..f50b95b 100644
--- a/cc/cc.target.darwin-x86_64.mk
+++ b/cc/cc.target.darwin-x86_64.mk
@@ -316,6 +316,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -445,6 +446,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/cc/cc.target.linux-arm.mk b/cc/cc.target.linux-arm.mk
index 84f369a..da6964a 100644
--- a/cc/cc.target.linux-arm.mk
+++ b/cc/cc.target.linux-arm.mk
@@ -322,6 +322,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -458,6 +459,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/cc/cc.target.linux-arm64.mk b/cc/cc.target.linux-arm64.mk
index 9da4d16..d36b08a 100644
--- a/cc/cc.target.linux-arm64.mk
+++ b/cc/cc.target.linux-arm64.mk
@@ -311,6 +311,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -435,6 +436,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/cc/cc.target.linux-mips.mk b/cc/cc.target.linux-mips.mk
index b082117..532e83f 100644
--- a/cc/cc.target.linux-mips.mk
+++ b/cc/cc.target.linux-mips.mk
@@ -314,6 +314,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -442,6 +443,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/cc/cc.target.linux-x86.mk b/cc/cc.target.linux-x86.mk
index 21d8532..a35cbca 100644
--- a/cc/cc.target.linux-x86.mk
+++ b/cc/cc.target.linux-x86.mk
@@ -317,6 +317,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -447,6 +448,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/cc/cc.target.linux-x86_64.mk b/cc/cc.target.linux-x86_64.mk
index d899bf9..f50b95b 100644
--- a/cc/cc.target.linux-x86_64.mk
+++ b/cc/cc.target.linux-x86_64.mk
@@ -316,6 +316,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -445,6 +446,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/cc/cc_surfaces.target.darwin-arm.mk b/cc/cc_surfaces.target.darwin-arm.mk
index e4f0b7f..201bfec 100644
--- a/cc/cc_surfaces.target.darwin-arm.mk
+++ b/cc/cc_surfaces.target.darwin-arm.mk
@@ -112,6 +112,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -247,6 +248,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/cc/cc_surfaces.target.darwin-arm64.mk b/cc/cc_surfaces.target.darwin-arm64.mk
index b08e784..0ddcb05 100644
--- a/cc/cc_surfaces.target.darwin-arm64.mk
+++ b/cc/cc_surfaces.target.darwin-arm64.mk
@@ -101,6 +101,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -224,6 +225,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/cc/cc_surfaces.target.darwin-mips.mk b/cc/cc_surfaces.target.darwin-mips.mk
index 5932c43..ca35280 100644
--- a/cc/cc_surfaces.target.darwin-mips.mk
+++ b/cc/cc_surfaces.target.darwin-mips.mk
@@ -104,6 +104,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -231,6 +232,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/cc/cc_surfaces.target.darwin-x86.mk b/cc/cc_surfaces.target.darwin-x86.mk
index a5095df..65ef391 100644
--- a/cc/cc_surfaces.target.darwin-x86.mk
+++ b/cc/cc_surfaces.target.darwin-x86.mk
@@ -107,6 +107,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -236,6 +237,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/cc/cc_surfaces.target.darwin-x86_64.mk b/cc/cc_surfaces.target.darwin-x86_64.mk
index 3a5509b..4e696a2 100644
--- a/cc/cc_surfaces.target.darwin-x86_64.mk
+++ b/cc/cc_surfaces.target.darwin-x86_64.mk
@@ -106,6 +106,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -234,6 +235,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/cc/cc_surfaces.target.linux-arm.mk b/cc/cc_surfaces.target.linux-arm.mk
index e4f0b7f..201bfec 100644
--- a/cc/cc_surfaces.target.linux-arm.mk
+++ b/cc/cc_surfaces.target.linux-arm.mk
@@ -112,6 +112,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -247,6 +248,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/cc/cc_surfaces.target.linux-arm64.mk b/cc/cc_surfaces.target.linux-arm64.mk
index b08e784..0ddcb05 100644
--- a/cc/cc_surfaces.target.linux-arm64.mk
+++ b/cc/cc_surfaces.target.linux-arm64.mk
@@ -101,6 +101,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -224,6 +225,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/cc/cc_surfaces.target.linux-mips.mk b/cc/cc_surfaces.target.linux-mips.mk
index 5932c43..ca35280 100644
--- a/cc/cc_surfaces.target.linux-mips.mk
+++ b/cc/cc_surfaces.target.linux-mips.mk
@@ -104,6 +104,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -231,6 +232,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/cc/cc_surfaces.target.linux-x86.mk b/cc/cc_surfaces.target.linux-x86.mk
index a5095df..65ef391 100644
--- a/cc/cc_surfaces.target.linux-x86.mk
+++ b/cc/cc_surfaces.target.linux-x86.mk
@@ -107,6 +107,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -236,6 +237,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/cc/cc_surfaces.target.linux-x86_64.mk b/cc/cc_surfaces.target.linux-x86_64.mk
index 3a5509b..4e696a2 100644
--- a/cc/cc_surfaces.target.linux-x86_64.mk
+++ b/cc/cc_surfaces.target.linux-x86_64.mk
@@ -106,6 +106,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -234,6 +235,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
index eae6cc2..ce2606f 100644
--- a/cc/layers/picture_layer_impl.cc
+++ b/cc/layers/picture_layer_impl.cc
@@ -507,10 +507,12 @@
(layer_tree_impl()->CurrentBeginFrameArgs().frame_time -
base::TimeTicks()).InSecondsF();
+ gfx::Rect viewport_rect_in_layer_space =
+ GetViewportForTilePriorityInContentSpace();
bool tiling_needs_update = false;
for (size_t i = 0; i < tilings_->num_tilings(); ++i) {
- if (tilings_->tiling_at(i)->NeedsUpdateForFrameAtTime(
- current_frame_time_in_seconds)) {
+ if (tilings_->tiling_at(i)->NeedsUpdateForFrameAtTimeAndViewport(
+ current_frame_time_in_seconds, viewport_rect_in_layer_space)) {
tiling_needs_update = true;
break;
}
@@ -518,8 +520,6 @@
if (!tiling_needs_update)
return;
- gfx::Rect viewport_rect_in_layer_space =
- GetViewportForTilePriorityInContentSpace();
WhichTree tree =
layer_tree_impl()->IsActiveTree() ? ACTIVE_TREE : PENDING_TREE;
for (size_t i = 0; i < tilings_->num_tilings(); ++i) {
diff --git a/cc/resources/picture_layer_tiling.cc b/cc/resources/picture_layer_tiling.cc
index ee17dc8..3695aca 100644
--- a/cc/resources/picture_layer_tiling.cc
+++ b/cc/resources/picture_layer_tiling.cc
@@ -540,7 +540,8 @@
float ideal_contents_scale,
double current_frame_time_in_seconds,
const Occlusion& occlusion_in_layer_space) {
- if (!NeedsUpdateForFrameAtTime(current_frame_time_in_seconds)) {
+ if (!NeedsUpdateForFrameAtTimeAndViewport(current_frame_time_in_seconds,
+ viewport_in_layer_space)) {
// This should never be zero for the purposes of has_ever_been_updated().
DCHECK_NE(current_frame_time_in_seconds, 0.0);
return;
@@ -551,6 +552,7 @@
if (tiling_size().IsEmpty()) {
last_impl_frame_time_in_seconds_ = current_frame_time_in_seconds;
+ last_viewport_in_layer_space_ = viewport_in_layer_space;
last_visible_rect_in_content_space_ = visible_rect_in_content_space;
return;
}
@@ -579,6 +581,7 @@
SetLiveTilesRect(eventually_rect);
last_impl_frame_time_in_seconds_ = current_frame_time_in_seconds;
+ last_viewport_in_layer_space_ = viewport_in_layer_space;
last_visible_rect_in_content_space_ = visible_rect_in_content_space;
eviction_tiles_cache_valid_ = false;
diff --git a/cc/resources/picture_layer_tiling.h b/cc/resources/picture_layer_tiling.h
index 104ca10..a5b1a99 100644
--- a/cc/resources/picture_layer_tiling.h
+++ b/cc/resources/picture_layer_tiling.h
@@ -254,8 +254,11 @@
// while DidBecomeActive promotes pending priority on a similar set of tiles.
void DidBecomeRecycled();
- bool NeedsUpdateForFrameAtTime(double frame_time_in_seconds) {
- return frame_time_in_seconds != last_impl_frame_time_in_seconds_;
+ bool NeedsUpdateForFrameAtTimeAndViewport(
+ double frame_time_in_seconds,
+ const gfx::Rect& viewport_in_layer_space) {
+ return frame_time_in_seconds != last_impl_frame_time_in_seconds_ ||
+ viewport_in_layer_space != last_viewport_in_layer_space_;
}
void GetAllTilesForTracing(std::set<const Tile*>* tiles) const;
@@ -329,6 +332,7 @@
// State saved for computing velocities based upon finite differences.
double last_impl_frame_time_in_seconds_;
+ gfx::Rect last_viewport_in_layer_space_;
gfx::Rect last_visible_rect_in_content_space_;
// Iteration rects in content space
diff --git a/cc/resources/texture_uploader.cc b/cc/resources/texture_uploader.cc
index eb4e6c0..8c7010b 100644
--- a/cc/resources/texture_uploader.cc
+++ b/cc/resources/texture_uploader.cc
@@ -116,6 +116,12 @@
}
void TextureUploader::BeginQuery() {
+ // Check to see if any of the pending queries are free before allocating a
+ // new one. If this is not done, queries may be allocated without bound.
+ // http://crbug.com/398072
+ if (available_queries_.empty())
+ ProcessQueries();
+
if (available_queries_.empty())
available_queries_.push_back(Query::Create(gl_));
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index eabe178..a984fb7 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -1537,7 +1537,7 @@
if (draw_mode == DRAW_MODE_RESOURCELESS_SOFTWARE) {
bool disable_picture_quad_image_filtering =
- IsCurrentlyScrolling() || needs_animate_layers();
+ IsActivelyScrolling() || needs_animate_layers();
scoped_ptr<SoftwareRenderer> temp_software_renderer =
SoftwareRenderer::Create(this, &settings_, output_surface_.get(), NULL);
@@ -1694,8 +1694,8 @@
return active_tree_->CurrentlyScrollingLayer();
}
-bool LayerTreeHostImpl::IsCurrentlyScrolling() const {
- return CurrentlyScrollingLayer() ||
+bool LayerTreeHostImpl::IsActivelyScrolling() const {
+ return (did_lock_scrolling_layer_ && CurrentlyScrollingLayer()) ||
(InnerViewportScrollLayer() &&
InnerViewportScrollLayer()->IsExternalFlingActive()) ||
(OuterViewportScrollLayer() &&
diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h
index 5897fb4..0e6fa45 100644
--- a/cc/trees/layer_tree_host_impl.h
+++ b/cc/trees/layer_tree_host_impl.h
@@ -325,7 +325,7 @@
void QueueSwapPromiseForMainThreadScrollUpdate(
scoped_ptr<SwapPromise> swap_promise);
- bool IsCurrentlyScrolling() const;
+ bool IsActivelyScrolling() const;
virtual void SetVisible(bool visible);
bool visible() const { return visible_; }
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index f72213e..29db301 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -517,6 +517,20 @@
EXPECT_TRUE(did_request_commit_);
}
+TEST_F(LayerTreeHostImplTest, ScrollActiveOnlyAfterScrollMovement) {
+ SetupScrollAndContentsLayers(gfx::Size(100, 100));
+ host_impl_->SetViewportSize(gfx::Size(50, 50));
+ DrawFrame();
+
+ EXPECT_EQ(InputHandler::ScrollStarted,
+ host_impl_->ScrollBegin(gfx::Point(), InputHandler::Wheel));
+ EXPECT_FALSE(host_impl_->IsActivelyScrolling());
+ host_impl_->ScrollBy(gfx::Point(), gfx::Vector2d(0, 10));
+ EXPECT_TRUE(host_impl_->IsActivelyScrolling());
+ host_impl_->ScrollEnd();
+ EXPECT_FALSE(host_impl_->IsActivelyScrolling());
+}
+
TEST_F(LayerTreeHostImplTest, ScrollWithoutRootLayer) {
// We should not crash when trying to scroll an empty layer tree.
EXPECT_EQ(InputHandler::ScrollIgnored,
diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc
index dddf112..9c4392c 100644
--- a/cc/trees/thread_proxy.cc
+++ b/cc/trees/thread_proxy.cc
@@ -1333,7 +1333,7 @@
bool smoothness_takes_priority =
impl().layer_tree_host_impl->pinch_gesture_active() ||
impl().layer_tree_host_impl->page_scale_animation_active() ||
- impl().layer_tree_host_impl->IsCurrentlyScrolling();
+ impl().layer_tree_host_impl->IsActivelyScrolling();
// Schedule expiration if smoothness currently takes priority.
if (smoothness_takes_priority)
diff --git a/chrome/VERSION b/chrome/VERSION
index 104d208..09e3153 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=39
MINOR=0
BUILD=2171
-PATCH=38
+PATCH=44
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/EmptyTabObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/EmptyTabObserver.java
index 99d84b8..544c2c3 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/EmptyTabObserver.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/EmptyTabObserver.java
@@ -66,5 +66,9 @@
boolean isIframeSrcdoc) { }
@Override
+ public void onDidNavigateMainFrame(Tab tab, String url, String baseUrl,
+ boolean isNavigationToDifferentPage, boolean isFragmentNavigation, int statusCode) { }
+
+ @Override
public void onDidChangeThemeColor(int color) { }
}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/Tab.java b/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
index e2eb139..a4d86fa 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
@@ -293,6 +293,17 @@
}
@Override
+ public void didNavigateMainFrame(String url, String baseUrl,
+ boolean isNavigationToDifferentPage, boolean isFragmentNavigation, int statusCode) {
+ for (TabObserver observer : mObservers) {
+ observer.onDidNavigateMainFrame(
+ Tab.this, url, baseUrl, isNavigationToDifferentPage,
+ isFragmentNavigation, statusCode);
+
+ }
+ }
+
+ @Override
public void didChangeThemeColor(int color) {
for (TabObserver observer : mObservers) {
observer.onDidChangeThemeColor(color);
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/TabObserver.java
index e801bc1..e5896dd 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/TabObserver.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/TabObserver.java
@@ -149,6 +149,21 @@
boolean isErrorPage, boolean isIframeSrcdoc);
/**
+ * Called when the main frame of the page has committed.
+ *
+ * @param tab The notifying {@link Tab}.
+ * @param url The validated url for the page.
+ * @param baseUrl The validated base url for the page.
+ * @param isNavigationToDifferentPage Whether the main frame navigated to a different page.
+ * @param isFragmentNavigation Whether the main frame navigation did not cause changes
+ * to the document (for example scrolling to a named anchor
+ * or PopState).
+ * @param statusCode The HTTP status code of the navigation.
+ */
+ public void onDidNavigateMainFrame(Tab tab, String url, String baseUrl,
+ boolean isNavigationToDifferentPage, boolean isFragmentNavigation, int statusCode);
+
+ /**
* Called when the theme color is changed
* @param color the new color in ARGB format.
*/
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainer.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainer.java
index 46778e0..c2611c0 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainer.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainer.java
@@ -19,6 +19,9 @@
import org.chromium.base.CalledByNative;
import org.chromium.base.VisibleForTesting;
import org.chromium.chrome.R;
+import org.chromium.chrome.browser.EmptyTabObserver;
+import org.chromium.chrome.browser.Tab;
+import org.chromium.chrome.browser.TabObserver;
import org.chromium.content_public.browser.WebContents;
import org.chromium.ui.UiUtils;
import org.chromium.ui.base.DeviceFormFactor;
@@ -110,6 +113,10 @@
private Paint mTopBorderPaint;
+ // Keeps the infobars from becoming visible when they normally would.
+ private boolean mDoStayInvisible;
+ private TabObserver mTabObserver;
+
public InfoBarContainer(Activity activity, AutoLoginProcessor autoLoginProcessor,
int tabId, ViewGroup parentView, WebContents webContents) {
super(activity);
@@ -206,11 +213,47 @@
addToParentView();
}
+ /**
+ * Call with {@code true} when a higher priority bottom element is visible to keep the infobars
+ * from ever becoming visible. Call with {@code false} to restore normal visibility behavior.
+ * @param doStayInvisible Whether the infobars should stay invisible even when they would
+ * normally become visible.
+ * @param tab The current Tab.
+ */
+ public void setDoStayInvisible(boolean doStayInvisible, Tab tab) {
+ mDoStayInvisible = doStayInvisible;
+ if (mTabObserver == null) mTabObserver = createTabObserver();
+ if (doStayInvisible) {
+ tab.addObserver(mTabObserver);
+ } else {
+ tab.removeObserver(mTabObserver);
+ }
+ }
+
+ /**
+ * Creates a TabObserver for monitoring a Tab, used to reset internal settings when a
+ * navigation is done.
+ * @return TabObserver that can be used to monitor a Tab.
+ */
+ private TabObserver createTabObserver() {
+ return new EmptyTabObserver() {
+ @Override
+ public void onDidNavigateMainFrame(Tab tab, String url, String baseUrl,
+ boolean isNavigationToDifferentPage, boolean isFragmentNavigation,
+ int statusCode) {
+ setDoStayInvisible(false, tab);
+ }
+ };
+ }
+
@Override
protected void onAttachedToWindow() {
super.onAttachedToWindow();
- ObjectAnimator.ofFloat(this, "alpha", 0.f, 1.f).setDuration(REATTACH_FADE_IN_MS).start();
- setVisibility(VISIBLE);
+ if (!mDoStayInvisible) {
+ ObjectAnimator.ofFloat(this, "alpha", 0.f, 1.f).setDuration(REATTACH_FADE_IN_MS)
+ .start();
+ setVisibility(VISIBLE);
+ }
}
@Override
@@ -334,7 +377,7 @@
setVisibility(View.INVISIBLE);
}
} else {
- if (!isShowing) {
+ if (!isShowing && !mDoStayInvisible) {
setVisibility(View.VISIBLE);
}
}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java
index f23c1f4..91e2417 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java
@@ -309,6 +309,17 @@
}
/**
+ * Checks if encrypting all the data types is allowed.
+ *
+ * @return true if encrypting all data types is allowed, false if only passwords are allowed to
+ * be encrypted.
+ */
+ public boolean isEncryptEverythingAllowed() {
+ assert isSyncInitialized();
+ return nativeIsEncryptEverythingAllowed(mNativeProfileSyncServiceAndroid);
+ }
+
+ /**
* Checks if the all the data types are encrypted.
*
* @return true if all data types are encrypted, false if only passwords are encrypted.
@@ -568,6 +579,7 @@
private native int nativeGetAuthError(long nativeProfileSyncServiceAndroid);
private native boolean nativeIsSyncInitialized(long nativeProfileSyncServiceAndroid);
private native boolean nativeIsFirstSetupInProgress(long nativeProfileSyncServiceAndroid);
+ private native boolean nativeIsEncryptEverythingAllowed(long nativeProfileSyncServiceAndroid);
private native boolean nativeIsEncryptEverythingEnabled(long nativeProfileSyncServiceAndroid);
private native void nativeEnableEncryptEverything(long nativeProfileSyncServiceAndroid);
private native boolean nativeIsPassphraseRequiredForDecryption(
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
index 38bce66..422d51b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
@@ -84,4 +84,14 @@
Bundle userRestrictions = manager.getUserRestrictions();
return !userRestrictions.getBoolean(UserManager.DISALLOW_MODIFY_ACCOUNTS, false);
}
+
+ /**
+ * Records the current document mode state with native-side feature utilities.
+ * @param enabled Whether the document mode is enabled.
+ */
+ public static void setDocumentModeEnabled(boolean enabled) {
+ nativeSetDocumentModeEnabled(enabled);
+ }
+
+ private static native void nativeSetDocumentModeEnabled(boolean enabled);
}
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 1cbfd01..3a6546e 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -14674,6 +14674,9 @@
<message name="IDS_EASY_UNLOCK_SCREENLOCK_USER_POD_AUTH_VALUE" desc="Message on lock screen user pod shown in place of password field when Easy Unlock is enabled and a phone that can unlock the Chromebook is detected in proximity.">
Click to enter
</message>
+ <message name="IDS_SMART_LOCK_SPINNER_ACCESSIBILITY_LABEL" desc="Label for the spinner icon used for accessibility purposes. This label is needed because this state does not have a tooltip.">
+ Finding your phone
+ </message>
<!-- Device types -->
<message name="IDS_EASY_UNLOCK_GENERIC_DEVICE_TYPE" desc="String for an unknown device type. Currently used to cover all non-ChromeOS devices.">
Chrome device
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 6373f41..6004fab 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1838,6 +1838,14 @@
data_reduction_proxy::switches::kEnableDataReductionProxyDev,
data_reduction_proxy::switches::kDisableDataReductionProxyDev)
},
+ {
+ "enable-data-reduction-proxy-alt",
+ IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_ALTERNATIVE_NAME,
+ IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_ALTERNATIVE_DESCRIPTION,
+ kOsAndroid,
+ SINGLE_VALUE_TYPE(
+ data_reduction_proxy::switches::kEnableDataReductionProxyAlt)
+ },
#endif
{
"enable-experimental-hotwording",
@@ -1911,14 +1919,6 @@
SINGLE_VALUE_TYPE(chromeos::switches::kWakeOnPackets)
},
#endif // OS_CHROMEOS
- {
- "enable-data-reduction-proxy-alt",
- IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_ALTERNATIVE_NAME,
- IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_ALTERNATIVE_DESCRIPTION,
- kOsAndroid,
- SINGLE_VALUE_TYPE(data_reduction_proxy::switches::
- kEnableDataReductionProxyAlt)
- },
#if defined(USE_AURA)
{
"enable-tab-audio-muting",
@@ -2057,6 +2057,11 @@
chrome::VersionInfo::GetChannel() != chrome::VersionInfo::CHANNEL_DEV) {
return true;
}
+ // enable-data-reduction-proxy-alt is only available for the Dev channel.
+ if (!strcmp("enable-data-reduction-proxy-alt", experiment.internal_name) &&
+ chrome::VersionInfo::GetChannel() != chrome::VersionInfo::CHANNEL_DEV) {
+ return true;
+ }
#endif
return false;
diff --git a/chrome/browser/android/chrome_jni_registrar.cc b/chrome/browser/android/chrome_jni_registrar.cc
index da7f67b..35f8fbb 100644
--- a/chrome/browser/android/chrome_jni_registrar.cc
+++ b/chrome/browser/android/chrome_jni_registrar.cc
@@ -19,6 +19,7 @@
#include "chrome/browser/android/dom_distiller/feedback_reporter_android.h"
#include "chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.h"
#include "chrome/browser/android/favicon_helper.h"
+#include "chrome/browser/android/feature_utilities.h"
#include "chrome/browser/android/foreign_session_helper.h"
#include "chrome/browser/android/intent_helper.h"
#include "chrome/browser/android/logo_bridge.h"
@@ -143,6 +144,7 @@
prerender::ExternalPrerenderHandlerAndroid::
RegisterExternalPrerenderHandlerAndroid },
{ "FaviconHelper", FaviconHelper::RegisterFaviconHelper },
+ { "FeatureUtilities", RegisterFeatureUtilities },
{ "FeedbackReporter", dom_distiller::android::RegisterFeedbackReporter },
{ "FontSizePrefsAndroid", FontSizePrefsAndroid::Register },
{ "ForeignSessionHelper",
diff --git a/chrome/browser/android/feature_utilities.cc b/chrome/browser/android/feature_utilities.cc
new file mode 100644
index 0000000..39f5578
--- /dev/null
+++ b/chrome/browser/android/feature_utilities.cc
@@ -0,0 +1,33 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/android/feature_utilities.h"
+
+#include "jni/FeatureUtilities_jni.h"
+
+namespace {
+bool document_mode_enabled = false;
+} // namespace
+
+namespace chrome {
+namespace android {
+
+RunningModeHistogram GetDocumentModeValue() {
+ return document_mode_enabled ? RUNNING_MODE_DOCUMENT_MODE :
+ RUNNING_MODE_TABBED_MODE;
+}
+
+} // namespace android
+} // namespace chrome
+
+
+static void SetDocumentModeEnabled(JNIEnv* env,
+ jclass clazz,
+ jboolean enabled) {
+ document_mode_enabled = enabled;
+}
+
+bool RegisterFeatureUtilities(JNIEnv* env) {
+ return RegisterNativesImpl(env);
+}
diff --git a/chrome/browser/android/feature_utilities.h b/chrome/browser/android/feature_utilities.h
new file mode 100644
index 0000000..bb3b7dc
--- /dev/null
+++ b/chrome/browser/android/feature_utilities.h
@@ -0,0 +1,26 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_ANDROID_FEATURE_UTILITIES_H_
+#define CHROME_BROWSER_ANDROID_FEATURE_UTILITIES_H_
+
+#include <jni.h>
+
+namespace chrome {
+namespace android {
+
+enum RunningModeHistogram {
+ RUNNING_MODE_DOCUMENT_MODE,
+ RUNNING_MODE_TABBED_MODE,
+ RUNNING_MODE_MAX
+};
+
+RunningModeHistogram GetDocumentModeValue();
+
+} // namespace android
+} // namespace chrome
+
+bool RegisterFeatureUtilities(JNIEnv* env);
+
+#endif // CHROME_BROWSER_ANDROID_FEATURE_UTILITIES_H_
diff --git a/chrome/browser/bookmarks/enhanced_bookmarks_features.cc b/chrome/browser/bookmarks/enhanced_bookmarks_features.cc
index a7bca68..f441a62 100644
--- a/chrome/browser/bookmarks/enhanced_bookmarks_features.cc
+++ b/chrome/browser/bookmarks/enhanced_bookmarks_features.cc
@@ -154,7 +154,7 @@
void InitBookmarksExperimentState(Profile* profile) {
SigninManagerBase* signin = SigninManagerFactory::GetForProfile(profile);
- bool is_signed_in = signin && !signin->IsAuthenticated();
+ bool is_signed_in = signin && signin->IsAuthenticated();
UpdateBookmarksExperimentState(
profile->GetPrefs(),
g_browser_process->local_state(),
diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
index 0799242..8153ce5 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
@@ -600,9 +600,8 @@
virtual ~MockDomainReliabilityService() {}
virtual scoped_ptr<DomainReliabilityMonitor> CreateMonitor(
- scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
- PrefService* local_state_pref_service,
- const char* reporting_pref_name) OVERRIDE {
+ scoped_refptr<base::SingleThreadTaskRunner> network_task_runner)
+ OVERRIDE {
NOTREACHED();
return scoped_ptr<DomainReliabilityMonitor>();
}
diff --git a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_metrics.cc b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_metrics.cc
new file mode 100644
index 0000000..afb95e0
--- /dev/null
+++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_metrics.cc
@@ -0,0 +1,20 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_metrics.h"
+
+#include "base/logging.h"
+#include "base/metrics/histogram.h"
+
+namespace chromeos {
+
+void RecordEasyUnlockLoginEvent(EasyUnlockLoginEvent event) {
+ DCHECK_LT(event, EASY_SIGN_IN_LOGIN_EVENT_COUNT);
+
+ UMA_HISTOGRAM_ENUMERATION("EasyUnlock.SignIn.LoginEvent",
+ event,
+ EASY_SIGN_IN_LOGIN_EVENT_COUNT);
+}
+
+} // namespace chromeos
diff --git a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_metrics.h b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_metrics.h
new file mode 100644
index 0000000..83f94db
--- /dev/null
+++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_metrics.h
@@ -0,0 +1,56 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_EASY_UNLOCK_METRICS_H_
+#define CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_EASY_UNLOCK_METRICS_H_
+
+namespace chromeos {
+
+// Tracking login events for Easy unlock metrics.
+// This enum is used to define the buckets for an enumerated UMA histogram.
+// Hence,
+// (a) existing enumerated constants should never be deleted or reordered, and
+// (b) new constants should only be appended at the end of the enumeration.
+enum EasyUnlockLoginEvent {
+ // User is successfully authenticated using Easy Sign-in.
+ EASY_SIGN_IN_SUCCESS = 0,
+ // Easy sign-in failed to authenticate the user.
+ EASY_SIGN_IN_FAILURE = 1,
+
+ // Password is used for sign-in because there is no pairing data.
+ PASSWORD_SIGN_IN_NO_PAIRING = 2,
+ // Password is used for sign-in because pairing data is changed.
+ PASSWORD_SIGN_IN_PAIRING_CHANGED = 3,
+ // Password is used for sign-in because of user hardlock.
+ PASSWORD_SIGN_IN_USER_HARDLOCK = 4,
+ // Password is used for sign-in because Easy unlock service is not active.
+ PASSWORD_SIGN_IN_SERVICE_NOT_ACTIVE = 5,
+ // Password is used for sign-in because Bluetooth is not on.
+ PASSWORD_SIGN_IN_NO_BLUETOOTH = 6,
+ // Password is used for sign-in because Easy unlock is connecting.
+ PASSWORD_SIGN_IN_BLUETOOTH_CONNECTING = 7,
+ // Password is used for sign-in because no eligible phones found.
+ PASSWORD_SIGN_IN_NO_PHONE = 8,
+ // Password is used for sign-in because phone could not be authenticated.
+ PASSWORD_SIGN_IN_PHONE_NOT_AUTHENTICATED = 9,
+ // Password is used for sign-in because phone is locked.
+ PASSWORD_SIGN_IN_PHONE_LOCKED = 10,
+ // Password is used for sign-in because phone does not have lock screen.
+ PASSWORD_SIGN_IN_PHONE_NOT_LOCKABLE = 11,
+ // Password is used for sign-in because phone is not close enough.
+ PASSWORD_SIGN_IN_PHONE_NOT_NEARBY = 12,
+ // Password is used for sign-in because phone is not supported.
+ PASSWORD_SIGN_IN_PHONE_UNSUPPORTED = 13,
+ // Password is used for sign-in because user types in passowrd. This is
+ // unlikely to happen though.
+ PASSWORD_SIGN_IN_WITH_AUTHENTICATED_PHONE = 14,
+
+ EASY_SIGN_IN_LOGIN_EVENT_COUNT // Must be the last.
+};
+
+void RecordEasyUnlockLoginEvent(EasyUnlockLoginEvent event);
+
+} // namespace chromeos
+
+#endif // CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_EASY_UNLOCK_METRICS_H_
diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc
index 9b93422..8138913 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -42,6 +42,7 @@
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/prefs/session_startup_pref.h"
+#include "chrome/browser/signin/easy_unlock_service.h"
#include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/chrome_version_info.h"
@@ -52,7 +53,6 @@
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/power_manager_client.h"
#include "chromeos/dbus/session_manager_client.h"
-#include "chromeos/login/auth/user_context.h"
#include "chromeos/login/user_names.h"
#include "chromeos/settings/cros_settings_names.h"
#include "components/google/core/browser/google_util.h"
@@ -125,6 +125,26 @@
base::Bind(&RefreshPoliciesOnUIThread));
}
+// Record UMA for Easy sign-in outcome.
+void RecordEasySignInOutcome(const std::string& user_id, bool success) {
+ EasyUnlockService* easy_unlock_service =
+ EasyUnlockService::Get(ProfileHelper::GetSigninProfile());
+ if (!easy_unlock_service)
+ return;
+ easy_unlock_service->RecordEasySignInOutcome(user_id, success);
+}
+
+// Record UMA for password login of regular user when Easy sign-in is enabled.
+void RecordPasswordLoginEvent(const UserContext& user_context) {
+ EasyUnlockService* easy_unlock_service =
+ EasyUnlockService::Get(ProfileHelper::GetSigninProfile());
+ if (user_context.GetUserType() == user_manager::USER_TYPE_REGULAR &&
+ user_context.GetAuthFlow() == UserContext::AUTH_FLOW_OFFLINE &&
+ easy_unlock_service) {
+ easy_unlock_service->RecordPasswordLoginEvent(user_context.GetUserID());
+ }
+}
+
} // namespace
// static
@@ -135,6 +155,7 @@
ExistingUserController::ExistingUserController(LoginDisplayHost* host)
: auth_status_consumer_(NULL),
+ last_login_attempt_auth_flow_(UserContext::AUTH_FLOW_OFFLINE),
host_(host),
login_display_(host_->CreateLoginDisplay(this)),
num_login_attempts_(0),
@@ -454,6 +475,8 @@
// Disable UI while loading user profile.
login_display_->SetUIEnabled(false);
+ last_login_attempt_auth_flow_ = user_context.GetAuthFlow();
+
// Use the same LoginPerformer for subsequent login as it has state
// such as Authenticator instance.
if (!login_performer_.get() || num_login_attempts_ <= 1) {
@@ -468,6 +491,7 @@
login_performer_->LoginAsSupervisedUser(user_context);
} else {
login_performer_->PerformLogin(user_context, auth_mode);
+ RecordPasswordLoginEvent(user_context);
}
SendAccessibilityAlert(
l10n_util::GetStringUTF8(IDS_CHROMEOS_ACC_LOGIN_SIGNING_IN));
@@ -773,6 +797,10 @@
guest_mode_url_ = GURL::EmptyGURL();
std::string error = failure.GetErrorString();
+ // TODO(xiyuan): Move into EasyUnlockUserLoginFlow.
+ if (last_login_attempt_auth_flow_ == UserContext::AUTH_FLOW_EASY_UNLOCK)
+ RecordEasySignInOutcome(last_login_attempt_username_, false);
+
if (ChromeUserManager::Get()
->GetUserFlow(last_login_attempt_username_)
->HandleLoginFailure(failure)) {
@@ -846,6 +874,13 @@
->GetUserFlow(user_context.GetUserID())
->HandleLoginSuccess(user_context);
+ // TODO(xiyuan): Move into EasyUnlockUserLoginFlow.
+ if (last_login_attempt_auth_flow_ == UserContext::AUTH_FLOW_EASY_UNLOCK) {
+ DCHECK_EQ(last_login_attempt_username_, user_context.GetUserID());
+ DCHECK_EQ(last_login_attempt_auth_flow_, user_context.GetAuthFlow());
+ RecordEasySignInOutcome(last_login_attempt_username_, true);
+ }
+
StopPublicSessionAutoLoginTimer();
const bool has_auth_cookies =
diff --git a/chrome/browser/chromeos/login/existing_user_controller.h b/chrome/browser/chromeos/login/existing_user_controller.h
index 6fedb17..52b4626 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.h
+++ b/chrome/browser/chromeos/login/existing_user_controller.h
@@ -22,6 +22,7 @@
#include "chrome/browser/chromeos/login/ui/login_display.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/chromeos/settings/device_settings_service.h"
+#include "chromeos/login/auth/user_context.h"
#include "components/user_manager/user.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
@@ -36,7 +37,6 @@
class CrosSettings;
class LoginDisplayHost;
-class UserContext;
namespace login {
class NetworkStateHelper;
@@ -254,6 +254,9 @@
// Username of the last login attempt.
std::string last_login_attempt_username_;
+ // Auth flow of the last login attempt.
+ UserContext::AuthFlow last_login_attempt_auth_flow_;
+
// OOBE/login display host.
LoginDisplayHost* host_;
diff --git a/chrome/browser/metrics/android_metrics_provider.cc b/chrome/browser/metrics/android_metrics_provider.cc
index ddb4158..a7c7d29 100644
--- a/chrome/browser/metrics/android_metrics_provider.cc
+++ b/chrome/browser/metrics/android_metrics_provider.cc
@@ -9,6 +9,7 @@
#include "base/prefs/pref_service.h"
#include "base/prefs/scoped_user_pref_update.h"
#include "base/values.h"
+#include "chrome/browser/android/feature_utilities.h"
#include "chrome/common/pref_names.h"
namespace {
@@ -37,6 +38,13 @@
AndroidMetricsProvider::~AndroidMetricsProvider() {
}
+void AndroidMetricsProvider::ProvideGeneralMetrics(
+ metrics::ChromeUserMetricsExtension* uma_proto) {
+ UMA_HISTOGRAM_ENUMERATION(
+ "DocumentActivity.Enabled",
+ chrome::android::GetDocumentModeValue(),
+ chrome::android::RUNNING_MODE_MAX);
+}
void AndroidMetricsProvider::ProvideStabilityMetrics(
metrics::SystemProfileProto* system_profile_proto) {
diff --git a/chrome/browser/metrics/android_metrics_provider.h b/chrome/browser/metrics/android_metrics_provider.h
index 8b004da..13acca7 100644
--- a/chrome/browser/metrics/android_metrics_provider.h
+++ b/chrome/browser/metrics/android_metrics_provider.h
@@ -12,6 +12,10 @@
class PrefService;
class PrefRegistrySimple;
+namespace metrics {
+class ChromeUserMetricsExtension;
+}
+
// AndroidMetricsProvider provides Android-specific stability metrics.
class AndroidMetricsProvider : public metrics::MetricsProvider {
public:
@@ -19,11 +23,15 @@
explicit AndroidMetricsProvider(PrefService* local_state);
virtual ~AndroidMetricsProvider();
+ // metrics::MetricsProvider:
+ virtual void ProvideGeneralMetrics(
+ metrics::ChromeUserMetricsExtension* uma_proto) override;
+
// Called when the Activity that the user interacts with is swapped out.
// TODO(asvitkine): Expose a way for Android code to actually invoke this.
void OnForegroundActivityChanged(ActivityTypeIds::Type type);
- // metrics::MetricsDataProvider:
+ // metrics::MetricsProvider:
virtual void ProvideStabilityMetrics(
metrics::SystemProfileProto* system_profile_proto) OVERRIDE;
diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc
index ab22900..c3f2acf 100644
--- a/chrome/browser/metrics/chrome_metrics_service_client.cc
+++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -240,11 +240,6 @@
DCHECK(!waiting_for_collect_final_metrics_step_);
waiting_for_collect_final_metrics_step_ = true;
-#if !defined(OS_CHROMEOS) && !defined(OS_IOS)
- // Record the signin status histogram value.
- signin_status_metrics_provider_->RecordSigninStatusHistogram();
-#endif
-
base::Closure callback =
base::Bind(&ChromeMetricsServiceClient::OnMemoryDetailCollectionDone,
weak_ptr_factory_.GetWeakPtr());
@@ -340,10 +335,9 @@
#endif // defined(OS_CHROMEOS)
#if !defined(OS_CHROMEOS) && !defined(OS_IOS)
- signin_status_metrics_provider_ =
- SigninStatusMetricsProvider::CreateInstance();
metrics_service_->RegisterMetricsProvider(
- scoped_ptr<metrics::MetricsProvider>(signin_status_metrics_provider_));
+ scoped_ptr<metrics::MetricsProvider>(
+ SigninStatusMetricsProvider::CreateInstance()));
#endif
}
diff --git a/chrome/browser/metrics/chrome_metrics_service_client.h b/chrome/browser/metrics/chrome_metrics_service_client.h
index 1cb9f45..e7f260c 100644
--- a/chrome/browser/metrics/chrome_metrics_service_client.h
+++ b/chrome/browser/metrics/chrome_metrics_service_client.h
@@ -167,12 +167,6 @@
GoogleUpdateMetricsProviderWin* google_update_metrics_provider_;
#endif
-#if !defined(OS_CHROMEOS) && !defined(OS_IOS)
- // The SigninStatusMetricsProvider instance that was registered with
- // MetricsService. Has the same lifetime as |metrics_service_|.
- SigninStatusMetricsProvider* signin_status_metrics_provider_;
-#endif
-
// Callback that is called when initial metrics gathering is complete.
base::Closure finished_gathering_initial_metrics_callback_;
diff --git a/chrome/browser/metrics/signin_status_metrics_provider.cc b/chrome/browser/metrics/signin_status_metrics_provider.cc
index a207615..a1fcd18 100644
--- a/chrome/browser/metrics/signin_status_metrics_provider.cc
+++ b/chrome/browser/metrics/signin_status_metrics_provider.cc
@@ -71,7 +71,8 @@
factory->RemoveObserver(this);
}
-void SigninStatusMetricsProvider::RecordSigninStatusHistogram() {
+void SigninStatusMetricsProvider::ProvideGeneralMetrics(
+ metrics::ChromeUserMetricsExtension* uma_proto) {
UMA_HISTOGRAM_ENUMERATION(
"UMA.ProfileSignInStatus", signin_status_, SIGNIN_STATUS_MAX);
// After a histogram value is recorded, a new UMA session will be started, so
@@ -201,7 +202,7 @@
(signin_status_ == ALL_PROFILES_SIGNED_IN && !signed_in)) {
SetSigninStatus(MIXED_SIGNIN_STATUS);
} else if (signin_status_ == UNKNOWN_SIGNIN_STATUS) {
- // If when function RecordSigninStatusHistogram() is called, Chrome is
+ // If when function ProvideGeneralMetrics() is called, Chrome is
// running in the background with no browser window opened, |signin_status_|
// will be reset to |UNKNOWN_SIGNIN_STATUS|. Then this newly added browser
// is the only opened browser/profile and its signin status represents
diff --git a/chrome/browser/metrics/signin_status_metrics_provider.h b/chrome/browser/metrics/signin_status_metrics_provider.h
index 28c8207..0c3ae11 100644
--- a/chrome/browser/metrics/signin_status_metrics_provider.h
+++ b/chrome/browser/metrics/signin_status_metrics_provider.h
@@ -16,11 +16,16 @@
#include "components/signin/core/browser/signin_manager_base.h"
class Browser;
+class ChromeUserMetricsExtension;
namespace base {
class FilePath;
}
+namespace metrics {
+class ChromeUserMetricsExtension;
+}
+
// Collect login status of all opened profiles during one UMA session and record
// the value into a histogram before UMA log is uploaded. It's currently not
// supported on platform chromeos, Android or iOS.
@@ -31,10 +36,9 @@
public:
virtual ~SigninStatusMetricsProvider();
- // Record the collected sign-in status into a histogram and re-check current
- // sign-in status to get prepared for the next UMA session. Called by
- // MetricsServiceClient when it is collecting final metrics.
- void RecordSigninStatusHistogram();
+ // metrics::MetricsProvider:
+ virtual void ProvideGeneralMetrics(
+ metrics::ChromeUserMetricsExtension* uma_proto) OVERRIDE;
// Factory method, creates a new instance of this class.
static SigninStatusMetricsProvider* CreateInstance();
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index f770e23..86ffa39 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -1434,7 +1434,5 @@
return scoped_ptr<domain_reliability::DomainReliabilityMonitor>();
return service->CreateMonitor(
- BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
- local_state,
- prefs::kMetricsReportingEnabled);
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
}
diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc
index dd61413..e121662 100644
--- a/chrome/browser/profiles/profile_impl_io_data.cc
+++ b/chrome/browser/profiles/profile_impl_io_data.cc
@@ -114,9 +114,6 @@
if (io_data_->http_server_properties_manager_)
io_data_->http_server_properties_manager_->ShutdownOnPrefThread();
- if (io_data_->domain_reliability_monitor_)
- io_data_->domain_reliability_monitor_->DestroyReportingPref();
-
io_data_->ShutdownOnUIThread(GetAllContextGetters().Pass());
}
@@ -596,6 +593,7 @@
domain_reliability_monitor_.get();
monitor->InitURLRequestContext(main_context);
monitor->AddBakedInConfigs();
+ monitor->SetDiscardUploads(!GetMetricsEnabledStateOnIOThread());
network_delegate()->set_domain_reliability_monitor(monitor);
}
diff --git a/chrome/browser/resources/easy_unlock/manifest.json b/chrome/browser/resources/easy_unlock/manifest.json
index ca4cb4a..0892f19 100644
--- a/chrome/browser/resources/easy_unlock/manifest.json
+++ b/chrome/browser/resources/easy_unlock/manifest.json
@@ -40,7 +40,7 @@
"socket" : true,
"low_energy" : true,
"uuids": [
- "0000AB34-0000-1000-8000-00805F9B34FB", // Unlock UUID
+ "704EE561-3782-405A-A14B-2D47A2DDCDDF", // Unlock UUID
"29422880-D56D-11E3-9C1A-0800200C9A66" // Setup UUID
]
},
diff --git a/chrome/browser/resources/options/browser_options.css b/chrome/browser/resources/options/browser_options.css
index f3ef248..3597778 100644
--- a/chrome/browser/resources/options/browser_options.css
+++ b/chrome/browser/resources/options/browser_options.css
@@ -473,9 +473,8 @@
display: flex;
}
-#version-button {
- -webkit-margin-start: auto;
- color: #999;
+#about-button {
+ -webkit-margin-end: 30px;
}
/* An input that has no function except to take up the same amount of space as
diff --git a/chrome/browser/resources/options/browser_options.html b/chrome/browser/resources/options/browser_options.html
index f6f42ae..ff50358 100644
--- a/chrome/browser/resources/options/browser_options.html
+++ b/chrome/browser/resources/options/browser_options.html
@@ -932,8 +932,5 @@
<button id="advanced-settings-expander" class="link-button"
i18n-content="showAdvancedSettings">
</button>
- <button id="version-button" class="link-button" hidden
- i18n-content="browserVersion">
- </button>
</footer>
</div>
diff --git a/chrome/browser/resources/options/browser_options.js b/chrome/browser/resources/options/browser_options.js
index 9a48d5d..1f7c59d 100644
--- a/chrome/browser/resources/options/browser_options.js
+++ b/chrome/browser/resources/options/browser_options.js
@@ -142,9 +142,9 @@
$('advanced-settings').addEventListener('webkitTransitionEnd',
this.updateAdvancedSettingsExpander_.bind(this));
- if (loadTimeData.getBoolean('showVersion')) {
- $('version-button').hidden = false;
- $('version-button').addEventListener('click', function() {
+ if (loadTimeData.getBoolean('showAbout')) {
+ $('about-button').hidden = false;
+ $('about-button').addEventListener('click', function() {
PageManager.showPageByName('help');
chrome.send('coreOptionsUserMetricsAction',
['Options_About']);
diff --git a/chrome/browser/resources/options/options.js b/chrome/browser/resources/options/options.js
index 9d62c10..9b6ef9f 100644
--- a/chrome/browser/resources/options/options.js
+++ b/chrome/browser/resources/options/options.js
@@ -178,7 +178,7 @@
PageManager.registerOverlay(SyncSetupOverlay.getInstance(),
BrowserOptions.getInstance(),
[$('customize-sync')]);
- if (loadTimeData.getBoolean('showVersion')) {
+ if (loadTimeData.getBoolean('showAbout')) {
PageManager.registerOverlay(help.HelpPage.getInstance(),
BrowserOptions.getInstance());
if (help.ChannelChangePage) {
diff --git a/chrome/browser/resources/options/search_box.html b/chrome/browser/resources/options/search_box.html
index f27e1e7..226134b 100644
--- a/chrome/browser/resources/options/search_box.html
+++ b/chrome/browser/resources/options/search_box.html
@@ -2,6 +2,9 @@
<header >
<span id="browser-options-search-field-container"
class="search-field-container">
+ <button id="about-button" class="link-button" hidden
+ i18n-content="aboutButton">
+ </button>
<input id="search-field" type="search"
i18n-values="placeholder:searchPlaceholder;
aria-label:searchPlaceholder" incremental>
diff --git a/chrome/browser/resources/sync_setup_overlay.js b/chrome/browser/resources/sync_setup_overlay.js
index 1ab271c..86e44e8 100644
--- a/chrome/browser/resources/sync_setup_overlay.js
+++ b/chrome/browser/resources/sync_setup_overlay.js
@@ -14,13 +14,13 @@
* bookmarksRegistered: boolean,
* bookmarksSynced: boolean,
* encryptAllData: boolean,
+ * encryptAllDataAllowed: boolean,
* enterGooglePassphraseBody: (string|undefined),
* enterPassphraseBody: (string|undefined),
* extensionsEnforced: boolean,
* extensionsRegistered: boolean,
* extensionsSynced: boolean,
* fullEncryptionBody: string,
- * isSupervised: boolean,
* passphraseFailed: boolean,
* passwordsEnforced: boolean,
* passwordsRegistered: boolean,
@@ -668,7 +668,7 @@
$('sync-custom-passphrase-container').hidden = false;
$('sync-new-encryption-section-container').hidden = false;
- $('customize-sync-encryption-new').hidden = args.isSupervised;
+ $('customize-sync-encryption-new').hidden = !args.encryptAllDataAllowed;
$('sync-existing-passphrase-container').hidden = true;
diff --git a/chrome/browser/signin/easy_unlock_screenlock_state_handler.cc b/chrome/browser/signin/easy_unlock_screenlock_state_handler.cc
index ea41fac..0ca105d 100644
--- a/chrome/browser/signin/easy_unlock_screenlock_state_handler.cc
+++ b/chrome/browser/signin/easy_unlock_screenlock_state_handler.cc
@@ -130,6 +130,12 @@
UpdateTooltipOptions(trial_run, &icon_options);
+ // For states without tooltips, we still need to set an accessibility label.
+ if (state_ == EasyUnlockScreenlockStateHandler::STATE_BLUETOOTH_CONNECTING) {
+ icon_options.SetAriaLabel(
+ l10n_util::GetStringUTF16(IDS_SMART_LOCK_SPINNER_ACCESSIBILITY_LABEL));
+ }
+
screenlock_bridge_->lock_handler()->ShowUserPodCustomIcon(user_email_,
icon_options);
}
diff --git a/chrome/browser/signin/easy_unlock_screenlock_state_handler.h b/chrome/browser/signin/easy_unlock_screenlock_state_handler.h
index 8122df1..a98600c 100644
--- a/chrome/browser/signin/easy_unlock_screenlock_state_handler.h
+++ b/chrome/browser/signin/easy_unlock_screenlock_state_handler.h
@@ -74,6 +74,8 @@
// Shows the hardlock UI if the hardlock_state_ is not NO_HARDLOCK.
void MaybeShowHardlockUI();
+ State state() const { return state_; }
+
private:
// ScreenlockBridge::Observer:
virtual void OnScreenDidLock() OVERRIDE;
diff --git a/chrome/browser/signin/easy_unlock_service.h b/chrome/browser/signin/easy_unlock_service.h
index cf3e263..627a6c3 100644
--- a/chrome/browser/signin/easy_unlock_service.h
+++ b/chrome/browser/signin/easy_unlock_service.h
@@ -107,6 +107,13 @@
// for the user, returns an empty string.
virtual std::string GetWrappedSecret() const = 0;
+ // Records metrics for Easy sign-in outcome for the given user.
+ virtual void RecordEasySignInOutcome(const std::string& user_id,
+ bool success) const = 0;
+
+ // Records metrics for password based flow for the given user.
+ virtual void RecordPasswordLoginEvent(const std::string& user_id) const = 0;
+
// Whether easy unlock is allowed to be used. If the controlling preference
// is set (from policy), this returns the preference value. Otherwise, it is
// permitted either the flag is enabled or its field trial is enabled.
@@ -197,6 +204,10 @@
void SetScreenlockHardlockedState(
EasyUnlockScreenlockStateHandler::HardlockState state);
+ const EasyUnlockScreenlockStateHandler* screenlock_state_handler() const {
+ return screenlock_state_handler_.get();
+ }
+
private:
// A class to detect whether a bluetooth adapter is present.
class BluetoothDetector;
diff --git a/chrome/browser/signin/easy_unlock_service_regular.cc b/chrome/browser/signin/easy_unlock_service_regular.cc
index 5ea5695..870d663 100644
--- a/chrome/browser/signin/easy_unlock_service_regular.cc
+++ b/chrome/browser/signin/easy_unlock_service_regular.cc
@@ -163,6 +163,17 @@
return std::string();
}
+void EasyUnlockServiceRegular::RecordEasySignInOutcome(
+ const std::string& user_id,
+ bool success) const {
+ NOTREACHED();
+}
+
+void EasyUnlockServiceRegular::RecordPasswordLoginEvent(
+ const std::string& user_id) const {
+ NOTREACHED();
+}
+
void EasyUnlockServiceRegular::InitializeInternal() {
registrar_.Init(profile()->GetPrefs());
registrar_.Add(
diff --git a/chrome/browser/signin/easy_unlock_service_regular.h b/chrome/browser/signin/easy_unlock_service_regular.h
index 3cc3abe..be73ece 100644
--- a/chrome/browser/signin/easy_unlock_service_regular.h
+++ b/chrome/browser/signin/easy_unlock_service_regular.h
@@ -43,6 +43,10 @@
virtual TurnOffFlowStatus GetTurnOffFlowStatus() const OVERRIDE;
virtual std::string GetChallenge() const OVERRIDE;
virtual std::string GetWrappedSecret() const OVERRIDE;
+ virtual void RecordEasySignInOutcome(const std::string& user_id,
+ bool success) const OVERRIDE;
+ virtual void RecordPasswordLoginEvent(
+ const std::string& user_id) const OVERRIDE;
virtual void InitializeInternal() OVERRIDE;
virtual void ShutdownInternal() OVERRIDE;
virtual bool IsAllowedInternal() OVERRIDE;
diff --git a/chrome/browser/signin/easy_unlock_service_signin_chromeos.cc b/chrome/browser/signin/easy_unlock_service_signin_chromeos.cc
index 225bdf2..8dd9ed2 100644
--- a/chrome/browser/signin/easy_unlock_service_signin_chromeos.cc
+++ b/chrome/browser/signin/easy_unlock_service_signin_chromeos.cc
@@ -12,6 +12,7 @@
#include "base/thread_task_runner_handle.h"
#include "base/time/time.h"
#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h"
+#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_metrics.h"
#include "chrome/browser/chromeos/login/session/user_session_manager.h"
#include "chromeos/login/auth/user_context.h"
@@ -170,6 +171,73 @@
return data->devices[device_index].wrapped_secret;
}
+void EasyUnlockServiceSignin::RecordEasySignInOutcome(
+ const std::string& user_id,
+ bool success) const {
+ DCHECK_EQ(GetUserEmail(), user_id);
+
+ chromeos::RecordEasyUnlockLoginEvent(success
+ ? chromeos::EASY_SIGN_IN_SUCCESS
+ : chromeos::EASY_SIGN_IN_FAILURE);
+ VLOG(1) << "Easy sign-in " << (success ? "success" : "failure");
+}
+
+void EasyUnlockServiceSignin::RecordPasswordLoginEvent(
+ const std::string& user_id) const {
+ DCHECK_EQ(GetUserEmail(), user_id);
+
+ chromeos::EasyUnlockLoginEvent event =
+ chromeos::EASY_SIGN_IN_LOGIN_EVENT_COUNT;
+ if (!GetRemoteDevices() ||
+ GetHardlockState() == EasyUnlockScreenlockStateHandler::NO_PAIRING) {
+ event = chromeos::PASSWORD_SIGN_IN_NO_PAIRING;
+ } else if (GetHardlockState() ==
+ EasyUnlockScreenlockStateHandler::PAIRING_CHANGED) {
+ event = chromeos::PASSWORD_SIGN_IN_PAIRING_CHANGED;
+ } else if (GetHardlockState() ==
+ EasyUnlockScreenlockStateHandler::USER_HARDLOCK) {
+ event = chromeos::PASSWORD_SIGN_IN_USER_HARDLOCK;
+ } else if (!screenlock_state_handler()) {
+ event = chromeos::PASSWORD_SIGN_IN_SERVICE_NOT_ACTIVE;
+ } else {
+ switch (screenlock_state_handler()->state()) {
+ case EasyUnlockScreenlockStateHandler::STATE_INACTIVE:
+ event = chromeos::PASSWORD_SIGN_IN_SERVICE_NOT_ACTIVE;
+ break;
+ case EasyUnlockScreenlockStateHandler::STATE_NO_BLUETOOTH:
+ event = chromeos::PASSWORD_SIGN_IN_NO_BLUETOOTH;
+ break;
+ case EasyUnlockScreenlockStateHandler::STATE_BLUETOOTH_CONNECTING:
+ event = chromeos::PASSWORD_SIGN_IN_BLUETOOTH_CONNECTING;
+ break;
+ case EasyUnlockScreenlockStateHandler::STATE_NO_PHONE:
+ event = chromeos::PASSWORD_SIGN_IN_NO_PHONE;
+ break;
+ case EasyUnlockScreenlockStateHandler::STATE_PHONE_NOT_AUTHENTICATED:
+ event = chromeos::PASSWORD_SIGN_IN_PHONE_NOT_AUTHENTICATED;
+ break;
+ case EasyUnlockScreenlockStateHandler::STATE_PHONE_LOCKED:
+ event = chromeos::PASSWORD_SIGN_IN_PHONE_LOCKED;
+ break;
+ case EasyUnlockScreenlockStateHandler::STATE_PHONE_UNLOCKABLE:
+ event = chromeos::PASSWORD_SIGN_IN_PHONE_NOT_LOCKABLE;
+ break;
+ case EasyUnlockScreenlockStateHandler::STATE_PHONE_NOT_NEARBY:
+ event = chromeos::PASSWORD_SIGN_IN_PHONE_NOT_NEARBY;
+ break;
+ case EasyUnlockScreenlockStateHandler::STATE_PHONE_UNSUPPORTED:
+ event = chromeos::PASSWORD_SIGN_IN_PHONE_UNSUPPORTED;
+ break;
+ case EasyUnlockScreenlockStateHandler::STATE_AUTHENTICATED:
+ event = chromeos::PASSWORD_SIGN_IN_WITH_AUTHENTICATED_PHONE;
+ break;
+ }
+ }
+
+ chromeos::RecordEasyUnlockLoginEvent(event);
+ VLOG(1) << "EasySignIn password login event, event=" << event;
+}
+
void EasyUnlockServiceSignin::InitializeInternal() {
if (chromeos::LoginState::Get()->IsUserLoggedIn())
return;
diff --git a/chrome/browser/signin/easy_unlock_service_signin_chromeos.h b/chrome/browser/signin/easy_unlock_service_signin_chromeos.h
index 77e662f..7e89b84 100644
--- a/chrome/browser/signin/easy_unlock_service_signin_chromeos.h
+++ b/chrome/browser/signin/easy_unlock_service_signin_chromeos.h
@@ -70,6 +70,10 @@
virtual TurnOffFlowStatus GetTurnOffFlowStatus() const OVERRIDE;
virtual std::string GetChallenge() const OVERRIDE;
virtual std::string GetWrappedSecret() const OVERRIDE;
+ virtual void RecordEasySignInOutcome(const std::string& user_id,
+ bool success) const OVERRIDE;
+ virtual void RecordPasswordLoginEvent(
+ const std::string& user_id) const OVERRIDE;
virtual void InitializeInternal() OVERRIDE;
virtual void ShutdownInternal() OVERRIDE;
virtual bool IsAllowedInternal() OVERRIDE;
diff --git a/chrome/browser/signin/screenlock_bridge.cc b/chrome/browser/signin/screenlock_bridge.cc
index a78d261..5fb5192 100644
--- a/chrome/browser/signin/screenlock_bridge.cc
+++ b/chrome/browser/signin/screenlock_bridge.cc
@@ -74,6 +74,9 @@
result->Set("tooltip", tooltip_options);
}
+ if (!aria_label_.empty())
+ result->SetString("ariaLabel", aria_label_);
+
if (hardlock_on_click_)
result->SetBoolean("hardlockOnClick", true);
@@ -92,6 +95,11 @@
autoshow_tooltip_ = autoshow;
}
+void ScreenlockBridge::UserPodCustomIconOptions::SetAriaLabel(
+ const base::string16& aria_label) {
+ aria_label_ = aria_label;
+}
+
void ScreenlockBridge::UserPodCustomIconOptions::SetHardlockOnClick() {
hardlock_on_click_ = true;
}
diff --git a/chrome/browser/signin/screenlock_bridge.h b/chrome/browser/signin/screenlock_bridge.h
index 7add894..c9b702d 100644
--- a/chrome/browser/signin/screenlock_bridge.h
+++ b/chrome/browser/signin/screenlock_bridge.h
@@ -64,6 +64,10 @@
// shown with the icon.
void SetTooltip(const base::string16& tooltip, bool autoshow);
+ // Sets the accessiblity label of the icon. If this attribute is not
+ // provided, then the tooltip will be used.
+ void SetAriaLabel(const base::string16& aria_label);
+
// If hardlock on click is set, clicking the icon in the screenlock will
// go to state where password is required for unlock.
void SetHardlockOnClick();
@@ -74,6 +78,8 @@
base::string16 tooltip_;
bool autoshow_tooltip_;
+ base::string16 aria_label_;
+
bool hardlock_on_click_;
DISALLOW_COPY_AND_ASSIGN(UserPodCustomIconOptions);
diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/browser/supervised_user/supervised_user_service.cc
index 6cd2130..dc0daf4 100644
--- a/chrome/browser/supervised_user/supervised_user_service.cc
+++ b/chrome/browser/supervised_user/supervised_user_service.cc
@@ -726,6 +726,10 @@
}
#endif
+ ProfileSyncService* sync_service =
+ ProfileSyncServiceFactory::GetForProfile(profile_);
+ sync_service->SetEncryptEverythingAllowed(!active_);
+
SupervisedUserSettingsService* settings_service = GetSettingsService();
settings_service->SetActive(active_);
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index 3135388..1f8f9eb 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -217,6 +217,7 @@
unrecoverable_error_reason_(ERROR_REASON_UNSET),
expect_sync_configuration_aborted_(false),
encrypted_types_(syncer::SyncEncryptionHandler::SensitiveTypes()),
+ encrypt_everything_allowed_(true),
encrypt_everything_(false),
encryption_pending_(false),
configure_status_(DataTypeManager::UNKNOWN),
@@ -1368,6 +1369,7 @@
bool encrypt_everything) {
encrypted_types_ = encrypted_types;
encrypt_everything_ = encrypt_everything;
+ DCHECK(encrypt_everything_allowed_ || !encrypt_everything_);
DVLOG(1) << "Encrypted types changed to "
<< syncer::ModelTypeSetToString(encrypted_types_)
<< " (encrypt everything is set to "
@@ -2193,7 +2195,18 @@
}
}
+bool ProfileSyncService::EncryptEverythingAllowed() const {
+ return encrypt_everything_allowed_;
+}
+
+void ProfileSyncService::SetEncryptEverythingAllowed(bool allowed) {
+ DCHECK(allowed || !backend_initialized_ || !EncryptEverythingEnabled());
+ encrypt_everything_allowed_ = allowed;
+}
+
void ProfileSyncService::EnableEncryptEverything() {
+ DCHECK(EncryptEverythingAllowed());
+
// Tests override sync_initialized() to always return true, so we
// must check that instead of |backend_initialized_|.
// TODO(akalin): Fix the above. :/
diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h
index ac43cf8..ee25275 100644
--- a/chrome/browser/sync/profile_sync_service.h
+++ b/chrome/browser/sync/profile_sync_service.h
@@ -678,6 +678,13 @@
virtual bool SetDecryptionPassphrase(const std::string& passphrase)
WARN_UNUSED_RESULT;
+ // Returns true if encrypting all the sync data is allowed. If this method
+ // returns false, EnableEncryptEverything() should not be called.
+ virtual bool EncryptEverythingAllowed() const;
+
+ // Sets whether encrypting all the sync data is allowed or not.
+ virtual void SetEncryptEverythingAllowed(bool allowed);
+
// Turns on encryption for all data. Callers must call OnUserChoseDatatypes()
// after calling this to force the encryption to occur.
virtual void EnableEncryptEverything();
@@ -1054,6 +1061,9 @@
// syncer::Cryptographer::SensitiveTypes().
syncer::ModelTypeSet encrypted_types_;
+ // Whether encrypting everything is allowed.
+ bool encrypt_everything_allowed_;
+
// Whether we want to encrypt everything.
bool encrypt_everything_;
diff --git a/chrome/browser/sync/profile_sync_service_android.cc b/chrome/browser/sync/profile_sync_service_android.cc
index 7960efe..6d564fd 100644
--- a/chrome/browser/sync/profile_sync_service_android.cc
+++ b/chrome/browser/sync/profile_sync_service_android.cc
@@ -220,6 +220,12 @@
return sync_service_->FirstSetupInProgress();
}
+jboolean ProfileSyncServiceAndroid::IsEncryptEverythingAllowed(
+ JNIEnv* env, jobject obj) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ return sync_service_->EncryptEverythingAllowed();
+}
+
jboolean ProfileSyncServiceAndroid::IsPassphraseRequired(JNIEnv* env, jobject) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
return sync_service_->IsPassphraseRequired();
diff --git a/chrome/browser/sync/profile_sync_service_android.h b/chrome/browser/sync/profile_sync_service_android.h
index 9ee0cc4..12de215 100644
--- a/chrome/browser/sync/profile_sync_service_android.h
+++ b/chrome/browser/sync/profile_sync_service_android.h
@@ -76,6 +76,9 @@
// Returns true if the sync is currently being setup for the first time.
jboolean IsFirstSetupInProgress(JNIEnv* env, jobject obj);
+ // Returns true if encrypting everything is allowed.
+ jboolean IsEncryptEverythingAllowed(JNIEnv* env, jobject obj);
+
// Returns true if the user is currently encrypting everything.
jboolean IsEncryptEverythingEnabled(JNIEnv* env, jobject obj);
diff --git a/chrome/browser/sync/profile_sync_service_mock.h b/chrome/browser/sync/profile_sync_service_mock.h
index 53253a2..3739691 100644
--- a/chrome/browser/sync/profile_sync_service_mock.h
+++ b/chrome/browser/sync/profile_sync_service_mock.h
@@ -70,6 +70,7 @@
MOCK_METHOD0(GetJsController, base::WeakPtr<syncer::JsController>());
MOCK_CONST_METHOD0(HasSyncSetupCompleted, bool());
+ MOCK_CONST_METHOD0(EncryptEverythingAllowed, bool());
MOCK_CONST_METHOD0(EncryptEverythingEnabled, bool());
MOCK_METHOD0(EnableEncryptEverything, void());
@@ -90,8 +91,7 @@
MOCK_CONST_METHOD0(sync_initialized, bool());
MOCK_CONST_METHOD0(IsStartSuppressed, bool());
MOCK_CONST_METHOD0(waiting_for_auth, bool());
- MOCK_METHOD1(OnActionableError, void(
- const syncer::SyncProtocolError&));
+ MOCK_METHOD1(OnActionableError, void(const syncer::SyncProtocolError&));
MOCK_METHOD1(SetSetupInProgress, void(bool));
MOCK_CONST_METHOD1(IsDataTypeControllerRunning, bool(syncer::ModelType));
diff --git a/chrome/browser/ui/webui/options/core_options_handler.cc b/chrome/browser/ui/webui/options/core_options_handler.cc
index f6683fb..3db9ae5 100644
--- a/chrome/browser/ui/webui/options/core_options_handler.cc
+++ b/chrome/browser/ui/webui/options/core_options_handler.cc
@@ -17,7 +17,6 @@
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_util.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/webui/help/help_handler.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
@@ -62,6 +61,19 @@
#endif
}
+// Hack to re-use IDS_ABOUT, which is a menu item for the About page.
+// Since it's a menu item, it may include a "&" to indicate a hotkey.
+base::string16 GetAboutString() {
+ if (!switches::AboutInSettingsEnabled())
+ return base::string16();
+
+ base::string16 str = l10n_util::GetStringUTF16(IDS_ABOUT);
+ size_t start_pos = str.find(base::ASCIIToUTF16("&"));
+ if (start_pos != base::string16::npos)
+ str.erase(start_pos, 1);
+ return str;
+}
+
} // namespace
CoreOptionsHandler::CoreOptionsHandler()
@@ -147,6 +159,11 @@
localized_strings->SetString("searchPageHelpURL",
chrome::kSettingsSearchHelpURL);
+ // About
+ localized_strings->SetBoolean("showAbout",
+ switches::AboutInSettingsEnabled());
+ localized_strings->SetString("aboutButton", GetAboutString());
+
// Common
localized_strings->SetString("ok",
l10n_util::GetStringUTF16(IDS_OK));
@@ -160,12 +177,6 @@
l10n_util::GetStringUTF16(IDS_DONE));
localized_strings->SetString("deletableItemDeleteButtonTitle",
l10n_util::GetStringUTF16(IDS_OPTIONS_DELETABLE_ITEM_DELETE_BUTTON));
- localized_strings->SetString(
- "browserVersion",
- l10n_util::GetStringFUTF16(IDS_ABOUT_PRODUCT_VERSION,
- HelpHandler::BuildBrowserVersionString()));
- localized_strings->SetBoolean("showVersion",
- switches::AboutInSettingsEnabled());
}
void CoreOptionsHandler::Uninitialize() {
diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc
index 0218d61..f10c6d0 100644
--- a/chrome/browser/ui/webui/sync_setup_handler.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler.cc
@@ -375,7 +375,7 @@
args.SetBoolean("syncAllDataTypes", sync_prefs.HasKeepEverythingSynced());
args.SetBoolean("syncNothing", false); // Always false during initial setup.
args.SetBoolean("encryptAllData", service->EncryptEverythingEnabled());
- args.SetBoolean("isSupervised", GetProfile()->IsSupervised());
+ args.SetBoolean("encryptAllDataAllowed", service->EncryptEverythingAllowed());
// We call IsPassphraseRequired() here, instead of calling
// IsPassphraseRequiredForDecryption(), because we want to show the passphrase
@@ -682,9 +682,10 @@
return;
}
- // Don't allow supervised users to enable "encrypt all". The UI is hidden,
- // but the user may have enabled it e.g. by fiddling with the web inspector.
- if (GetProfile()->IsSupervised())
+ // Don't allow "encrypt all" if the ProfileSyncService doesn't allow it.
+ // The UI is hidden, but the user may have enabled it e.g. by fiddling with
+ // the web inspector.
+ if (!service->EncryptEverythingAllowed())
configuration.encrypt_all = false;
// Note: Data encryption will not occur until configuration is complete
diff --git a/chrome/browser/ui/webui/sync_setup_handler.h b/chrome/browser/ui/webui/sync_setup_handler.h
index 38f4788..a824b12 100644
--- a/chrome/browser/ui/webui/sync_setup_handler.h
+++ b/chrome/browser/ui/webui/sync_setup_handler.h
@@ -71,6 +71,7 @@
FRIEND_TEST_ALL_PREFIXES(SyncSetupHandlerTest, TestPassphraseStillRequired);
FRIEND_TEST_ALL_PREFIXES(SyncSetupHandlerTest, TestSyncIndividualTypes);
FRIEND_TEST_ALL_PREFIXES(SyncSetupHandlerTest, TurnOnEncryptAll);
+ FRIEND_TEST_ALL_PREFIXES(SyncSetupHandlerTest, TurnOnEncryptAllDisallowed);
FRIEND_TEST_ALL_PREFIXES(SyncSetupHandlerTest, UnsuccessfullySetPassphrase);
FRIEND_TEST_ALL_PREFIXES(SyncSetupHandlerNonCrosTest,
UnrecoverableErrorInitializingSync);
diff --git a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc
index 1389a0f..6b4cd33 100644
--- a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc
@@ -320,6 +320,8 @@
WillRepeatedly(Return(GetAllTypes()));
EXPECT_CALL(*mock_pss_, GetActiveDataTypes()).
WillRepeatedly(Return(GetAllTypes()));
+ EXPECT_CALL(*mock_pss_, EncryptEverythingAllowed()).
+ WillRepeatedly(Return(true));
EXPECT_CALL(*mock_pss_, EncryptEverythingEnabled()).
WillRepeatedly(Return(false));
}
@@ -526,6 +528,7 @@
CheckBool(dictionary, "passphraseFailed", false);
CheckBool(dictionary, "showSyncEverythingPage", false);
CheckBool(dictionary, "syncAllDataTypes", true);
+ CheckBool(dictionary, "encryptAllDataAllowed", true);
CheckBool(dictionary, "encryptAllData", false);
CheckBool(dictionary, "usePassphrase", false);
}
@@ -684,6 +687,8 @@
.WillRepeatedly(Return(false));
EXPECT_CALL(*mock_pss_, IsPassphraseRequired())
.WillRepeatedly(Return(false));
+ EXPECT_CALL(*mock_pss_, EncryptEverythingAllowed())
+ .WillRepeatedly(Return(true));
SetupInitializedProfileSyncService();
EXPECT_CALL(*mock_pss_, EnableEncryptEverything());
EXPECT_CALL(*mock_pss_, OnUserChoseDatatypes(true, _));
@@ -1058,3 +1063,46 @@
ASSERT_TRUE(data.arg2->GetAsDictionary(&dictionary));
CheckBool(dictionary, "encryptAllData", true);
}
+
+TEST_F(SyncSetupHandlerTest, ShowSetupEncryptAllDisallowed) {
+ EXPECT_CALL(*mock_pss_, IsPassphraseRequired())
+ .WillRepeatedly(Return(false));
+ EXPECT_CALL(*mock_pss_, IsUsingSecondaryPassphrase())
+ .WillRepeatedly(Return(false));
+ SetupInitializedProfileSyncService();
+ SetDefaultExpectationsForConfigPage();
+ EXPECT_CALL(*mock_pss_, EncryptEverythingAllowed()).
+ WillRepeatedly(Return(false));
+
+ // This should display the sync setup dialog (not login).
+ handler_->OpenSyncSetup();
+
+ ExpectConfig();
+ const TestWebUI::CallData& data = web_ui_.call_data()[0];
+ base::DictionaryValue* dictionary;
+ ASSERT_TRUE(data.arg2->GetAsDictionary(&dictionary));
+ CheckBool(dictionary, "encryptAllData", false);
+ CheckBool(dictionary, "encryptAllDataAllowed", false);
+}
+
+TEST_F(SyncSetupHandlerTest, TurnOnEncryptAllDisallowed) {
+ std::string args = GetConfiguration(
+ NULL, SYNC_ALL_DATA, GetAllTypes(), std::string(), ENCRYPT_ALL_DATA);
+ base::ListValue list_args;
+ list_args.Append(new base::StringValue(args));
+ EXPECT_CALL(*mock_pss_, IsPassphraseRequiredForDecryption())
+ .WillRepeatedly(Return(false));
+ EXPECT_CALL(*mock_pss_, IsPassphraseRequired())
+ .WillRepeatedly(Return(false));
+ SetupInitializedProfileSyncService();
+ EXPECT_CALL(*mock_pss_, EncryptEverythingAllowed()).
+ WillRepeatedly(Return(false));
+ EXPECT_CALL(*mock_pss_, EnableEncryptEverything()).Times(0);
+ EXPECT_CALL(*mock_pss_, OnUserChoseDatatypes(true, _));
+ handler_->HandleConfigure(&list_args);
+
+ // Ensure that we navigated to the "done" state since we don't need a
+ // passphrase.
+ ExpectDone();
+}
+
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 5bb3872..0be5300 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -53,6 +53,8 @@
'browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.h',
'browser/android/favicon_helper.cc',
'browser/android/favicon_helper.h',
+ 'browser/android/feature_utilities.cc',
+ 'browser/android/feature_utilities.h',
'browser/android/foreign_session_helper.cc',
'browser/android/foreign_session_helper.h',
'browser/android/logo_bridge.cc',
@@ -2752,6 +2754,7 @@
'android/java/src/org/chromium/chrome/browser/UmaBridge.java',
'android/java/src/org/chromium/chrome/browser/UmaUtils.java',
'android/java/src/org/chromium/chrome/browser/UrlUtilities.java',
+ 'android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java',
'android/java/src/org/chromium/chrome/browser/VoiceSearchTabHelper.java',
'android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java',
'android/java/src/org/chromium/chrome/browser/infobar/AutoLoginDelegate.java',
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index a8bd710..45028a8 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -549,6 +549,8 @@
'browser/chromeos/login/easy_unlock/easy_unlock_get_keys_operation.h',
'browser/chromeos/login/easy_unlock/easy_unlock_key_manager.cc',
'browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h',
+ 'browser/chromeos/login/easy_unlock/easy_unlock_metrics.cc',
+ 'browser/chromeos/login/easy_unlock/easy_unlock_metrics.h',
'browser/chromeos/login/easy_unlock/easy_unlock_remove_keys_operation.cc',
'browser/chromeos/login/easy_unlock/easy_unlock_remove_keys_operation.h',
'browser/chromeos/login/easy_unlock/easy_unlock_types.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index bd9fd90..11610cd 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -622,6 +622,8 @@
'test/chromedriver/basic_types.h',
'test/chromedriver/capabilities.cc',
'test/chromedriver/capabilities.h',
+ 'test/chromedriver/chrome/browser_info.cc',
+ 'test/chromedriver/chrome/browser_info.h',
'test/chromedriver/chrome_launcher.cc',
'test/chromedriver/chrome_launcher.h',
'test/chromedriver/command_listener.h',
@@ -729,6 +731,7 @@
],
'sources': [
'test/chromedriver/capabilities_unittest.cc',
+ 'test/chromedriver/chrome/browser_info_unittest.cc',
'test/chromedriver/chrome/chrome_finder_unittest.cc',
'test/chromedriver/chrome/console_logger_unittest.cc',
'test/chromedriver/chrome/device_manager_unittest.cc',
diff --git a/chrome/test/chromedriver/chrome/browser_info.cc b/chrome/test/chromedriver/chrome/browser_info.cc
new file mode 100644
index 0000000..e78c1eb
--- /dev/null
+++ b/chrome/test/chromedriver/chrome/browser_info.cc
@@ -0,0 +1,120 @@
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/test/chromedriver/chrome/browser_info.h"
+
+#include "base/json/json_reader.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
+#include "base/values.h"
+
+BrowserInfo::BrowserInfo()
+ : browser_name(std::string()),
+ browser_version(std::string()),
+ build_no(kToTBuildNo),
+ blink_revision(kToTBlinkRevision) {
+}
+
+BrowserInfo::BrowserInfo(std::string browser_name,
+ std::string browser_version,
+ int build_no,
+ int blink_revision)
+ : browser_name(browser_name),
+ browser_version(browser_version),
+ build_no(build_no),
+ blink_revision(blink_revision) {
+}
+
+Status ParseBrowserInfo(const std::string& data, BrowserInfo* browser_info) {
+ scoped_ptr<base::Value> value(base::JSONReader::Read(data));
+ if (!value.get())
+ return Status(kUnknownError, "version info not in JSON");
+
+ base::DictionaryValue* dict;
+ if (!value->GetAsDictionary(&dict))
+ return Status(kUnknownError, "version info not a dictionary");
+
+ std::string browser;
+ if (!dict->GetString("Browser", &browser)) {
+ return Status(kUnknownError,
+ "version info doesn't include string 'Browser'");
+ }
+
+ std::string blink_version;
+ if (!dict->GetString("WebKit-Version", &blink_version)) {
+ return Status(kUnknownError,
+ "version info doesn't include string 'WebKit-Version'");
+ }
+
+ Status status = ParseBrowserString(browser, &browser_info->browser_name,
+ &browser_info->browser_version, &browser_info->build_no);
+
+ if (status.IsError())
+ return status;
+
+ return ParseBlinkVersionString(blink_version, &browser_info->blink_revision);
+}
+
+Status ParseBrowserString(const std::string& browser_string,
+ std::string* browser_name,
+ std::string* browser_version,
+ int* build_no) {
+ if (browser_string.empty()) {
+ *browser_name = "content shell";
+ return Status(kOk);
+ }
+
+ if (browser_string.find("Version/") == 0u) {
+ *browser_name = "webview";
+ return Status(kOk);
+ }
+
+ std::string prefix = "Chrome/";
+ if (browser_string.find(prefix) == 0u) {
+ *browser_name = "chrome";
+ *browser_version = browser_string.substr(prefix.length());
+
+ std::vector<std::string> version_parts;
+ base::SplitString(*browser_version, '.', &version_parts);
+ if (version_parts.size() != 4 ||
+ !base::StringToInt(version_parts[2], build_no)) {
+ return Status(kUnknownError,
+ "unrecognized Chrome version: " + *browser_version);
+ }
+
+ return Status(kOk);
+ }
+
+ return Status(kUnknownError,
+ "unrecognized Chrome version: " + browser_string);
+}
+
+Status ParseBlinkVersionString(const std::string& blink_version,
+ int* blink_revision) {
+ size_t before = blink_version.find('@');
+ size_t after = blink_version.find(')');
+ if (before == std::string::npos || after == std::string::npos) {
+ return Status(kUnknownError,
+ "unrecognized Blink version string: " + blink_version);
+ }
+
+ // Chrome OS reports its Blink revision as a (non-abbreviated) git hash. In
+ // this case, ignore it and don't set |blink_revision|. For Chrome (and for
+ // Chrome OS) we use the build number instead of the blink revision for
+ // decisions about backwards compatibility.
+ std::string revision = blink_version.substr(before + 1, after - before - 1);
+ if (!IsGitHash(revision) && !base::StringToInt(revision, blink_revision)) {
+ return Status(kUnknownError, "unrecognized Blink revision: " + revision);
+ }
+
+ return Status(kOk);
+}
+
+bool IsGitHash(const std::string& revision) {
+ const int kGitHashLength = 40;
+ return revision.size() == kGitHashLength
+ && base::ContainsOnlyChars(revision, "0123456789abcdefABCDEF");
+}
diff --git a/chrome/test/chromedriver/chrome/browser_info.h b/chrome/test/chromedriver/chrome/browser_info.h
new file mode 100644
index 0000000..e6f161b
--- /dev/null
+++ b/chrome/test/chromedriver/chrome/browser_info.h
@@ -0,0 +1,44 @@
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_TEST_CHROMEDRIVER_CHROME_BROWSER_INFO_H_
+#define CHROME_TEST_CHROMEDRIVER_CHROME_BROWSER_INFO_H_
+
+#include "chrome/test/chromedriver/chrome/status.h"
+
+// Content Shell and WebView have an empty product version and a fake user
+// agent. There's no way to detect the actual version, so unless specified we
+// assume it is tip of tree.
+static const int kToTBuildNo = 9999;
+
+// Similarly, if the Blink Revision isn't given then assume it is tip of tree.
+static const int kToTBlinkRevision = 999999;
+
+struct BrowserInfo {
+ BrowserInfo();
+ BrowserInfo(std::string browser_name_,
+ std::string browser_version_,
+ int build_no_,
+ int blink_revision_);
+
+ std::string browser_name;
+ std::string browser_version;
+ int build_no;
+ int blink_revision;
+};
+
+Status ParseBrowserInfo(const std::string& data,
+ BrowserInfo* browser_info);
+
+Status ParseBrowserString(const std::string& browser_string,
+ std::string* browser_name,
+ std::string* browser_version,
+ int* build_no);
+
+Status ParseBlinkVersionString(const std::string& blink_version,
+ int* blink_revision);
+
+bool IsGitHash(const std::string& revision);
+
+#endif // CHROME_TEST_CHROMEDRIVER_CHROME_BROWSER_INFO_H_
diff --git a/chrome/test/chromedriver/chrome/browser_info_unittest.cc b/chrome/test/chromedriver/chrome/browser_info_unittest.cc
new file mode 100644
index 0000000..ed68d01
--- /dev/null
+++ b/chrome/test/chromedriver/chrome/browser_info_unittest.cc
@@ -0,0 +1,94 @@
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/test/chromedriver/chrome/browser_info.h"
+
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace {
+
+void AssertParseBrowserInfoFails(const std::string& data) {
+ BrowserInfo browser_info;
+ Status status = ParseBrowserInfo(data, &browser_info);
+ ASSERT_TRUE(status.IsError());
+}
+
+} // namespace
+
+TEST(ParseBrowserInfo, InvalidJSON) {
+ AssertParseBrowserInfoFails("[");
+}
+
+TEST(ParseBrowserInfo, NonDict) {
+ AssertParseBrowserInfoFails("[]");
+}
+
+TEST(ParseBrowserInfo, NoBrowserKey) {
+ AssertParseBrowserInfoFails("{}");
+}
+
+TEST(ParseBrowserInfo, BlinkVersionContainsSvnRevision) {
+ std::string data("{\"Browser\": \"Chrome/37.0.2062.124\","
+ " \"WebKit-Version\": \"537.36 (@181352)\"}");
+ BrowserInfo browser_info;
+ Status status = ParseBrowserInfo(data, &browser_info);
+ ASSERT_TRUE(status.IsOk());
+ ASSERT_EQ("chrome", browser_info.browser_name);
+ ASSERT_EQ("37.0.2062.124", browser_info.browser_version);
+ ASSERT_EQ(2062, browser_info.build_no);
+ ASSERT_EQ(181352, browser_info.blink_revision);
+}
+
+TEST(ParseBrowserInfo, BlinkVersionContainsGitHash) {
+ std::string data("{\"Browser\": \"Chrome/37.0.2062.124\","
+ " \"WebKit-Version\":"
+ " \"537.36 (@28f741cfcabffe68a9c12c4e7152569c906bd88f)\"}");
+ BrowserInfo browser_info;
+ const int default_blink_revision = browser_info.blink_revision;
+ Status status = ParseBrowserInfo(data, &browser_info);
+ ASSERT_TRUE(status.IsOk());
+ ASSERT_EQ("chrome", browser_info.browser_name);
+ ASSERT_EQ("37.0.2062.124", browser_info.browser_version);
+ ASSERT_EQ(2062, browser_info.build_no);
+ ASSERT_EQ(default_blink_revision, browser_info.blink_revision);
+}
+
+TEST(ParseBrowserString, Chrome) {
+ std::string browser_name;
+ std::string browser_version;
+ int build_no;
+ Status status = ParseBrowserString(
+ "Chrome/37.0.2062.124", &browser_name, &browser_version, &build_no);
+ ASSERT_TRUE(status.IsOk());
+ ASSERT_EQ("chrome", browser_name);
+ ASSERT_EQ("37.0.2062.124", browser_version);
+ ASSERT_EQ(2062, build_no);
+}
+
+TEST(ParseBlinkVersionString, GitHash) {
+ int rev = -1;
+ Status status = ParseBlinkVersionString(
+ "537.36 (@28f741cfcabffe68a9c12c4e7152569c906bd88f)", &rev);
+ ASSERT_TRUE(status.IsOk());
+ ASSERT_EQ(-1, rev);
+}
+
+TEST(ParseBlinkVersionString, SvnRevision) {
+ int blink_revision = -1;
+ Status status = ParseBlinkVersionString("537.36 (@159105)", &blink_revision);
+ ASSERT_TRUE(status.IsOk());
+ ASSERT_EQ(159105, blink_revision);
+}
+
+TEST(IsGitHash, GitHash) {
+ ASSERT_TRUE(IsGitHash("28f741cfcabffe68a9c12c4e7152569c906bd88f"));
+}
+
+TEST(IsGitHash, GitHashWithUpperCaseCharacters) {
+ ASSERT_TRUE(IsGitHash("28F741CFCABFFE68A9C12C4E7152569C906BD88F"));
+}
+
+TEST(IsGitHash, SvnRevision) {
+ ASSERT_FALSE(IsGitHash("159105"));
+}
diff --git a/chrome/test/chromedriver/chrome/chrome_impl.cc b/chrome/test/chromedriver/chrome/chrome_impl.cc
index da85877..47dc392 100644
--- a/chrome/test/chromedriver/chrome/chrome_impl.cc
+++ b/chrome/test/chromedriver/chrome/chrome_impl.cc
@@ -8,7 +8,6 @@
#include "chrome/test/chromedriver/chrome/devtools_event_listener.h"
#include "chrome/test/chromedriver/chrome/devtools_http_client.h"
#include "chrome/test/chromedriver/chrome/status.h"
-#include "chrome/test/chromedriver/chrome/version.h"
#include "chrome/test/chromedriver/chrome/web_view_impl.h"
#include "chrome/test/chromedriver/net/port_server.h"
diff --git a/chrome/test/chromedriver/chrome/devtools_http_client.cc b/chrome/test/chromedriver/chrome/devtools_http_client.cc
index 9397872..e980729 100644
--- a/chrome/test/chromedriver/chrome/devtools_http_client.cc
+++ b/chrome/test/chromedriver/chrome/devtools_http_client.cc
@@ -7,8 +7,6 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/json/json_reader.h"
-#include "base/strings/string_number_conversions.h"
-#include "base/strings/string_split.h"
#include "base/strings/stringprintf.h"
#include "base/threading/platform_thread.h"
#include "base/time/time.h"
@@ -17,7 +15,6 @@
#include "chrome/test/chromedriver/chrome/devtools_client_impl.h"
#include "chrome/test/chromedriver/chrome/log.h"
#include "chrome/test/chromedriver/chrome/status.h"
-#include "chrome/test/chromedriver/chrome/version.h"
#include "chrome/test/chromedriver/chrome/web_view_impl.h"
#include "chrome/test/chromedriver/net/net_util.h"
#include "chrome/test/chromedriver/net/url_request_context_getter.h"
@@ -73,68 +70,17 @@
Status DevToolsHttpClient::Init(const base::TimeDelta& timeout) {
base::TimeTicks deadline = base::TimeTicks::Now() + timeout;
- std::string browser_version;
- std::string blink_version;
+ std::string version_url = server_url_ + "/json/version";
+ std::string data;
- while (true) {
- Status status = GetVersion(&browser_version, &blink_version);
- if (status.IsOk())
- break;
- if (status.code() != kChromeNotReachable ||
- base::TimeTicks::Now() > deadline) {
- return status;
- }
+ while (!FetchUrlAndLog(version_url, context_getter_.get(), &data)
+ || data.empty()) {
+ if (base::TimeTicks::Now() > deadline)
+ return Status(kChromeNotReachable);
base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(50));
}
- // |blink_version| is should look something like "537.36 (@159105)", and for
- // this example |blink_revision| should be 159105
- size_t before = blink_version.find('@');
- size_t after = blink_version.find(')');
- if (before == std::string::npos || after == std::string::npos) {
- return Status(kUnknownError,
- "unrecognized Blink version: " + blink_version);
- }
-
- std::string blink_revision_string = blink_version.substr(before + 1,
- after - before - 1);
- int blink_revision_int;
- if (!base::StringToInt(blink_revision_string, &blink_revision_int)) {
- return Status(kUnknownError,
- "unrecognized Blink revision: " + blink_revision_string);
- }
-
- browser_info_.blink_revision = blink_revision_int;
-
- if (browser_version.empty()) {
- browser_info_.browser_name = "content shell";
- return Status(kOk);
- }
- if (browser_version.find("Version/") == 0u) {
- browser_info_.browser_name = "webview";
- return Status(kOk);
- }
- std::string prefix = "Chrome/";
- if (browser_version.find(prefix) != 0u) {
- return Status(kUnknownError,
- "unrecognized Chrome version: " + browser_version);
- }
-
- std::string stripped_version = browser_version.substr(prefix.length());
- int temp_build_no;
- std::vector<std::string> version_parts;
- base::SplitString(stripped_version, '.', &version_parts);
- if (version_parts.size() != 4 ||
- !base::StringToInt(version_parts[2], &temp_build_no)) {
- return Status(kUnknownError,
- "unrecognized Chrome version: " + browser_version);
- }
-
- browser_info_.browser_name = "chrome";
- browser_info_.browser_version = stripped_version;
- browser_info_.build_no = temp_build_no;
-
- return Status(kOk);
+ return ParseBrowserInfo(data, &browser_info_);
}
Status DevToolsHttpClient::GetWebViewsInfo(WebViewsInfo* views_info) {
@@ -195,16 +141,6 @@
return device_metrics_.get();
}
-Status DevToolsHttpClient::GetVersion(std::string* browser_version,
- std::string* blink_version) {
- std::string data;
- if (!FetchUrlAndLog(
- server_url_ + "/json/version", context_getter_.get(), &data))
- return Status(kChromeNotReachable);
-
- return internal::ParseVersionInfo(data, browser_version, blink_version);
-}
-
Status DevToolsHttpClient::CloseFrontends(const std::string& for_client_id) {
WebViewsInfo views_info;
Status status = GetWebViewsInfo(&views_info);
@@ -343,26 +279,4 @@
return Status(kOk);
}
-Status ParseVersionInfo(const std::string& data,
- std::string* browser_version,
- std::string* blink_version) {
- scoped_ptr<base::Value> value(base::JSONReader::Read(data));
- if (!value.get())
- return Status(kUnknownError, "version info not in JSON");
- base::DictionaryValue* dict;
- if (!value->GetAsDictionary(&dict))
- return Status(kUnknownError, "version info not a dictionary");
- if (!dict->GetString("Browser", browser_version)) {
- return Status(
- kUnknownError,
- "Chrome version must be >= " + GetMinimumSupportedChromeVersion(),
- Status(kUnknownError, "version info doesn't include string 'Browser'"));
- }
- if (!dict->GetString("WebKit-Version", blink_version)) {
- return Status(kUnknownError,
- "version info doesn't include string 'WebKit-Version'");
- }
- return Status(kOk);
-}
-
} // namespace internal
diff --git a/chrome/test/chromedriver/chrome/devtools_http_client.h b/chrome/test/chromedriver/chrome/devtools_http_client.h
index 1e1c5eb..3479ee0 100644
--- a/chrome/test/chromedriver/chrome/devtools_http_client.h
+++ b/chrome/test/chromedriver/chrome/devtools_http_client.h
@@ -10,7 +10,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
-#include "chrome/test/chromedriver/chrome/version.h"
+#include "chrome/test/chromedriver/chrome/browser_info.h"
#include "chrome/test/chromedriver/net/sync_websocket_factory.h"
namespace base {
@@ -83,7 +83,6 @@
const DeviceMetrics* device_metrics();
private:
- Status GetVersion(std::string* browser_version, std::string* blink_version);
Status CloseFrontends(const std::string& for_client_id);
bool FetchUrlAndLog(const std::string& url,
URLRequestContextGetter* getter,
@@ -102,9 +101,6 @@
namespace internal {
Status ParseWebViewsInfo(const std::string& data,
WebViewsInfo* views_info);
-Status ParseVersionInfo(const std::string& data,
- std::string* browser_version,
- std::string* blink_version);
} // namespace internal
#endif // CHROME_TEST_CHROMEDRIVER_CHROME_DEVTOOLS_HTTP_CLIENT_H_
diff --git a/chrome/test/chromedriver/chrome/devtools_http_client_unittest.cc b/chrome/test/chromedriver/chrome/devtools_http_client_unittest.cc
index 651556b..1af04b7 100644
--- a/chrome/test/chromedriver/chrome/devtools_http_client_unittest.cc
+++ b/chrome/test/chromedriver/chrome/devtools_http_client_unittest.cc
@@ -142,39 +142,3 @@
"[{\"type\": \"page\", \"id\": \"1\", \"url\": 1,"
" \"webSocketDebuggerUrl\": \"ws://debugurl1\"}]");
}
-
-namespace {
-
-void AssertVersionFails(const std::string& data) {
- std::string version;
- std::string blink_version;
- Status status = internal::ParseVersionInfo(data, &version, &blink_version);
- ASSERT_TRUE(status.IsError());
- ASSERT_TRUE(version.empty());
- ASSERT_TRUE(blink_version.empty());
-}
-
-} // namespace
-
-TEST(ParseVersionInfo, InvalidJSON) {
- AssertVersionFails("[");
-}
-
-TEST(ParseVersionInfo, NonDict) {
- AssertVersionFails("[]");
-}
-
-TEST(ParseVersionInfo, NoBrowserKey) {
- AssertVersionFails("{}");
-}
-
-TEST(ParseVersionInfo, Valid) {
- std::string data = "{\"Browser\": \"1\", \"WebKit-Version\": \"2\"}";
- std::string version;
- std::string blink_version;
- Status status = internal::ParseVersionInfo(data, &version, &blink_version);
- ASSERT_TRUE(status.IsOk());
- ASSERT_EQ("1", version);
- ASSERT_EQ("2", blink_version);
-}
-
diff --git a/chrome/test/chromedriver/chrome/mobile_emulation_override_manager.cc b/chrome/test/chromedriver/chrome/mobile_emulation_override_manager.cc
index 6d28899..6b31d9e 100644
--- a/chrome/test/chromedriver/chrome/mobile_emulation_override_manager.cc
+++ b/chrome/test/chromedriver/chrome/mobile_emulation_override_manager.cc
@@ -2,12 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/test/chromedriver/chrome/mobile_emulation_override_manager.h"
+
#include "base/values.h"
+#include "chrome/test/chromedriver/chrome/browser_info.h"
#include "chrome/test/chromedriver/chrome/device_metrics.h"
#include "chrome/test/chromedriver/chrome/devtools_client.h"
-#include "chrome/test/chromedriver/chrome/mobile_emulation_override_manager.h"
#include "chrome/test/chromedriver/chrome/status.h"
-#include "chrome/test/chromedriver/chrome/version.h"
MobileEmulationOverrideManager::MobileEmulationOverrideManager(
DevToolsClient* client,
diff --git a/chrome/test/chromedriver/chrome/mobile_emulation_override_manager_unittest.cc b/chrome/test/chromedriver/chrome/mobile_emulation_override_manager_unittest.cc
index 8a876af..d7401c0 100644
--- a/chrome/test/chromedriver/chrome/mobile_emulation_override_manager_unittest.cc
+++ b/chrome/test/chromedriver/chrome/mobile_emulation_override_manager_unittest.cc
@@ -7,11 +7,11 @@
#include "base/compiler_specific.h"
#include "base/values.h"
+#include "chrome/test/chromedriver/chrome/browser_info.h"
#include "chrome/test/chromedriver/chrome/device_metrics.h"
#include "chrome/test/chromedriver/chrome/mobile_emulation_override_manager.h"
#include "chrome/test/chromedriver/chrome/status.h"
#include "chrome/test/chromedriver/chrome/stub_devtools_client.h"
-#include "chrome/test/chromedriver/chrome/version.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
diff --git a/chrome/test/chromedriver/chrome/navigation_tracker.cc b/chrome/test/chromedriver/chrome/navigation_tracker.cc
index 6d3f2f3..aa9b824 100644
--- a/chrome/test/chromedriver/chrome/navigation_tracker.cc
+++ b/chrome/test/chromedriver/chrome/navigation_tracker.cc
@@ -6,9 +6,9 @@
#include "base/strings/stringprintf.h"
#include "base/values.h"
+#include "chrome/test/chromedriver/chrome/browser_info.h"
#include "chrome/test/chromedriver/chrome/devtools_client.h"
#include "chrome/test/chromedriver/chrome/status.h"
-#include "chrome/test/chromedriver/chrome/version.h"
NavigationTracker::NavigationTracker(DevToolsClient* client,
const BrowserInfo* browser_info)
diff --git a/chrome/test/chromedriver/chrome/navigation_tracker_unittest.cc b/chrome/test/chromedriver/chrome/navigation_tracker_unittest.cc
index 6febf8d..c50fda1 100644
--- a/chrome/test/chromedriver/chrome/navigation_tracker_unittest.cc
+++ b/chrome/test/chromedriver/chrome/navigation_tracker_unittest.cc
@@ -7,10 +7,10 @@
#include "base/compiler_specific.h"
#include "base/json/json_reader.h"
#include "base/values.h"
+#include "chrome/test/chromedriver/chrome/browser_info.h"
#include "chrome/test/chromedriver/chrome/navigation_tracker.h"
#include "chrome/test/chromedriver/chrome/status.h"
#include "chrome/test/chromedriver/chrome/stub_devtools_client.h"
-#include "chrome/test/chromedriver/chrome/version.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
diff --git a/chrome/test/chromedriver/chrome/stub_chrome.cc b/chrome/test/chromedriver/chrome/stub_chrome.cc
index 394a183..a3c04c4 100644
--- a/chrome/test/chromedriver/chrome/stub_chrome.cc
+++ b/chrome/test/chromedriver/chrome/stub_chrome.cc
@@ -4,7 +4,6 @@
#include "chrome/test/chromedriver/chrome/stub_chrome.h"
#include "chrome/test/chromedriver/chrome/status.h"
-#include "chrome/test/chromedriver/chrome/version.h"
#include "chrome/test/chromedriver/chrome/web_view.h"
StubChrome::StubChrome() {}
diff --git a/chrome/test/chromedriver/chrome/stub_chrome.h b/chrome/test/chromedriver/chrome/stub_chrome.h
index ba09328..f818523 100644
--- a/chrome/test/chromedriver/chrome/stub_chrome.h
+++ b/chrome/test/chromedriver/chrome/stub_chrome.h
@@ -9,8 +9,8 @@
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
+#include "chrome/test/chromedriver/chrome/browser_info.h"
#include "chrome/test/chromedriver/chrome/chrome.h"
-#include "chrome/test/chromedriver/chrome/version.h"
class Status;
class WebView;
diff --git a/chrome/test/chromedriver/chrome/version.cc b/chrome/test/chromedriver/chrome/version.cc
index 6caa660..3a5cca3 100644
--- a/chrome/test/chromedriver/chrome/version.cc
+++ b/chrome/test/chromedriver/chrome/version.cc
@@ -15,31 +15,6 @@
const int kMinimumSupportedChromeBuildNo = kMinimumSupportedChromeVersion[2];
-// Content Shell and WebView have an empty product version and a fake user
-// agent. There's no way to detect the actual version, so unless specified we
-// assume it is tip of tree.
-static const int kToTBuildNo = 9999;
-
-// Similarly, if the Blink Revision isn't given then assume it is tip of tree.
-static const int kToTBlinkRevision = 999999;
-
-BrowserInfo::BrowserInfo()
- : browser_name(std::string()),
- browser_version(std::string()),
- build_no(kToTBuildNo),
- blink_revision(kToTBlinkRevision) {
-}
-
-BrowserInfo::BrowserInfo(std::string browser_name,
- std::string browser_version,
- int build_no,
- int blink_revision)
- : browser_name(browser_name),
- browser_version(browser_version),
- build_no(build_no),
- blink_revision(blink_revision) {
-}
-
std::string GetMinimumSupportedChromeVersion() {
return base::StringPrintf(
"%d.%d.%d.%d",
diff --git a/chrome/test/chromedriver/chrome/version.h b/chrome/test/chromedriver/chrome/version.h
index 39ca4e9..1618b97 100644
--- a/chrome/test/chromedriver/chrome/version.h
+++ b/chrome/test/chromedriver/chrome/version.h
@@ -7,19 +7,6 @@
#include <string>
-struct BrowserInfo {
- BrowserInfo();
- BrowserInfo(std::string browser_name_,
- std::string browser_version_,
- int build_no_,
- int blink_revision_);
-
- std::string browser_name;
- std::string browser_version;
- int build_no;
- int blink_revision;
-};
-
extern const int kMinimumSupportedChromeBuildNo;
std::string GetMinimumSupportedChromeVersion();
diff --git a/chrome/test/chromedriver/chrome/web_view_impl.cc b/chrome/test/chromedriver/chrome/web_view_impl.cc
index eb78c9f..55c035f 100644
--- a/chrome/test/chromedriver/chrome/web_view_impl.cc
+++ b/chrome/test/chromedriver/chrome/web_view_impl.cc
@@ -13,6 +13,7 @@
#include "base/threading/platform_thread.h"
#include "base/time/time.h"
#include "base/values.h"
+#include "chrome/test/chromedriver/chrome/browser_info.h"
#include "chrome/test/chromedriver/chrome/debugger_tracker.h"
#include "chrome/test/chromedriver/chrome/devtools_client_impl.h"
#include "chrome/test/chromedriver/chrome/dom_tracker.h"
@@ -25,7 +26,6 @@
#include "chrome/test/chromedriver/chrome/navigation_tracker.h"
#include "chrome/test/chromedriver/chrome/status.h"
#include "chrome/test/chromedriver/chrome/ui_events.h"
-#include "chrome/test/chromedriver/chrome/version.h"
namespace {
diff --git a/chrome/test/chromedriver/commands.cc b/chrome/test/chromedriver/commands.cc
index dc1ef83..5af165d 100644
--- a/chrome/test/chromedriver/commands.cc
+++ b/chrome/test/chromedriver/commands.cc
@@ -19,9 +19,9 @@
#include "base/sys_info.h"
#include "base/values.h"
#include "chrome/test/chromedriver/capabilities.h"
+#include "chrome/test/chromedriver/chrome/browser_info.h"
#include "chrome/test/chromedriver/chrome/chrome.h"
#include "chrome/test/chromedriver/chrome/status.h"
-#include "chrome/test/chromedriver/chrome/version.h"
#include "chrome/test/chromedriver/logging.h"
#include "chrome/test/chromedriver/session.h"
#include "chrome/test/chromedriver/session_thread_map.h"
diff --git a/chrome/test/chromedriver/element_commands.cc b/chrome/test/chromedriver/element_commands.cc
index c140704..88bacc5 100644
--- a/chrome/test/chromedriver/element_commands.cc
+++ b/chrome/test/chromedriver/element_commands.cc
@@ -16,11 +16,11 @@
#include "base/time/time.h"
#include "base/values.h"
#include "chrome/test/chromedriver/basic_types.h"
+#include "chrome/test/chromedriver/chrome/browser_info.h"
#include "chrome/test/chromedriver/chrome/chrome.h"
#include "chrome/test/chromedriver/chrome/js.h"
#include "chrome/test/chromedriver/chrome/status.h"
#include "chrome/test/chromedriver/chrome/ui_events.h"
-#include "chrome/test/chromedriver/chrome/version.h"
#include "chrome/test/chromedriver/chrome/web_view.h"
#include "chrome/test/chromedriver/element_util.h"
#include "chrome/test/chromedriver/session.h"
diff --git a/chrome/test/chromedriver/element_util.cc b/chrome/test/chromedriver/element_util.cc
index 274449f..04cce67 100644
--- a/chrome/test/chromedriver/element_util.cc
+++ b/chrome/test/chromedriver/element_util.cc
@@ -11,10 +11,10 @@
#include "base/time/time.h"
#include "base/values.h"
#include "chrome/test/chromedriver/basic_types.h"
+#include "chrome/test/chromedriver/chrome/browser_info.h"
#include "chrome/test/chromedriver/chrome/chrome.h"
#include "chrome/test/chromedriver/chrome/js.h"
#include "chrome/test/chromedriver/chrome/status.h"
-#include "chrome/test/chromedriver/chrome/version.h"
#include "chrome/test/chromedriver/chrome/web_view.h"
#include "chrome/test/chromedriver/session.h"
#include "third_party/webdriver/atoms.h"
diff --git a/chrome/test/chromedriver/performance_logger.cc b/chrome/test/chromedriver/performance_logger.cc
index 822092d..1da5b1c 100644
--- a/chrome/test/chromedriver/performance_logger.cc
+++ b/chrome/test/chromedriver/performance_logger.cc
@@ -11,12 +11,12 @@
#include "base/json/json_writer.h"
#include "base/strings/string_util.h"
#include "base/values.h"
+#include "chrome/test/chromedriver/chrome/browser_info.h"
#include "chrome/test/chromedriver/chrome/chrome.h"
#include "chrome/test/chromedriver/chrome/devtools_client.h"
#include "chrome/test/chromedriver/chrome/devtools_client_impl.h"
#include "chrome/test/chromedriver/chrome/log.h"
#include "chrome/test/chromedriver/chrome/status.h"
-#include "chrome/test/chromedriver/chrome/version.h"
#include "chrome/test/chromedriver/session.h"
namespace {
diff --git a/chrome/test/chromedriver/session.cc b/chrome/test/chromedriver/session.cc
index d46918e..df7d674 100644
--- a/chrome/test/chromedriver/session.cc
+++ b/chrome/test/chromedriver/session.cc
@@ -11,7 +11,6 @@
#include "base/values.h"
#include "chrome/test/chromedriver/chrome/chrome.h"
#include "chrome/test/chromedriver/chrome/status.h"
-#include "chrome/test/chromedriver/chrome/version.h"
#include "chrome/test/chromedriver/chrome/web_view.h"
#include "chrome/test/chromedriver/logging.h"
diff --git a/chrome/test/chromedriver/session_commands.cc b/chrome/test/chromedriver/session_commands.cc
index 3eba1b2..99dbbda 100644
--- a/chrome/test/chromedriver/session_commands.cc
+++ b/chrome/test/chromedriver/session_commands.cc
@@ -18,6 +18,7 @@
#include "chrome/test/chromedriver/basic_types.h"
#include "chrome/test/chromedriver/capabilities.h"
#include "chrome/test/chromedriver/chrome/automation_extension.h"
+#include "chrome/test/chromedriver/chrome/browser_info.h"
#include "chrome/test/chromedriver/chrome/chrome.h"
#include "chrome/test/chromedriver/chrome/chrome_android_impl.h"
#include "chrome/test/chromedriver/chrome/chrome_desktop_impl.h"
@@ -25,7 +26,6 @@
#include "chrome/test/chromedriver/chrome/devtools_event_listener.h"
#include "chrome/test/chromedriver/chrome/geoposition.h"
#include "chrome/test/chromedriver/chrome/status.h"
-#include "chrome/test/chromedriver/chrome/version.h"
#include "chrome/test/chromedriver/chrome/web_view.h"
#include "chrome/test/chromedriver/chrome_launcher.h"
#include "chrome/test/chromedriver/command_listener.h"
diff --git a/chrome/test/chromedriver/util.cc b/chrome/test/chromedriver/util.cc
index a4a9c53..d0d2416 100644
--- a/chrome/test/chromedriver/util.cc
+++ b/chrome/test/chromedriver/util.cc
@@ -16,10 +16,10 @@
#include "base/strings/stringprintf.h"
#include "base/third_party/icu/icu_utf.h"
#include "base/values.h"
+#include "chrome/test/chromedriver/chrome/browser_info.h"
#include "chrome/test/chromedriver/chrome/chrome.h"
#include "chrome/test/chromedriver/chrome/status.h"
#include "chrome/test/chromedriver/chrome/ui_events.h"
-#include "chrome/test/chromedriver/chrome/version.h"
#include "chrome/test/chromedriver/chrome/web_view.h"
#include "chrome/test/chromedriver/command_listener.h"
#include "chrome/test/chromedriver/key_converter.h"
diff --git a/components/autofill/core/common/password_generation_util.cc b/components/autofill/core/common/password_generation_util.cc
index 95f4f60..cc76f91 100644
--- a/components/autofill/core/common/password_generation_util.cc
+++ b/components/autofill/core/common/password_generation_util.cc
@@ -55,7 +55,7 @@
if (command_line->HasSwitch(switches::kEnablePasswordGeneration))
return true;
- return group_name != "Disabled";
+ return group_name == "Enabled";
}
} // namespace password_generation
diff --git a/components/autofill_content_browser.target.darwin-arm.mk b/components/autofill_content_browser.target.darwin-arm.mk
index 7f3427c..2c5be34 100644
--- a/components/autofill_content_browser.target.darwin-arm.mk
+++ b/components/autofill_content_browser.target.darwin-arm.mk
@@ -127,6 +127,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
@@ -293,6 +294,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
diff --git a/components/autofill_content_browser.target.darwin-arm64.mk b/components/autofill_content_browser.target.darwin-arm64.mk
index bd3190d..65b7f70 100644
--- a/components/autofill_content_browser.target.darwin-arm64.mk
+++ b/components/autofill_content_browser.target.darwin-arm64.mk
@@ -116,6 +116,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
@@ -270,6 +271,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
diff --git a/components/autofill_content_browser.target.darwin-mips.mk b/components/autofill_content_browser.target.darwin-mips.mk
index 18d1614..74d769b 100644
--- a/components/autofill_content_browser.target.darwin-mips.mk
+++ b/components/autofill_content_browser.target.darwin-mips.mk
@@ -119,6 +119,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
@@ -277,6 +278,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
diff --git a/components/autofill_content_browser.target.darwin-x86.mk b/components/autofill_content_browser.target.darwin-x86.mk
index 3799828..c7adc2d 100644
--- a/components/autofill_content_browser.target.darwin-x86.mk
+++ b/components/autofill_content_browser.target.darwin-x86.mk
@@ -122,6 +122,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
@@ -281,6 +282,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
diff --git a/components/autofill_content_browser.target.darwin-x86_64.mk b/components/autofill_content_browser.target.darwin-x86_64.mk
index a6c5859..b9a5f78 100644
--- a/components/autofill_content_browser.target.darwin-x86_64.mk
+++ b/components/autofill_content_browser.target.darwin-x86_64.mk
@@ -121,6 +121,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
@@ -280,6 +281,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
diff --git a/components/autofill_content_browser.target.linux-arm.mk b/components/autofill_content_browser.target.linux-arm.mk
index 7f3427c..2c5be34 100644
--- a/components/autofill_content_browser.target.linux-arm.mk
+++ b/components/autofill_content_browser.target.linux-arm.mk
@@ -127,6 +127,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
@@ -293,6 +294,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
diff --git a/components/autofill_content_browser.target.linux-arm64.mk b/components/autofill_content_browser.target.linux-arm64.mk
index bd3190d..65b7f70 100644
--- a/components/autofill_content_browser.target.linux-arm64.mk
+++ b/components/autofill_content_browser.target.linux-arm64.mk
@@ -116,6 +116,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
@@ -270,6 +271,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
diff --git a/components/autofill_content_browser.target.linux-mips.mk b/components/autofill_content_browser.target.linux-mips.mk
index 18d1614..74d769b 100644
--- a/components/autofill_content_browser.target.linux-mips.mk
+++ b/components/autofill_content_browser.target.linux-mips.mk
@@ -119,6 +119,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
@@ -277,6 +278,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
diff --git a/components/autofill_content_browser.target.linux-x86.mk b/components/autofill_content_browser.target.linux-x86.mk
index 3799828..c7adc2d 100644
--- a/components/autofill_content_browser.target.linux-x86.mk
+++ b/components/autofill_content_browser.target.linux-x86.mk
@@ -122,6 +122,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
@@ -281,6 +282,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
diff --git a/components/autofill_content_browser.target.linux-x86_64.mk b/components/autofill_content_browser.target.linux-x86_64.mk
index a6c5859..b9a5f78 100644
--- a/components/autofill_content_browser.target.linux-x86_64.mk
+++ b/components/autofill_content_browser.target.linux-x86_64.mk
@@ -121,6 +121,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
@@ -280,6 +281,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
diff --git a/components/autofill_content_common.target.darwin-arm.mk b/components/autofill_content_common.target.darwin-arm.mk
index 11c21c9..01240df 100644
--- a/components/autofill_content_common.target.darwin-arm.mk
+++ b/components/autofill_content_common.target.darwin-arm.mk
@@ -106,6 +106,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -243,6 +244,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/autofill_content_common.target.darwin-arm64.mk b/components/autofill_content_common.target.darwin-arm64.mk
index 6ff377e..f42fcf6 100644
--- a/components/autofill_content_common.target.darwin-arm64.mk
+++ b/components/autofill_content_common.target.darwin-arm64.mk
@@ -95,6 +95,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -220,6 +221,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/autofill_content_common.target.darwin-mips.mk b/components/autofill_content_common.target.darwin-mips.mk
index 5b3b256..018fbf4 100644
--- a/components/autofill_content_common.target.darwin-mips.mk
+++ b/components/autofill_content_common.target.darwin-mips.mk
@@ -98,6 +98,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -227,6 +228,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/autofill_content_common.target.darwin-x86.mk b/components/autofill_content_common.target.darwin-x86.mk
index c2ba460..81983be 100644
--- a/components/autofill_content_common.target.darwin-x86.mk
+++ b/components/autofill_content_common.target.darwin-x86.mk
@@ -101,6 +101,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -232,6 +233,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/autofill_content_common.target.darwin-x86_64.mk b/components/autofill_content_common.target.darwin-x86_64.mk
index 35fa0c1..45df9bc 100644
--- a/components/autofill_content_common.target.darwin-x86_64.mk
+++ b/components/autofill_content_common.target.darwin-x86_64.mk
@@ -100,6 +100,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -230,6 +231,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/autofill_content_common.target.linux-arm.mk b/components/autofill_content_common.target.linux-arm.mk
index 11c21c9..01240df 100644
--- a/components/autofill_content_common.target.linux-arm.mk
+++ b/components/autofill_content_common.target.linux-arm.mk
@@ -106,6 +106,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -243,6 +244,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/autofill_content_common.target.linux-arm64.mk b/components/autofill_content_common.target.linux-arm64.mk
index 6ff377e..f42fcf6 100644
--- a/components/autofill_content_common.target.linux-arm64.mk
+++ b/components/autofill_content_common.target.linux-arm64.mk
@@ -95,6 +95,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -220,6 +221,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/autofill_content_common.target.linux-mips.mk b/components/autofill_content_common.target.linux-mips.mk
index 5b3b256..018fbf4 100644
--- a/components/autofill_content_common.target.linux-mips.mk
+++ b/components/autofill_content_common.target.linux-mips.mk
@@ -98,6 +98,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -227,6 +228,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/autofill_content_common.target.linux-x86.mk b/components/autofill_content_common.target.linux-x86.mk
index c2ba460..81983be 100644
--- a/components/autofill_content_common.target.linux-x86.mk
+++ b/components/autofill_content_common.target.linux-x86.mk
@@ -101,6 +101,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -232,6 +233,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/autofill_content_common.target.linux-x86_64.mk b/components/autofill_content_common.target.linux-x86_64.mk
index 35fa0c1..45df9bc 100644
--- a/components/autofill_content_common.target.linux-x86_64.mk
+++ b/components/autofill_content_common.target.linux-x86_64.mk
@@ -100,6 +100,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -230,6 +231,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/autofill_content_renderer.target.darwin-arm.mk b/components/autofill_content_renderer.target.darwin-arm.mk
index cfef39e..7902750 100644
--- a/components/autofill_content_renderer.target.darwin-arm.mk
+++ b/components/autofill_content_renderer.target.darwin-arm.mk
@@ -116,6 +116,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -269,6 +270,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/components/autofill_content_renderer.target.darwin-arm64.mk b/components/autofill_content_renderer.target.darwin-arm64.mk
index 255baee..2a7d92c 100644
--- a/components/autofill_content_renderer.target.darwin-arm64.mk
+++ b/components/autofill_content_renderer.target.darwin-arm64.mk
@@ -105,6 +105,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -246,6 +247,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/components/autofill_content_renderer.target.darwin-mips.mk b/components/autofill_content_renderer.target.darwin-mips.mk
index 380eb72..c63ea78 100644
--- a/components/autofill_content_renderer.target.darwin-mips.mk
+++ b/components/autofill_content_renderer.target.darwin-mips.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -253,6 +254,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/components/autofill_content_renderer.target.darwin-x86.mk b/components/autofill_content_renderer.target.darwin-x86.mk
index 8bea385..ade37ec 100644
--- a/components/autofill_content_renderer.target.darwin-x86.mk
+++ b/components/autofill_content_renderer.target.darwin-x86.mk
@@ -111,6 +111,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -258,6 +259,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/components/autofill_content_renderer.target.darwin-x86_64.mk b/components/autofill_content_renderer.target.darwin-x86_64.mk
index 9847bf0..dc2b4e2 100644
--- a/components/autofill_content_renderer.target.darwin-x86_64.mk
+++ b/components/autofill_content_renderer.target.darwin-x86_64.mk
@@ -110,6 +110,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -256,6 +257,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/components/autofill_content_renderer.target.linux-arm.mk b/components/autofill_content_renderer.target.linux-arm.mk
index cfef39e..7902750 100644
--- a/components/autofill_content_renderer.target.linux-arm.mk
+++ b/components/autofill_content_renderer.target.linux-arm.mk
@@ -116,6 +116,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -269,6 +270,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/components/autofill_content_renderer.target.linux-arm64.mk b/components/autofill_content_renderer.target.linux-arm64.mk
index 255baee..2a7d92c 100644
--- a/components/autofill_content_renderer.target.linux-arm64.mk
+++ b/components/autofill_content_renderer.target.linux-arm64.mk
@@ -105,6 +105,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -246,6 +247,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/components/autofill_content_renderer.target.linux-mips.mk b/components/autofill_content_renderer.target.linux-mips.mk
index 380eb72..c63ea78 100644
--- a/components/autofill_content_renderer.target.linux-mips.mk
+++ b/components/autofill_content_renderer.target.linux-mips.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -253,6 +254,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/components/autofill_content_renderer.target.linux-x86.mk b/components/autofill_content_renderer.target.linux-x86.mk
index 8bea385..ade37ec 100644
--- a/components/autofill_content_renderer.target.linux-x86.mk
+++ b/components/autofill_content_renderer.target.linux-x86.mk
@@ -111,6 +111,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -258,6 +259,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/components/autofill_content_renderer.target.linux-x86_64.mk b/components/autofill_content_renderer.target.linux-x86_64.mk
index 9847bf0..dc2b4e2 100644
--- a/components/autofill_content_renderer.target.linux-x86_64.mk
+++ b/components/autofill_content_renderer.target.linux-x86_64.mk
@@ -110,6 +110,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -256,6 +257,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/components/autofill_core_browser.target.darwin-arm.mk b/components/autofill_core_browser.target.darwin-arm.mk
index d1935c9..4997eba 100644
--- a/components/autofill_core_browser.target.darwin-arm.mk
+++ b/components/autofill_core_browser.target.darwin-arm.mk
@@ -152,6 +152,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
@@ -321,6 +322,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
diff --git a/components/autofill_core_browser.target.darwin-arm64.mk b/components/autofill_core_browser.target.darwin-arm64.mk
index 66c52d1..ff06d42 100644
--- a/components/autofill_core_browser.target.darwin-arm64.mk
+++ b/components/autofill_core_browser.target.darwin-arm64.mk
@@ -141,6 +141,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
@@ -298,6 +299,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
diff --git a/components/autofill_core_browser.target.darwin-mips.mk b/components/autofill_core_browser.target.darwin-mips.mk
index 01d2765..a8cded9 100644
--- a/components/autofill_core_browser.target.darwin-mips.mk
+++ b/components/autofill_core_browser.target.darwin-mips.mk
@@ -144,6 +144,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
@@ -305,6 +306,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
diff --git a/components/autofill_core_browser.target.darwin-x86.mk b/components/autofill_core_browser.target.darwin-x86.mk
index 988c2cb..53529eb 100644
--- a/components/autofill_core_browser.target.darwin-x86.mk
+++ b/components/autofill_core_browser.target.darwin-x86.mk
@@ -147,6 +147,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
@@ -309,6 +310,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
diff --git a/components/autofill_core_browser.target.darwin-x86_64.mk b/components/autofill_core_browser.target.darwin-x86_64.mk
index aec3515..cda6b71 100644
--- a/components/autofill_core_browser.target.darwin-x86_64.mk
+++ b/components/autofill_core_browser.target.darwin-x86_64.mk
@@ -146,6 +146,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
@@ -308,6 +309,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
diff --git a/components/autofill_core_browser.target.linux-arm.mk b/components/autofill_core_browser.target.linux-arm.mk
index d1935c9..4997eba 100644
--- a/components/autofill_core_browser.target.linux-arm.mk
+++ b/components/autofill_core_browser.target.linux-arm.mk
@@ -152,6 +152,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
@@ -321,6 +322,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
diff --git a/components/autofill_core_browser.target.linux-arm64.mk b/components/autofill_core_browser.target.linux-arm64.mk
index 66c52d1..ff06d42 100644
--- a/components/autofill_core_browser.target.linux-arm64.mk
+++ b/components/autofill_core_browser.target.linux-arm64.mk
@@ -141,6 +141,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
@@ -298,6 +299,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
diff --git a/components/autofill_core_browser.target.linux-mips.mk b/components/autofill_core_browser.target.linux-mips.mk
index 01d2765..a8cded9 100644
--- a/components/autofill_core_browser.target.linux-mips.mk
+++ b/components/autofill_core_browser.target.linux-mips.mk
@@ -144,6 +144,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
@@ -305,6 +306,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
diff --git a/components/autofill_core_browser.target.linux-x86.mk b/components/autofill_core_browser.target.linux-x86.mk
index 988c2cb..53529eb 100644
--- a/components/autofill_core_browser.target.linux-x86.mk
+++ b/components/autofill_core_browser.target.linux-x86.mk
@@ -147,6 +147,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
@@ -309,6 +310,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
diff --git a/components/autofill_core_browser.target.linux-x86_64.mk b/components/autofill_core_browser.target.linux-x86_64.mk
index aec3515..cda6b71 100644
--- a/components/autofill_core_browser.target.linux-x86_64.mk
+++ b/components/autofill_core_browser.target.linux-x86_64.mk
@@ -146,6 +146,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
@@ -308,6 +309,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
diff --git a/components/autofill_core_common.target.darwin-arm.mk b/components/autofill_core_common.target.darwin-arm.mk
index 4400094..8532f51 100644
--- a/components/autofill_core_common.target.darwin-arm.mk
+++ b/components/autofill_core_common.target.darwin-arm.mk
@@ -119,6 +119,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -252,6 +253,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/autofill_core_common.target.darwin-arm64.mk b/components/autofill_core_common.target.darwin-arm64.mk
index 2cb24df..f105b81 100644
--- a/components/autofill_core_common.target.darwin-arm64.mk
+++ b/components/autofill_core_common.target.darwin-arm64.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -229,6 +230,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/autofill_core_common.target.darwin-mips.mk b/components/autofill_core_common.target.darwin-mips.mk
index 89e6561..acf77ce 100644
--- a/components/autofill_core_common.target.darwin-mips.mk
+++ b/components/autofill_core_common.target.darwin-mips.mk
@@ -111,6 +111,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -236,6 +237,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/autofill_core_common.target.darwin-x86.mk b/components/autofill_core_common.target.darwin-x86.mk
index 603d7a4..ac0b5d2 100644
--- a/components/autofill_core_common.target.darwin-x86.mk
+++ b/components/autofill_core_common.target.darwin-x86.mk
@@ -113,6 +113,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -239,6 +240,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/autofill_core_common.target.darwin-x86_64.mk b/components/autofill_core_common.target.darwin-x86_64.mk
index ee26bbd..be698a2 100644
--- a/components/autofill_core_common.target.darwin-x86_64.mk
+++ b/components/autofill_core_common.target.darwin-x86_64.mk
@@ -113,6 +113,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -239,6 +240,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/autofill_core_common.target.linux-arm.mk b/components/autofill_core_common.target.linux-arm.mk
index 4400094..8532f51 100644
--- a/components/autofill_core_common.target.linux-arm.mk
+++ b/components/autofill_core_common.target.linux-arm.mk
@@ -119,6 +119,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -252,6 +253,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/autofill_core_common.target.linux-arm64.mk b/components/autofill_core_common.target.linux-arm64.mk
index 2cb24df..f105b81 100644
--- a/components/autofill_core_common.target.linux-arm64.mk
+++ b/components/autofill_core_common.target.linux-arm64.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -229,6 +230,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/autofill_core_common.target.linux-mips.mk b/components/autofill_core_common.target.linux-mips.mk
index 89e6561..acf77ce 100644
--- a/components/autofill_core_common.target.linux-mips.mk
+++ b/components/autofill_core_common.target.linux-mips.mk
@@ -111,6 +111,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -236,6 +237,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/autofill_core_common.target.linux-x86.mk b/components/autofill_core_common.target.linux-x86.mk
index 603d7a4..ac0b5d2 100644
--- a/components/autofill_core_common.target.linux-x86.mk
+++ b/components/autofill_core_common.target.linux-x86.mk
@@ -113,6 +113,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -239,6 +240,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/autofill_core_common.target.linux-x86_64.mk b/components/autofill_core_common.target.linux-x86_64.mk
index ee26bbd..be698a2 100644
--- a/components/autofill_core_common.target.linux-x86_64.mk
+++ b/components/autofill_core_common.target.linux-x86_64.mk
@@ -113,6 +113,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -239,6 +240,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/cdm_browser.target.darwin-arm.mk b/components/cdm_browser.target.darwin-arm.mk
index 60cce18..ebbdebd 100644
--- a/components/cdm_browser.target.darwin-arm.mk
+++ b/components/cdm_browser.target.darwin-arm.mk
@@ -107,6 +107,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -243,6 +244,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/components/cdm_browser.target.darwin-arm64.mk b/components/cdm_browser.target.darwin-arm64.mk
index a218bbd..2a89744 100644
--- a/components/cdm_browser.target.darwin-arm64.mk
+++ b/components/cdm_browser.target.darwin-arm64.mk
@@ -96,6 +96,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -220,6 +221,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/components/cdm_browser.target.darwin-mips.mk b/components/cdm_browser.target.darwin-mips.mk
index 06d7dd9..8db7a50 100644
--- a/components/cdm_browser.target.darwin-mips.mk
+++ b/components/cdm_browser.target.darwin-mips.mk
@@ -99,6 +99,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -227,6 +228,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/components/cdm_browser.target.darwin-x86.mk b/components/cdm_browser.target.darwin-x86.mk
index 2e6a41f..b6c35ad 100644
--- a/components/cdm_browser.target.darwin-x86.mk
+++ b/components/cdm_browser.target.darwin-x86.mk
@@ -102,6 +102,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -232,6 +233,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/components/cdm_browser.target.darwin-x86_64.mk b/components/cdm_browser.target.darwin-x86_64.mk
index a21fd2c..8eae308 100644
--- a/components/cdm_browser.target.darwin-x86_64.mk
+++ b/components/cdm_browser.target.darwin-x86_64.mk
@@ -101,6 +101,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -230,6 +231,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/components/cdm_browser.target.linux-arm.mk b/components/cdm_browser.target.linux-arm.mk
index 60cce18..ebbdebd 100644
--- a/components/cdm_browser.target.linux-arm.mk
+++ b/components/cdm_browser.target.linux-arm.mk
@@ -107,6 +107,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -243,6 +244,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/components/cdm_browser.target.linux-arm64.mk b/components/cdm_browser.target.linux-arm64.mk
index a218bbd..2a89744 100644
--- a/components/cdm_browser.target.linux-arm64.mk
+++ b/components/cdm_browser.target.linux-arm64.mk
@@ -96,6 +96,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -220,6 +221,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/components/cdm_browser.target.linux-mips.mk b/components/cdm_browser.target.linux-mips.mk
index 06d7dd9..8db7a50 100644
--- a/components/cdm_browser.target.linux-mips.mk
+++ b/components/cdm_browser.target.linux-mips.mk
@@ -99,6 +99,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -227,6 +228,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/components/cdm_browser.target.linux-x86.mk b/components/cdm_browser.target.linux-x86.mk
index 2e6a41f..b6c35ad 100644
--- a/components/cdm_browser.target.linux-x86.mk
+++ b/components/cdm_browser.target.linux-x86.mk
@@ -102,6 +102,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -232,6 +233,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/components/cdm_browser.target.linux-x86_64.mk b/components/cdm_browser.target.linux-x86_64.mk
index a21fd2c..8eae308 100644
--- a/components/cdm_browser.target.linux-x86_64.mk
+++ b/components/cdm_browser.target.linux-x86_64.mk
@@ -101,6 +101,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -230,6 +231,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/components/copresence/mediums/audio/audio_recorder_unittest.cc b/components/copresence/mediums/audio/audio_recorder_unittest.cc
index 4f0e6c8..e45c668 100644
--- a/components/copresence/mediums/audio/audio_recorder_unittest.cc
+++ b/components/copresence/mediums/audio/audio_recorder_unittest.cc
@@ -47,6 +47,7 @@
virtual double GetVolume() OVERRIDE { return 1.0; }
virtual void SetAutomaticGainControl(bool enabled) OVERRIDE {}
virtual bool GetAutomaticGainControl() OVERRIDE { return true; }
+ virtual bool IsMuted() OVERRIDE { return false; }
private:
void SimulateRecording() {
diff --git a/components/data_reduction_proxy_version_header.target.darwin-arm.mk b/components/data_reduction_proxy_version_header.target.darwin-arm.mk
index 49fa537..ad978d6 100644
--- a/components/data_reduction_proxy_version_header.target.darwin-arm.mk
+++ b/components/data_reduction_proxy_version_header.target.darwin-arm.mk
@@ -21,7 +21,7 @@
$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h: $(LOCAL_PATH)/chrome/VERSION $(LOCAL_PATH)/components/data_reduction_proxy/common/version.h.in $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: Generating version header file: "$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h" ($@)"
- $(hide)cd $(gyp_local_path)/components; mkdir -p $(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common; python ../build/util/version.py -e "VERSION_FULL=\"39.0.2171.38\"" data_reduction_proxy/common/version.h.in "$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h"
+ $(hide)cd $(gyp_local_path)/components; mkdir -p $(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common; python ../build/util/version.py -e "VERSION_FULL=\"39.0.2171.44\"" data_reduction_proxy/common/version.h.in "$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h"
diff --git a/components/data_reduction_proxy_version_header.target.darwin-arm64.mk b/components/data_reduction_proxy_version_header.target.darwin-arm64.mk
index 49fa537..ad978d6 100644
--- a/components/data_reduction_proxy_version_header.target.darwin-arm64.mk
+++ b/components/data_reduction_proxy_version_header.target.darwin-arm64.mk
@@ -21,7 +21,7 @@
$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h: $(LOCAL_PATH)/chrome/VERSION $(LOCAL_PATH)/components/data_reduction_proxy/common/version.h.in $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: Generating version header file: "$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h" ($@)"
- $(hide)cd $(gyp_local_path)/components; mkdir -p $(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common; python ../build/util/version.py -e "VERSION_FULL=\"39.0.2171.38\"" data_reduction_proxy/common/version.h.in "$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h"
+ $(hide)cd $(gyp_local_path)/components; mkdir -p $(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common; python ../build/util/version.py -e "VERSION_FULL=\"39.0.2171.44\"" data_reduction_proxy/common/version.h.in "$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h"
diff --git a/components/data_reduction_proxy_version_header.target.darwin-mips.mk b/components/data_reduction_proxy_version_header.target.darwin-mips.mk
index 49fa537..ad978d6 100644
--- a/components/data_reduction_proxy_version_header.target.darwin-mips.mk
+++ b/components/data_reduction_proxy_version_header.target.darwin-mips.mk
@@ -21,7 +21,7 @@
$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h: $(LOCAL_PATH)/chrome/VERSION $(LOCAL_PATH)/components/data_reduction_proxy/common/version.h.in $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: Generating version header file: "$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h" ($@)"
- $(hide)cd $(gyp_local_path)/components; mkdir -p $(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common; python ../build/util/version.py -e "VERSION_FULL=\"39.0.2171.38\"" data_reduction_proxy/common/version.h.in "$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h"
+ $(hide)cd $(gyp_local_path)/components; mkdir -p $(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common; python ../build/util/version.py -e "VERSION_FULL=\"39.0.2171.44\"" data_reduction_proxy/common/version.h.in "$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h"
diff --git a/components/data_reduction_proxy_version_header.target.darwin-x86.mk b/components/data_reduction_proxy_version_header.target.darwin-x86.mk
index 49fa537..ad978d6 100644
--- a/components/data_reduction_proxy_version_header.target.darwin-x86.mk
+++ b/components/data_reduction_proxy_version_header.target.darwin-x86.mk
@@ -21,7 +21,7 @@
$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h: $(LOCAL_PATH)/chrome/VERSION $(LOCAL_PATH)/components/data_reduction_proxy/common/version.h.in $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: Generating version header file: "$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h" ($@)"
- $(hide)cd $(gyp_local_path)/components; mkdir -p $(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common; python ../build/util/version.py -e "VERSION_FULL=\"39.0.2171.38\"" data_reduction_proxy/common/version.h.in "$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h"
+ $(hide)cd $(gyp_local_path)/components; mkdir -p $(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common; python ../build/util/version.py -e "VERSION_FULL=\"39.0.2171.44\"" data_reduction_proxy/common/version.h.in "$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h"
diff --git a/components/data_reduction_proxy_version_header.target.darwin-x86_64.mk b/components/data_reduction_proxy_version_header.target.darwin-x86_64.mk
index 49fa537..ad978d6 100644
--- a/components/data_reduction_proxy_version_header.target.darwin-x86_64.mk
+++ b/components/data_reduction_proxy_version_header.target.darwin-x86_64.mk
@@ -21,7 +21,7 @@
$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h: $(LOCAL_PATH)/chrome/VERSION $(LOCAL_PATH)/components/data_reduction_proxy/common/version.h.in $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: Generating version header file: "$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h" ($@)"
- $(hide)cd $(gyp_local_path)/components; mkdir -p $(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common; python ../build/util/version.py -e "VERSION_FULL=\"39.0.2171.38\"" data_reduction_proxy/common/version.h.in "$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h"
+ $(hide)cd $(gyp_local_path)/components; mkdir -p $(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common; python ../build/util/version.py -e "VERSION_FULL=\"39.0.2171.44\"" data_reduction_proxy/common/version.h.in "$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h"
diff --git a/components/data_reduction_proxy_version_header.target.linux-arm.mk b/components/data_reduction_proxy_version_header.target.linux-arm.mk
index 49fa537..ad978d6 100644
--- a/components/data_reduction_proxy_version_header.target.linux-arm.mk
+++ b/components/data_reduction_proxy_version_header.target.linux-arm.mk
@@ -21,7 +21,7 @@
$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h: $(LOCAL_PATH)/chrome/VERSION $(LOCAL_PATH)/components/data_reduction_proxy/common/version.h.in $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: Generating version header file: "$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h" ($@)"
- $(hide)cd $(gyp_local_path)/components; mkdir -p $(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common; python ../build/util/version.py -e "VERSION_FULL=\"39.0.2171.38\"" data_reduction_proxy/common/version.h.in "$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h"
+ $(hide)cd $(gyp_local_path)/components; mkdir -p $(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common; python ../build/util/version.py -e "VERSION_FULL=\"39.0.2171.44\"" data_reduction_proxy/common/version.h.in "$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h"
diff --git a/components/data_reduction_proxy_version_header.target.linux-arm64.mk b/components/data_reduction_proxy_version_header.target.linux-arm64.mk
index 49fa537..ad978d6 100644
--- a/components/data_reduction_proxy_version_header.target.linux-arm64.mk
+++ b/components/data_reduction_proxy_version_header.target.linux-arm64.mk
@@ -21,7 +21,7 @@
$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h: $(LOCAL_PATH)/chrome/VERSION $(LOCAL_PATH)/components/data_reduction_proxy/common/version.h.in $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: Generating version header file: "$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h" ($@)"
- $(hide)cd $(gyp_local_path)/components; mkdir -p $(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common; python ../build/util/version.py -e "VERSION_FULL=\"39.0.2171.38\"" data_reduction_proxy/common/version.h.in "$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h"
+ $(hide)cd $(gyp_local_path)/components; mkdir -p $(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common; python ../build/util/version.py -e "VERSION_FULL=\"39.0.2171.44\"" data_reduction_proxy/common/version.h.in "$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h"
diff --git a/components/data_reduction_proxy_version_header.target.linux-mips.mk b/components/data_reduction_proxy_version_header.target.linux-mips.mk
index 49fa537..ad978d6 100644
--- a/components/data_reduction_proxy_version_header.target.linux-mips.mk
+++ b/components/data_reduction_proxy_version_header.target.linux-mips.mk
@@ -21,7 +21,7 @@
$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h: $(LOCAL_PATH)/chrome/VERSION $(LOCAL_PATH)/components/data_reduction_proxy/common/version.h.in $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: Generating version header file: "$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h" ($@)"
- $(hide)cd $(gyp_local_path)/components; mkdir -p $(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common; python ../build/util/version.py -e "VERSION_FULL=\"39.0.2171.38\"" data_reduction_proxy/common/version.h.in "$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h"
+ $(hide)cd $(gyp_local_path)/components; mkdir -p $(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common; python ../build/util/version.py -e "VERSION_FULL=\"39.0.2171.44\"" data_reduction_proxy/common/version.h.in "$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h"
diff --git a/components/data_reduction_proxy_version_header.target.linux-x86.mk b/components/data_reduction_proxy_version_header.target.linux-x86.mk
index 49fa537..ad978d6 100644
--- a/components/data_reduction_proxy_version_header.target.linux-x86.mk
+++ b/components/data_reduction_proxy_version_header.target.linux-x86.mk
@@ -21,7 +21,7 @@
$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h: $(LOCAL_PATH)/chrome/VERSION $(LOCAL_PATH)/components/data_reduction_proxy/common/version.h.in $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: Generating version header file: "$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h" ($@)"
- $(hide)cd $(gyp_local_path)/components; mkdir -p $(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common; python ../build/util/version.py -e "VERSION_FULL=\"39.0.2171.38\"" data_reduction_proxy/common/version.h.in "$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h"
+ $(hide)cd $(gyp_local_path)/components; mkdir -p $(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common; python ../build/util/version.py -e "VERSION_FULL=\"39.0.2171.44\"" data_reduction_proxy/common/version.h.in "$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h"
diff --git a/components/data_reduction_proxy_version_header.target.linux-x86_64.mk b/components/data_reduction_proxy_version_header.target.linux-x86_64.mk
index 49fa537..ad978d6 100644
--- a/components/data_reduction_proxy_version_header.target.linux-x86_64.mk
+++ b/components/data_reduction_proxy_version_header.target.linux-x86_64.mk
@@ -21,7 +21,7 @@
$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h: $(LOCAL_PATH)/chrome/VERSION $(LOCAL_PATH)/components/data_reduction_proxy/common/version.h.in $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: Generating version header file: "$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h" ($@)"
- $(hide)cd $(gyp_local_path)/components; mkdir -p $(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common; python ../build/util/version.py -e "VERSION_FULL=\"39.0.2171.38\"" data_reduction_proxy/common/version.h.in "$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h"
+ $(hide)cd $(gyp_local_path)/components; mkdir -p $(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common; python ../build/util/version.py -e "VERSION_FULL=\"39.0.2171.44\"" data_reduction_proxy/common/version.h.in "$(gyp_shared_intermediate_dir)/components/data_reduction_proxy/common/version.h"
diff --git a/components/domain_reliability/monitor.cc b/components/domain_reliability/monitor.cc
index d7725b4..d267a92 100644
--- a/components/domain_reliability/monitor.cc
+++ b/components/domain_reliability/monitor.cc
@@ -21,9 +21,7 @@
DomainReliabilityMonitor::DomainReliabilityMonitor(
const std::string& upload_reporter_string,
scoped_refptr<base::SingleThreadTaskRunner> pref_thread,
- scoped_refptr<base::SingleThreadTaskRunner> network_thread,
- PrefService* local_state_pref_service,
- const char* reporting_pref_name)
+ scoped_refptr<base::SingleThreadTaskRunner> network_thread)
: time_(new ActualTime()),
upload_reporter_string_(upload_reporter_string),
scheduler_params_(
@@ -32,17 +30,15 @@
pref_task_runner_(pref_thread),
network_task_runner_(network_thread),
moved_to_network_thread_(false),
+ discard_uploads_set_(false),
weak_factory_(this) {
DCHECK(OnPrefThread());
- InitReportingPref(local_state_pref_service, reporting_pref_name);
}
DomainReliabilityMonitor::DomainReliabilityMonitor(
const std::string& upload_reporter_string,
scoped_refptr<base::SingleThreadTaskRunner> pref_thread,
scoped_refptr<base::SingleThreadTaskRunner> network_thread,
- PrefService* local_state_pref_service,
- const char* reporting_pref_name,
scoped_ptr<MockableTime> time)
: time_(time.Pass()),
upload_reporter_string_(upload_reporter_string),
@@ -52,9 +48,9 @@
pref_task_runner_(pref_thread),
network_task_runner_(network_thread),
moved_to_network_thread_(false),
+ discard_uploads_set_(false),
weak_factory_(this) {
DCHECK(OnPrefThread());
- InitReportingPref(local_state_pref_service, reporting_pref_name);
}
DomainReliabilityMonitor::~DomainReliabilityMonitor() {
@@ -70,16 +66,9 @@
DCHECK(OnPrefThread());
DCHECK(!moved_to_network_thread_);
- reporting_pref_.MoveToThread(network_task_runner_);
moved_to_network_thread_ = true;
}
-void DomainReliabilityMonitor::DestroyReportingPref() {
- DCHECK(OnPrefThread());
-
- reporting_pref_.Destroy();
-}
-
void DomainReliabilityMonitor::InitURLRequestContext(
net::URLRequestContext* url_request_context) {
DCHECK(OnNetworkThread());
@@ -102,12 +91,11 @@
RunsTasksOnCurrentThread());
uploader_ = DomainReliabilityUploader::Create(url_request_context_getter);
- // Make sure the uploader is sending or discarding uploads according to pref.
- OnReportingPrefChanged();
}
void DomainReliabilityMonitor::AddBakedInConfigs() {
DCHECK(OnNetworkThread());
+ DCHECK(moved_to_network_thread_);
base::Time now = base::Time::Now();
for (size_t i = 0; kBakedInJsonConfigs[i]; ++i) {
@@ -123,8 +111,18 @@
}
}
+void DomainReliabilityMonitor::SetDiscardUploads(bool discard_uploads) {
+ DCHECK(OnNetworkThread());
+ DCHECK(moved_to_network_thread_);
+ DCHECK(uploader_);
+
+ uploader_->set_discard_uploads(discard_uploads);
+ discard_uploads_set_ = true;
+}
+
void DomainReliabilityMonitor::OnBeforeRedirect(net::URLRequest* request) {
DCHECK(OnNetworkThread());
+ DCHECK(discard_uploads_set_);
// Record the redirect itself in addition to the final request.
OnRequestLegComplete(RequestInfo(*request));
@@ -133,6 +131,7 @@
void DomainReliabilityMonitor::OnCompleted(net::URLRequest* request,
bool started) {
DCHECK(OnNetworkThread());
+ DCHECK(discard_uploads_set_);
if (!started)
return;
@@ -239,6 +238,10 @@
void DomainReliabilityMonitor::OnRequestLegComplete(
const RequestInfo& request) {
+ // Check these again because unit tests call this directly.
+ DCHECK(OnNetworkThread());
+ DCHECK(discard_uploads_set_);
+
int response_code;
if (request.response_info.headers.get())
response_code = request.response_info.headers->response_code();
@@ -286,24 +289,6 @@
context->OnBeacon(request.url, beacon);
}
-void DomainReliabilityMonitor::InitReportingPref(
- PrefService* local_state_pref_service,
- const char* reporting_pref_name) {
- reporting_pref_.Init(
- reporting_pref_name,
- local_state_pref_service,
- base::Bind(&DomainReliabilityMonitor::OnReportingPrefChanged,
- base::Unretained(this)));
-}
-
-void DomainReliabilityMonitor::OnReportingPrefChanged() {
- DCHECK(OnNetworkThread());
-
- // When metrics reporting is disabled, discard Domain Reliability uploads.
- if (uploader_)
- uploader_->set_discard_uploads(!*reporting_pref_);
-}
-
// TODO(ttuttle): Keep a separate wildcard_contexts_ map to avoid having to
// prepend '*.' to domains.
DomainReliabilityContext* DomainReliabilityMonitor::GetContextForHost(
diff --git a/components/domain_reliability/monitor.h b/components/domain_reliability/monitor.h
index a429c93..2caa474 100644
--- a/components/domain_reliability/monitor.h
+++ b/components/domain_reliability/monitor.h
@@ -10,7 +10,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
-#include "base/prefs/pref_member.h"
+#include "base/single_thread_task_runner.h"
#include "base/time/time.h"
#include "components/domain_reliability/beacon.h"
#include "components/domain_reliability/clear_mode.h"
@@ -25,10 +25,7 @@
#include "net/http/http_response_info.h"
#include "net/url_request/url_request_status.h"
-class PrefService;
-
namespace base {
-class SingleThreadTaskRunner;
class ThreadChecker;
class Value;
} // namespace base
@@ -51,17 +48,13 @@
DomainReliabilityMonitor(
const std::string& upload_reporter_string,
scoped_refptr<base::SingleThreadTaskRunner> pref_thread,
- scoped_refptr<base::SingleThreadTaskRunner> network_thread,
- PrefService* local_state_pref_service,
- const char* reporting_pref_name);
+ scoped_refptr<base::SingleThreadTaskRunner> network_thread);
// Same, but specifies a mock interface for time functions for testing.
DomainReliabilityMonitor(
const std::string& upload_reporter_string,
scoped_refptr<base::SingleThreadTaskRunner> pref_thread,
scoped_refptr<base::SingleThreadTaskRunner> network_thread,
- PrefService* local_state_pref_service,
- const char* reporting_pref_name,
scoped_ptr<MockableTime> time);
// Must be called from the pref thread if |MoveToNetworkThread| was not
@@ -73,11 +66,8 @@
// thread passed in the constructor.
void MoveToNetworkThread();
- // Must be called from the pref thread before the Monitor is destructed if
- // |MoveToNetworkThread| was called.
- void DestroyReportingPref();
-
- // All public methods below this point must be called on the network thread:
+ // All public methods below this point must be called on the network thread
+ // after |MoveToNetworkThread| is called on the pref thread.
// Initializes the Monitor's URLRequestContextGetter.
//
@@ -91,13 +81,19 @@
// Populates the monitor with contexts that were configured at compile time.
void AddBakedInConfigs();
+ // Sets whether the uploader will discard uploads. Must be called after
+ // |InitURLRequestContext|.
+ void SetDiscardUploads(bool discard_uploads);
+
// Should be called when |request| is about to follow a redirect. Will
- // examine and possibly log the redirect request.
+ // examine and possibly log the redirect request. Must be called after
+ // |SetDiscardUploads|.
void OnBeforeRedirect(net::URLRequest* request);
// Should be called when |request| is complete. Will examine and possibly
- // log the (final) request. (|started| should be true if the request was
- // actually started before it was terminated.)
+ // log the (final) request. |started| should be true if the request was
+ // actually started before it was terminated. Must be called after
+ // |SetDiscardUploads|.
void OnCompleted(net::URLRequest* request, bool started);
// Called to remove browsing data. With CLEAR_BEACONS, leaves contexts in
@@ -146,11 +142,6 @@
DomainReliabilityContext* GetContextForHost(const std::string& host) const;
- void InitReportingPref(
- PrefService* local_state_pref_service,
- const char* reporting_pref_name);
- void OnReportingPrefChanged();
-
bool OnPrefThread() const {
return pref_task_runner_->BelongsToCurrentThread();
}
@@ -170,8 +161,8 @@
scoped_refptr<base::SingleThreadTaskRunner> pref_task_runner_;
scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
- BooleanPrefMember reporting_pref_;
bool moved_to_network_thread_;
+ bool discard_uploads_set_;
base::WeakPtrFactory<DomainReliabilityMonitor> weak_factory_;
diff --git a/components/domain_reliability/monitor_unittest.cc b/components/domain_reliability/monitor_unittest.cc
index 1dbe5b3..f1fea50 100644
--- a/components/domain_reliability/monitor_unittest.cc
+++ b/components/domain_reliability/monitor_unittest.cc
@@ -11,8 +11,6 @@
#include "base/bind.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop_proxy.h"
-#include "base/prefs/pref_registry_simple.h"
-#include "base/prefs/testing_pref_service.h"
#include "base/test/test_simple_task_runner.h"
#include "components/domain_reliability/baked_in_configs.h"
#include "components/domain_reliability/beacon.h"
@@ -36,8 +34,6 @@
static const size_t kAlwaysReportIndex = 0u;
static const size_t kNeverReportIndex = 1u;
-static const char* kPrefName = "reporting_enabled";
-
scoped_refptr<net::HttpResponseHeaders> MakeHttpResponseHeaders(
const std::string& headers) {
return scoped_refptr<net::HttpResponseHeaders>(
@@ -57,26 +53,17 @@
url_request_context_getter_(
new net::TestURLRequestContextGetter(network_task_runner_)),
time_(new MockTime()),
- pref_service_(CreatePrefService()),
monitor_("test-reporter",
pref_task_runner_,
network_task_runner_,
- pref_service_.get(),
- kPrefName,
scoped_ptr<MockableTime>(time_)),
context_(NULL) {
monitor_.MoveToNetworkThread();
monitor_.InitURLRequestContext(url_request_context_getter_);
+ monitor_.SetDiscardUploads(false);
context_ = monitor_.AddContextForTesting(MakeTestConfig());
}
- static PrefService* CreatePrefService() {
- TestingPrefServiceSimple* prefs = new TestingPrefServiceSimple();
- prefs->registry()->RegisterBooleanPref(kPrefName, false);
- prefs->SetUserPref(kPrefName, new base::FundamentalValue(true));
- return prefs;
- }
-
static RequestInfo MakeRequestInfo() {
RequestInfo request;
request.status = net::URLRequestStatus();
@@ -131,7 +118,6 @@
scoped_refptr<base::TestSimpleTaskRunner> network_task_runner_;
scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
MockTime* time_;
- scoped_ptr<PrefService> pref_service_;
DomainReliabilityMonitor monitor_;
DomainReliabilityContext* context_;
DomainReliabilityMonitor::RequestInfo request_;
diff --git a/components/domain_reliability/service.cc b/components/domain_reliability/service.cc
index 13eca0d..4945e71 100644
--- a/components/domain_reliability/service.cc
+++ b/components/domain_reliability/service.cc
@@ -40,17 +40,14 @@
// DomainReliabilityService implementation:
virtual scoped_ptr<DomainReliabilityMonitor> CreateMonitor(
- scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
- PrefService* local_state_pref_service,
- const char* reporting_pref_name) OVERRIDE {
+ scoped_refptr<base::SingleThreadTaskRunner> network_task_runner)
+ OVERRIDE {
DCHECK(!network_task_runner_.get());
scoped_ptr<DomainReliabilityMonitor> monitor(
new DomainReliabilityMonitor(upload_reporter_string_,
base::MessageLoopProxy::current(),
- network_task_runner,
- local_state_pref_service,
- reporting_pref_name));
+ network_task_runner));
monitor_ = monitor->MakeWeakPtr();
network_task_runner_ = network_task_runner;
diff --git a/components/domain_reliability/service.h b/components/domain_reliability/service.h
index a563294..e04e944 100644
--- a/components/domain_reliability/service.h
+++ b/components/domain_reliability/service.h
@@ -50,9 +50,7 @@
// called. The caller is responsible for destroying the Monitor on the given
// task runner when it is no longer needed.
virtual scoped_ptr<DomainReliabilityMonitor> CreateMonitor(
- scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
- PrefService* pref_service,
- const char* reporting_pref_name) = 0;
+ scoped_refptr<base::SingleThreadTaskRunner> network_task_runner) = 0;
// Clears browsing data on the associated Monitor. |Init()| must have been
// called first.
diff --git a/components/metrics/metrics_provider.h b/components/metrics/metrics_provider.h
index 9daaaaf..22afe14 100644
--- a/components/metrics/metrics_provider.h
+++ b/components/metrics/metrics_provider.h
@@ -48,7 +48,8 @@
virtual void ClearSavedStabilityMetrics();
// Provides general metrics that are neither system profile nor stability
- // metrics.
+ // metrics. May also be used to add histograms when final metrics are
+ // collected right before upload.
virtual void ProvideGeneralMetrics(
ChromeUserMetricsExtension* uma_proto);
diff --git a/components/metrics/metrics_service.cc b/components/metrics/metrics_service.cc
index 25240a2..8594b9e 100644
--- a/components/metrics/metrics_service.cc
+++ b/components/metrics/metrics_service.cc
@@ -776,8 +776,8 @@
current_log->RecordStabilityMetrics(metrics_providers_.get(),
incremental_uptime, uptime);
- RecordCurrentHistograms();
current_log->RecordGeneralMetrics(metrics_providers_.get());
+ RecordCurrentHistograms();
log_manager_.FinishCurrentLog();
}
@@ -991,9 +991,8 @@
MetricsLog* current_log = log_manager_.current_log();
current_log->RecordStabilityMetrics(metrics_providers_.get(),
base::TimeDelta(), base::TimeDelta());
- RecordCurrentHistograms();
-
current_log->RecordGeneralMetrics(metrics_providers_.get());
+ RecordCurrentHistograms();
log_manager_.FinishCurrentLog();
log_manager_.ResumePausedLog();
diff --git a/components/navigation_interception.target.darwin-arm.mk b/components/navigation_interception.target.darwin-arm.mk
index 51da993..166dc86 100644
--- a/components/navigation_interception.target.darwin-arm.mk
+++ b/components/navigation_interception.target.darwin-arm.mk
@@ -113,6 +113,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -254,6 +255,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/components/navigation_interception.target.darwin-arm64.mk b/components/navigation_interception.target.darwin-arm64.mk
index cb72c3d..7c6180a 100644
--- a/components/navigation_interception.target.darwin-arm64.mk
+++ b/components/navigation_interception.target.darwin-arm64.mk
@@ -102,6 +102,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -231,6 +232,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/components/navigation_interception.target.darwin-mips.mk b/components/navigation_interception.target.darwin-mips.mk
index 4bbf8b5..fdd7193 100644
--- a/components/navigation_interception.target.darwin-mips.mk
+++ b/components/navigation_interception.target.darwin-mips.mk
@@ -105,6 +105,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -238,6 +239,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/components/navigation_interception.target.darwin-x86.mk b/components/navigation_interception.target.darwin-x86.mk
index 67bad3e..2c1e7b2 100644
--- a/components/navigation_interception.target.darwin-x86.mk
+++ b/components/navigation_interception.target.darwin-x86.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -242,6 +243,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/navigation_interception.target.darwin-x86_64.mk b/components/navigation_interception.target.darwin-x86_64.mk
index b717741..2ad6a9f 100644
--- a/components/navigation_interception.target.darwin-x86_64.mk
+++ b/components/navigation_interception.target.darwin-x86_64.mk
@@ -107,6 +107,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -241,6 +242,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/components/navigation_interception.target.linux-arm.mk b/components/navigation_interception.target.linux-arm.mk
index 51da993..166dc86 100644
--- a/components/navigation_interception.target.linux-arm.mk
+++ b/components/navigation_interception.target.linux-arm.mk
@@ -113,6 +113,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -254,6 +255,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/components/navigation_interception.target.linux-arm64.mk b/components/navigation_interception.target.linux-arm64.mk
index cb72c3d..7c6180a 100644
--- a/components/navigation_interception.target.linux-arm64.mk
+++ b/components/navigation_interception.target.linux-arm64.mk
@@ -102,6 +102,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -231,6 +232,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/components/navigation_interception.target.linux-mips.mk b/components/navigation_interception.target.linux-mips.mk
index 4bbf8b5..fdd7193 100644
--- a/components/navigation_interception.target.linux-mips.mk
+++ b/components/navigation_interception.target.linux-mips.mk
@@ -105,6 +105,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -238,6 +239,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/components/navigation_interception.target.linux-x86.mk b/components/navigation_interception.target.linux-x86.mk
index 67bad3e..2c1e7b2 100644
--- a/components/navigation_interception.target.linux-x86.mk
+++ b/components/navigation_interception.target.linux-x86.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -242,6 +243,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/navigation_interception.target.linux-x86_64.mk b/components/navigation_interception.target.linux-x86_64.mk
index b717741..2ad6a9f 100644
--- a/components/navigation_interception.target.linux-x86_64.mk
+++ b/components/navigation_interception.target.linux-x86_64.mk
@@ -107,6 +107,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -241,6 +242,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/components/policy/resources/policy_templates.json b/components/policy/resources/policy_templates.json
index 835015f..acf1948 100644
--- a/components/policy/resources/policy_templates.json
+++ b/components/policy/resources/policy_templates.json
@@ -2748,7 +2748,7 @@
'can_be_recommended': True,
'can_be_mandatory' : False,
},
- 'example_value': [{'protocol': 'mailto', 'url': 'https://mail.google.com/mail/?extsrc=mailto&url=%s', 'default': 'true'}],
+ 'example_value': [{'protocol': 'mailto', 'url': 'https://mail.google.com/mail/?extsrc=mailto&url=%s', 'default': True}],
'id': 268,
'caption': '''Register protocol handlers''',
'desc': '''Allows you to register a list of protocol handlers. This can only be a recommended policy. The property |protocol| should be set to the scheme such as 'mailto' and the property |url| should be set to the URL pattern of the application that handles the scheme. The pattern can include a '%s', which if present will be replaced by the handled URL.
diff --git a/components/pref_registry.target.darwin-arm.mk b/components/pref_registry.target.darwin-arm.mk
index 59036b7..d900165 100644
--- a/components/pref_registry.target.darwin-arm.mk
+++ b/components/pref_registry.target.darwin-arm.mk
@@ -107,6 +107,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -241,6 +242,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/pref_registry.target.darwin-arm64.mk b/components/pref_registry.target.darwin-arm64.mk
index 1586f18..ab20e13 100644
--- a/components/pref_registry.target.darwin-arm64.mk
+++ b/components/pref_registry.target.darwin-arm64.mk
@@ -96,6 +96,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -218,6 +219,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/pref_registry.target.darwin-mips.mk b/components/pref_registry.target.darwin-mips.mk
index 9f62486..3f7908c 100644
--- a/components/pref_registry.target.darwin-mips.mk
+++ b/components/pref_registry.target.darwin-mips.mk
@@ -99,6 +99,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -225,6 +226,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/pref_registry.target.darwin-x86.mk b/components/pref_registry.target.darwin-x86.mk
index ded0879..662191b 100644
--- a/components/pref_registry.target.darwin-x86.mk
+++ b/components/pref_registry.target.darwin-x86.mk
@@ -101,6 +101,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -228,6 +229,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/pref_registry.target.darwin-x86_64.mk b/components/pref_registry.target.darwin-x86_64.mk
index 764d316..4ce0cea 100644
--- a/components/pref_registry.target.darwin-x86_64.mk
+++ b/components/pref_registry.target.darwin-x86_64.mk
@@ -101,6 +101,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -228,6 +229,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/pref_registry.target.linux-arm.mk b/components/pref_registry.target.linux-arm.mk
index 59036b7..d900165 100644
--- a/components/pref_registry.target.linux-arm.mk
+++ b/components/pref_registry.target.linux-arm.mk
@@ -107,6 +107,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -241,6 +242,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/pref_registry.target.linux-arm64.mk b/components/pref_registry.target.linux-arm64.mk
index 1586f18..ab20e13 100644
--- a/components/pref_registry.target.linux-arm64.mk
+++ b/components/pref_registry.target.linux-arm64.mk
@@ -96,6 +96,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -218,6 +219,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/pref_registry.target.linux-mips.mk b/components/pref_registry.target.linux-mips.mk
index 9f62486..3f7908c 100644
--- a/components/pref_registry.target.linux-mips.mk
+++ b/components/pref_registry.target.linux-mips.mk
@@ -99,6 +99,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -225,6 +226,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/pref_registry.target.linux-x86.mk b/components/pref_registry.target.linux-x86.mk
index ded0879..662191b 100644
--- a/components/pref_registry.target.linux-x86.mk
+++ b/components/pref_registry.target.linux-x86.mk
@@ -101,6 +101,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -228,6 +229,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/pref_registry.target.linux-x86_64.mk b/components/pref_registry.target.linux-x86_64.mk
index 764d316..4ce0cea 100644
--- a/components/pref_registry.target.linux-x86_64.mk
+++ b/components/pref_registry.target.linux-x86_64.mk
@@ -101,6 +101,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -228,6 +229,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
index c4feb4b..bb99ad3 100644
--- a/components/search_engines/prepopulated_engines.json
+++ b/components/search_engines/prepopulated_engines.json
@@ -30,7 +30,7 @@
// Increment this if you change the data in ways that mean users with
// existing data should get a new version.
- "kCurrentDataVersion": 78
+ "kCurrentDataVersion": 79
},
// The following engines are included in country lists and are added to the
@@ -538,7 +538,8 @@
"alternate_urls": [
"{google:baseURL}#q={searchTerms}",
"{google:baseURL}search#q={searchTerms}",
- "{google:baseURL}webhp#q={searchTerms}"
+ "{google:baseURL}webhp#q={searchTerms}",
+ "{google:baseURL}s?q={searchTerms}"
],
"search_terms_replacement_key": "{google:instantExtendedEnabledKey}",
"type": "SEARCH_ENGINE_GOOGLE",
diff --git a/components/user_prefs.target.darwin-arm.mk b/components/user_prefs.target.darwin-arm.mk
index 5ad67df..116de16 100644
--- a/components/user_prefs.target.darwin-arm.mk
+++ b/components/user_prefs.target.darwin-arm.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -244,6 +245,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/components/user_prefs.target.darwin-arm64.mk b/components/user_prefs.target.darwin-arm64.mk
index 4dcf7be..00847f2 100644
--- a/components/user_prefs.target.darwin-arm64.mk
+++ b/components/user_prefs.target.darwin-arm64.mk
@@ -97,6 +97,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -221,6 +222,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/components/user_prefs.target.darwin-mips.mk b/components/user_prefs.target.darwin-mips.mk
index 63605c6..131f225 100644
--- a/components/user_prefs.target.darwin-mips.mk
+++ b/components/user_prefs.target.darwin-mips.mk
@@ -100,6 +100,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -228,6 +229,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/components/user_prefs.target.darwin-x86.mk b/components/user_prefs.target.darwin-x86.mk
index 370677e..23c4568 100644
--- a/components/user_prefs.target.darwin-x86.mk
+++ b/components/user_prefs.target.darwin-x86.mk
@@ -103,6 +103,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -233,6 +234,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/components/user_prefs.target.darwin-x86_64.mk b/components/user_prefs.target.darwin-x86_64.mk
index be640d6..f58843b 100644
--- a/components/user_prefs.target.darwin-x86_64.mk
+++ b/components/user_prefs.target.darwin-x86_64.mk
@@ -102,6 +102,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -231,6 +232,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/components/user_prefs.target.linux-arm.mk b/components/user_prefs.target.linux-arm.mk
index 5ad67df..116de16 100644
--- a/components/user_prefs.target.linux-arm.mk
+++ b/components/user_prefs.target.linux-arm.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -244,6 +245,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/components/user_prefs.target.linux-arm64.mk b/components/user_prefs.target.linux-arm64.mk
index 4dcf7be..00847f2 100644
--- a/components/user_prefs.target.linux-arm64.mk
+++ b/components/user_prefs.target.linux-arm64.mk
@@ -97,6 +97,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -221,6 +222,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/components/user_prefs.target.linux-mips.mk b/components/user_prefs.target.linux-mips.mk
index 63605c6..131f225 100644
--- a/components/user_prefs.target.linux-mips.mk
+++ b/components/user_prefs.target.linux-mips.mk
@@ -100,6 +100,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -228,6 +229,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/components/user_prefs.target.linux-x86.mk b/components/user_prefs.target.linux-x86.mk
index 370677e..23c4568 100644
--- a/components/user_prefs.target.linux-x86.mk
+++ b/components/user_prefs.target.linux-x86.mk
@@ -103,6 +103,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -233,6 +234,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/components/user_prefs.target.linux-x86_64.mk b/components/user_prefs.target.linux-x86_64.mk
index be640d6..f58843b 100644
--- a/components/user_prefs.target.linux-x86_64.mk
+++ b/components/user_prefs.target.linux-x86_64.mk
@@ -102,6 +102,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -231,6 +232,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/components/visitedlink_browser.target.darwin-arm.mk b/components/visitedlink_browser.target.darwin-arm.mk
index 7645b3e..dfb5dc8 100644
--- a/components/visitedlink_browser.target.darwin-arm.mk
+++ b/components/visitedlink_browser.target.darwin-arm.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -243,6 +244,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/components/visitedlink_browser.target.darwin-arm64.mk b/components/visitedlink_browser.target.darwin-arm64.mk
index 40ec2de..f1f4c17 100644
--- a/components/visitedlink_browser.target.darwin-arm64.mk
+++ b/components/visitedlink_browser.target.darwin-arm64.mk
@@ -97,6 +97,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -220,6 +221,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/components/visitedlink_browser.target.darwin-mips.mk b/components/visitedlink_browser.target.darwin-mips.mk
index fc63e2f..2471ad1 100644
--- a/components/visitedlink_browser.target.darwin-mips.mk
+++ b/components/visitedlink_browser.target.darwin-mips.mk
@@ -100,6 +100,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -227,6 +228,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/components/visitedlink_browser.target.darwin-x86.mk b/components/visitedlink_browser.target.darwin-x86.mk
index 87f8d17..b79513d 100644
--- a/components/visitedlink_browser.target.darwin-x86.mk
+++ b/components/visitedlink_browser.target.darwin-x86.mk
@@ -103,6 +103,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -232,6 +233,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/components/visitedlink_browser.target.darwin-x86_64.mk b/components/visitedlink_browser.target.darwin-x86_64.mk
index cd417e5..e199810 100644
--- a/components/visitedlink_browser.target.darwin-x86_64.mk
+++ b/components/visitedlink_browser.target.darwin-x86_64.mk
@@ -102,6 +102,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -230,6 +231,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/components/visitedlink_browser.target.linux-arm.mk b/components/visitedlink_browser.target.linux-arm.mk
index 7645b3e..dfb5dc8 100644
--- a/components/visitedlink_browser.target.linux-arm.mk
+++ b/components/visitedlink_browser.target.linux-arm.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -243,6 +244,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/components/visitedlink_browser.target.linux-arm64.mk b/components/visitedlink_browser.target.linux-arm64.mk
index 40ec2de..f1f4c17 100644
--- a/components/visitedlink_browser.target.linux-arm64.mk
+++ b/components/visitedlink_browser.target.linux-arm64.mk
@@ -97,6 +97,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -220,6 +221,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/components/visitedlink_browser.target.linux-mips.mk b/components/visitedlink_browser.target.linux-mips.mk
index fc63e2f..2471ad1 100644
--- a/components/visitedlink_browser.target.linux-mips.mk
+++ b/components/visitedlink_browser.target.linux-mips.mk
@@ -100,6 +100,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -227,6 +228,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/components/visitedlink_browser.target.linux-x86.mk b/components/visitedlink_browser.target.linux-x86.mk
index 87f8d17..b79513d 100644
--- a/components/visitedlink_browser.target.linux-x86.mk
+++ b/components/visitedlink_browser.target.linux-x86.mk
@@ -103,6 +103,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -232,6 +233,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/components/visitedlink_browser.target.linux-x86_64.mk b/components/visitedlink_browser.target.linux-x86_64.mk
index cd417e5..e199810 100644
--- a/components/visitedlink_browser.target.linux-x86_64.mk
+++ b/components/visitedlink_browser.target.linux-x86_64.mk
@@ -102,6 +102,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -230,6 +231,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/components/visitedlink_renderer.target.darwin-arm.mk b/components/visitedlink_renderer.target.darwin-arm.mk
index 20ab026..fc9f6fd 100644
--- a/components/visitedlink_renderer.target.darwin-arm.mk
+++ b/components/visitedlink_renderer.target.darwin-arm.mk
@@ -107,6 +107,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -259,6 +260,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/components/visitedlink_renderer.target.darwin-arm64.mk b/components/visitedlink_renderer.target.darwin-arm64.mk
index dc2abb9..6a0685b 100644
--- a/components/visitedlink_renderer.target.darwin-arm64.mk
+++ b/components/visitedlink_renderer.target.darwin-arm64.mk
@@ -96,6 +96,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -236,6 +237,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/components/visitedlink_renderer.target.darwin-mips.mk b/components/visitedlink_renderer.target.darwin-mips.mk
index e174c46..f0654ce 100644
--- a/components/visitedlink_renderer.target.darwin-mips.mk
+++ b/components/visitedlink_renderer.target.darwin-mips.mk
@@ -99,6 +99,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -243,6 +244,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/components/visitedlink_renderer.target.darwin-x86.mk b/components/visitedlink_renderer.target.darwin-x86.mk
index 9ea3aed..f57e811 100644
--- a/components/visitedlink_renderer.target.darwin-x86.mk
+++ b/components/visitedlink_renderer.target.darwin-x86.mk
@@ -102,6 +102,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -248,6 +249,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/components/visitedlink_renderer.target.darwin-x86_64.mk b/components/visitedlink_renderer.target.darwin-x86_64.mk
index 979f74e..f18f449 100644
--- a/components/visitedlink_renderer.target.darwin-x86_64.mk
+++ b/components/visitedlink_renderer.target.darwin-x86_64.mk
@@ -101,6 +101,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -246,6 +247,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/components/visitedlink_renderer.target.linux-arm.mk b/components/visitedlink_renderer.target.linux-arm.mk
index 20ab026..fc9f6fd 100644
--- a/components/visitedlink_renderer.target.linux-arm.mk
+++ b/components/visitedlink_renderer.target.linux-arm.mk
@@ -107,6 +107,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -259,6 +260,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/components/visitedlink_renderer.target.linux-arm64.mk b/components/visitedlink_renderer.target.linux-arm64.mk
index dc2abb9..6a0685b 100644
--- a/components/visitedlink_renderer.target.linux-arm64.mk
+++ b/components/visitedlink_renderer.target.linux-arm64.mk
@@ -96,6 +96,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -236,6 +237,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/components/visitedlink_renderer.target.linux-mips.mk b/components/visitedlink_renderer.target.linux-mips.mk
index e174c46..f0654ce 100644
--- a/components/visitedlink_renderer.target.linux-mips.mk
+++ b/components/visitedlink_renderer.target.linux-mips.mk
@@ -99,6 +99,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -243,6 +244,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/components/visitedlink_renderer.target.linux-x86.mk b/components/visitedlink_renderer.target.linux-x86.mk
index 9ea3aed..f57e811 100644
--- a/components/visitedlink_renderer.target.linux-x86.mk
+++ b/components/visitedlink_renderer.target.linux-x86.mk
@@ -102,6 +102,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -248,6 +249,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/components/visitedlink_renderer.target.linux-x86_64.mk b/components/visitedlink_renderer.target.linux-x86_64.mk
index 979f74e..f18f449 100644
--- a/components/visitedlink_renderer.target.linux-x86_64.mk
+++ b/components/visitedlink_renderer.target.linux-x86_64.mk
@@ -101,6 +101,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -246,6 +247,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/components/web_contents_delegate_android.target.darwin-arm.mk b/components/web_contents_delegate_android.target.darwin-arm.mk
index b52a9bd..24ea959 100644
--- a/components/web_contents_delegate_android.target.darwin-arm.mk
+++ b/components/web_contents_delegate_android.target.darwin-arm.mk
@@ -114,6 +114,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -255,6 +256,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/web_contents_delegate_android.target.darwin-arm64.mk b/components/web_contents_delegate_android.target.darwin-arm64.mk
index 0695f6d..916f53d 100644
--- a/components/web_contents_delegate_android.target.darwin-arm64.mk
+++ b/components/web_contents_delegate_android.target.darwin-arm64.mk
@@ -103,6 +103,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -232,6 +233,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/web_contents_delegate_android.target.darwin-mips.mk b/components/web_contents_delegate_android.target.darwin-mips.mk
index 82b8879..7a16391 100644
--- a/components/web_contents_delegate_android.target.darwin-mips.mk
+++ b/components/web_contents_delegate_android.target.darwin-mips.mk
@@ -106,6 +106,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -239,6 +240,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/web_contents_delegate_android.target.darwin-x86.mk b/components/web_contents_delegate_android.target.darwin-x86.mk
index 609f86a..92af374 100644
--- a/components/web_contents_delegate_android.target.darwin-x86.mk
+++ b/components/web_contents_delegate_android.target.darwin-x86.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -242,6 +243,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/web_contents_delegate_android.target.darwin-x86_64.mk b/components/web_contents_delegate_android.target.darwin-x86_64.mk
index 4128311..ff4b75e 100644
--- a/components/web_contents_delegate_android.target.darwin-x86_64.mk
+++ b/components/web_contents_delegate_android.target.darwin-x86_64.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -242,6 +243,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/web_contents_delegate_android.target.linux-arm.mk b/components/web_contents_delegate_android.target.linux-arm.mk
index b52a9bd..24ea959 100644
--- a/components/web_contents_delegate_android.target.linux-arm.mk
+++ b/components/web_contents_delegate_android.target.linux-arm.mk
@@ -114,6 +114,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -255,6 +256,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/web_contents_delegate_android.target.linux-arm64.mk b/components/web_contents_delegate_android.target.linux-arm64.mk
index 0695f6d..916f53d 100644
--- a/components/web_contents_delegate_android.target.linux-arm64.mk
+++ b/components/web_contents_delegate_android.target.linux-arm64.mk
@@ -103,6 +103,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -232,6 +233,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/web_contents_delegate_android.target.linux-mips.mk b/components/web_contents_delegate_android.target.linux-mips.mk
index 82b8879..7a16391 100644
--- a/components/web_contents_delegate_android.target.linux-mips.mk
+++ b/components/web_contents_delegate_android.target.linux-mips.mk
@@ -106,6 +106,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -239,6 +240,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/web_contents_delegate_android.target.linux-x86.mk b/components/web_contents_delegate_android.target.linux-x86.mk
index 609f86a..92af374 100644
--- a/components/web_contents_delegate_android.target.linux-x86.mk
+++ b/components/web_contents_delegate_android.target.linux-x86.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -242,6 +243,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/web_contents_delegate_android.target.linux-x86_64.mk b/components/web_contents_delegate_android.target.linux-x86_64.mk
index 4128311..ff4b75e 100644
--- a/components/web_contents_delegate_android.target.linux-x86_64.mk
+++ b/components/web_contents_delegate_android.target.linux-x86_64.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -242,6 +243,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/components/webdata_common.target.darwin-arm.mk b/components/webdata_common.target.darwin-arm.mk
index 6bcc309..33761a7 100644
--- a/components/webdata_common.target.darwin-arm.mk
+++ b/components/webdata_common.target.darwin-arm.mk
@@ -114,6 +114,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -250,6 +251,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/components/webdata_common.target.darwin-arm64.mk b/components/webdata_common.target.darwin-arm64.mk
index 956cae6..82f641b 100644
--- a/components/webdata_common.target.darwin-arm64.mk
+++ b/components/webdata_common.target.darwin-arm64.mk
@@ -103,6 +103,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -227,6 +228,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/components/webdata_common.target.darwin-mips.mk b/components/webdata_common.target.darwin-mips.mk
index b5e7887..b135d10 100644
--- a/components/webdata_common.target.darwin-mips.mk
+++ b/components/webdata_common.target.darwin-mips.mk
@@ -106,6 +106,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -234,6 +235,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/components/webdata_common.target.darwin-x86.mk b/components/webdata_common.target.darwin-x86.mk
index 9252283..1c50f68 100644
--- a/components/webdata_common.target.darwin-x86.mk
+++ b/components/webdata_common.target.darwin-x86.mk
@@ -109,6 +109,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -239,6 +240,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/components/webdata_common.target.darwin-x86_64.mk b/components/webdata_common.target.darwin-x86_64.mk
index 7e9bc04..ec38713 100644
--- a/components/webdata_common.target.darwin-x86_64.mk
+++ b/components/webdata_common.target.darwin-x86_64.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -237,6 +238,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/components/webdata_common.target.linux-arm.mk b/components/webdata_common.target.linux-arm.mk
index 6bcc309..33761a7 100644
--- a/components/webdata_common.target.linux-arm.mk
+++ b/components/webdata_common.target.linux-arm.mk
@@ -114,6 +114,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -250,6 +251,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/components/webdata_common.target.linux-arm64.mk b/components/webdata_common.target.linux-arm64.mk
index 956cae6..82f641b 100644
--- a/components/webdata_common.target.linux-arm64.mk
+++ b/components/webdata_common.target.linux-arm64.mk
@@ -103,6 +103,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -227,6 +228,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/components/webdata_common.target.linux-mips.mk b/components/webdata_common.target.linux-mips.mk
index b5e7887..b135d10 100644
--- a/components/webdata_common.target.linux-mips.mk
+++ b/components/webdata_common.target.linux-mips.mk
@@ -106,6 +106,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -234,6 +235,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/components/webdata_common.target.linux-x86.mk b/components/webdata_common.target.linux-x86.mk
index 9252283..1c50f68 100644
--- a/components/webdata_common.target.linux-x86.mk
+++ b/components/webdata_common.target.linux-x86.mk
@@ -109,6 +109,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -239,6 +240,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/components/webdata_common.target.linux-x86_64.mk b/components/webdata_common.target.linux-x86_64.mk
index 7e9bc04..ec38713 100644
--- a/components/webdata_common.target.linux-x86_64.mk
+++ b/components/webdata_common.target.linux-x86_64.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -237,6 +238,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/content/browser/media/capture/web_contents_audio_input_stream.cc b/content/browser/media/capture/web_contents_audio_input_stream.cc
index c08b17c..66403d0 100644
--- a/content/browser/media/capture/web_contents_audio_input_stream.cc
+++ b/content/browser/media/capture/web_contents_audio_input_stream.cc
@@ -391,4 +391,8 @@
return impl_->mixer_stream()->GetAutomaticGainControl();
}
+bool WebContentsAudioInputStream::IsMuted() {
+ return false;
+}
+
} // namespace content
diff --git a/content/browser/media/capture/web_contents_audio_input_stream.h b/content/browser/media/capture/web_contents_audio_input_stream.h
index b746500..80fef1c 100644
--- a/content/browser/media/capture/web_contents_audio_input_stream.h
+++ b/content/browser/media/capture/web_contents_audio_input_stream.h
@@ -46,6 +46,7 @@
virtual double GetVolume() OVERRIDE;
virtual void SetAutomaticGainControl(bool enabled) OVERRIDE;
virtual bool GetAutomaticGainControl() OVERRIDE;
+ virtual bool IsMuted() OVERRIDE;
// Create a new audio mirroring session, or return NULL on error. |device_id|
// should be in the format accepted by
diff --git a/content/browser/renderer_host/p2p/socket_host.cc b/content/browser/renderer_host/p2p/socket_host.cc
index 1693918..6fce88b 100644
--- a/content/browser/renderer_host/p2p/socket_host.cc
+++ b/content/browser/renderer_host/p2p/socket_host.cc
@@ -4,6 +4,7 @@
#include "content/browser/renderer_host/p2p/socket_host.h"
+#include "base/metrics/histogram.h"
#include "base/sys_byteorder.h"
#include "content/browser/renderer_host/p2p/socket_host_tcp.h"
#include "content/browser/renderer_host/p2p/socket_host_tcp_server.h"
@@ -454,16 +455,42 @@
} // packet_processing_helpers
-P2PSocketHost::P2PSocketHost(IPC::Sender* message_sender, int socket_id)
+P2PSocketHost::P2PSocketHost(IPC::Sender* message_sender,
+ int socket_id,
+ ProtocolType protocol_type)
: message_sender_(message_sender),
id_(socket_id),
state_(STATE_UNINITIALIZED),
dump_incoming_rtp_packet_(false),
dump_outgoing_rtp_packet_(false),
- weak_ptr_factory_(this) {
+ weak_ptr_factory_(this),
+ protocol_type_(protocol_type),
+ send_packets_delayed_total_(0),
+ send_packets_total_(0),
+ send_bytes_delayed_max_(0),
+ send_bytes_delayed_cur_(0) {
}
-P2PSocketHost::~P2PSocketHost() { }
+P2PSocketHost::~P2PSocketHost() {
+ if (protocol_type_ == P2PSocketHost::UDP) {
+ UMA_HISTOGRAM_COUNTS_10000("WebRTC.SystemMaxConsecutiveBytesDelayed_UDP",
+ send_bytes_delayed_max_);
+ } else {
+ UMA_HISTOGRAM_COUNTS_10000("WebRTC.SystemMaxConsecutiveBytesDelayed_TCP",
+ send_bytes_delayed_max_);
+ }
+
+ if (send_packets_total_ > 0) {
+ int delay_rate = (send_packets_delayed_total_ * 100) / send_packets_total_;
+ if (protocol_type_ == P2PSocketHost::UDP) {
+ UMA_HISTOGRAM_PERCENTAGE("WebRTC.SystemPercentPacketsDelayed_UDP",
+ delay_rate);
+ } else {
+ UMA_HISTOGRAM_PERCENTAGE("WebRTC.SystemPercentPacketsDelayed_TCP",
+ delay_rate);
+ }
+ }
+}
// Verifies that the packet |data| has a valid STUN header.
// static
@@ -644,4 +671,24 @@
incoming));
}
+void P2PSocketHost::IncrementDelayedPackets() {
+ send_packets_delayed_total_++;
+}
+
+void P2PSocketHost::IncrementTotalSentPackets() {
+ send_packets_total_++;
+}
+
+void P2PSocketHost::IncrementDelayedBytes(uint32 size) {
+ send_bytes_delayed_cur_ += size;
+ if (send_bytes_delayed_cur_ > send_bytes_delayed_max_) {
+ send_bytes_delayed_max_ = send_bytes_delayed_cur_;
+ }
+}
+
+void P2PSocketHost::DecrementDelayedBytes(uint32 size) {
+ send_bytes_delayed_cur_ -= size;
+ DCHECK_GE(send_bytes_delayed_cur_, 0);
+}
+
} // namespace content
diff --git a/content/browser/renderer_host/p2p/socket_host.h b/content/browser/renderer_host/p2p/socket_host.h
index 8a12898..390c115 100644
--- a/content/browser/renderer_host/p2p/socket_host.h
+++ b/content/browser/renderer_host/p2p/socket_host.h
@@ -91,6 +91,9 @@
protected:
friend class P2PSocketHostTcpTestBase;
+ // This should match suffix IPProtocolType defined in histograms.xml.
+ enum ProtocolType { UDP = 0x1, TCP = 0x2 };
+
// TODO(mallinath) - Remove this below enum and use one defined in
// libjingle/souce/talk/p2p/base/stun.h
enum StunMessageType {
@@ -125,7 +128,9 @@
STATE_ERROR,
};
- P2PSocketHost(IPC::Sender* message_sender, int socket_id);
+ P2PSocketHost(IPC::Sender* message_sender,
+ int socket_id,
+ ProtocolType protocol_type);
// Verifies that the packet |data| has a valid STUN header. In case
// of success stores type of the message in |type|.
@@ -142,6 +147,12 @@
size_t packet_length,
bool incoming);
+ // Used by subclasses to track the metrics of delayed bytes and packets.
+ void IncrementDelayedPackets();
+ void IncrementTotalSentPackets();
+ void IncrementDelayedBytes(uint32 size);
+ void DecrementDelayedBytes(uint32 size);
+
IPC::Sender* message_sender_;
int id_;
State state_;
@@ -151,6 +162,19 @@
base::WeakPtrFactory<P2PSocketHost> weak_ptr_factory_;
+ ProtocolType protocol_type_;
+
+ private:
+ // Track total delayed packets for calculating how many packets are
+ // delayed by system at the end of call.
+ uint32 send_packets_delayed_total_;
+ uint32 send_packets_total_;
+
+ // Track the maximum of consecutive delayed bytes caused by system's
+ // EWOULDBLOCK.
+ int32 send_bytes_delayed_max_;
+ int32 send_bytes_delayed_cur_;
+
DISALLOW_COPY_AND_ASSIGN(P2PSocketHost);
};
diff --git a/content/browser/renderer_host/p2p/socket_host_tcp.cc b/content/browser/renderer_host/p2p/socket_host_tcp.cc
index 1ee1627..d2f2711 100644
--- a/content/browser/renderer_host/p2p/socket_host_tcp.cc
+++ b/content/browser/renderer_host/p2p/socket_host_tcp.cc
@@ -49,7 +49,7 @@
int socket_id,
P2PSocketType type,
net::URLRequestContextGetter* url_context)
- : P2PSocketHost(message_sender, socket_id),
+ : P2PSocketHost(message_sender, socket_id, P2PSocketHost::TCP),
write_pending_(false),
connected_(false),
type_(type),
@@ -361,8 +361,11 @@
void P2PSocketHostTcpBase::WriteOrQueue(
scoped_refptr<net::DrainableIOBuffer>& buffer) {
+ IncrementTotalSentPackets();
if (write_buffer_.get()) {
write_queue_.push(buffer);
+ IncrementDelayedPackets();
+ IncrementDelayedBytes(buffer->size());
return;
}
@@ -400,6 +403,8 @@
} else {
write_buffer_ = write_queue_.front();
write_queue_.pop();
+ // Update how many bytes are still waiting to be sent.
+ DecrementDelayedBytes(write_buffer_->size());
}
}
} else if (result == net::ERR_IO_PENDING) {
diff --git a/content/browser/renderer_host/p2p/socket_host_tcp_server.cc b/content/browser/renderer_host/p2p/socket_host_tcp_server.cc
index 1017828..0976b22 100644
--- a/content/browser/renderer_host/p2p/socket_host_tcp_server.cc
+++ b/content/browser/renderer_host/p2p/socket_host_tcp_server.cc
@@ -23,7 +23,7 @@
P2PSocketHostTcpServer::P2PSocketHostTcpServer(IPC::Sender* message_sender,
int socket_id,
P2PSocketType client_type)
- : P2PSocketHost(message_sender, socket_id),
+ : P2PSocketHost(message_sender, socket_id, P2PSocketHost::TCP),
client_type_(client_type),
socket_(new net::TCPServerSocket(NULL, net::NetLog::Source())),
accept_callback_(base::Bind(&P2PSocketHostTcpServer::OnAccepted,
diff --git a/content/browser/renderer_host/p2p/socket_host_udp.cc b/content/browser/renderer_host/p2p/socket_host_udp.cc
index 3833b62..3bea4df 100644
--- a/content/browser/renderer_host/p2p/socket_host_udp.cc
+++ b/content/browser/renderer_host/p2p/socket_host_udp.cc
@@ -68,7 +68,7 @@
P2PSocketHostUdp::P2PSocketHostUdp(IPC::Sender* message_sender,
int socket_id,
P2PMessageThrottler* throttler)
- : P2PSocketHost(message_sender, socket_id),
+ : P2PSocketHost(message_sender, socket_id, P2PSocketHost::UDP),
socket_(
new net::UDPServerSocket(GetContentClient()->browser()->GetNetLog(),
net::NetLog::Source())),
@@ -211,8 +211,12 @@
}
}
+ IncrementTotalSentPackets();
+
if (send_pending_) {
send_queue_.push_back(PendingPacket(to, data, options, packet_id));
+ IncrementDelayedBytes(data.size());
+ IncrementDelayedPackets();
} else {
// TODO(mallinath: Remove unnecessary memcpy in this case.
PendingPacket packet(to, data, options, packet_id);
@@ -281,8 +285,10 @@
// Send next packets if we have them waiting in the buffer.
while (state_ == STATE_OPEN && !send_queue_.empty() && !send_pending_) {
- DoSend(send_queue_.front());
+ PendingPacket packet = send_queue_.front();
+ DoSend(packet);
send_queue_.pop_front();
+ DecrementDelayedBytes(packet.size);
}
}
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
index da0fbc7..205650f 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -1111,6 +1111,9 @@
void RenderWidgetHostViewAndroid::SynchronousFrameMetadata(
const cc::CompositorFrameMetadata& frame_metadata) {
+ if (!content_view_core_)
+ return;
+
// This is a subset of OnSwapCompositorFrame() used in the synchronous
// compositor flow.
OnFrameMetadataUpdated(frame_metadata);
@@ -1461,6 +1464,16 @@
BrowserAccessibilityManager*
RenderWidgetHostViewAndroid::CreateBrowserAccessibilityManager(
BrowserAccessibilityDelegate* delegate) {
+ // TODO(dmazzoni): Currently there can only be one
+ // BrowserAccessibilityManager per ContentViewCore, so return NULL
+ // if there's already a BrowserAccessibilityManager for the main
+ // frame. Eventually, in order to support cross-process iframes on
+ // Android we'll need to add support for a
+ // BrowserAccessibilityManager for a child frame.
+ // http://crbug.com/423846
+ if (!host_ || host_->GetRootBrowserAccessibilityManager())
+ return NULL;
+
base::android::ScopedJavaLocalRef<jobject> obj;
if (content_view_core_)
obj = content_view_core_->GetJavaObject();
diff --git a/content/browser/speech/speech_recognition_dispatcher_host.cc b/content/browser/speech/speech_recognition_dispatcher_host.cc
index 1942a50..4a90ba6 100644
--- a/content/browser/speech/speech_recognition_dispatcher_host.cc
+++ b/content/browser/speech/speech_recognition_dispatcher_host.cc
@@ -88,6 +88,12 @@
int embedder_render_view_id = MSG_ROUTING_NONE;
RenderViewHostImpl* render_view_host =
RenderViewHostImpl::FromID(render_process_id_, params.render_view_id);
+ if (!render_view_host) {
+ // RVH can be null if the tab was closed while continuous mode speech
+ // recognition was running. This seems to happen on mac.
+ LOG(WARNING) << "SRDH::OnStartRequest, RenderViewHost does not exist";
+ return;
+ }
WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(
WebContents::FromRenderViewHost(render_view_host));
BrowserPluginGuest* guest = web_contents->GetBrowserPluginGuest();
diff --git a/content/common/gpu/gpu_command_buffer_stub.cc b/content/common/gpu/gpu_command_buffer_stub.cc
index 4e2834f..bb31ab1 100644
--- a/content/common/gpu/gpu_command_buffer_stub.cc
+++ b/content/common/gpu/gpu_command_buffer_stub.cc
@@ -865,8 +865,6 @@
void GpuCommandBufferStub::OnRetireSyncPoint(uint32 sync_point) {
DCHECK(!sync_points_.empty() && sync_points_.front() == sync_point);
sync_points_.pop_front();
- if (context_group_->mailbox_manager()->UsesSync() && MakeCurrent())
- context_group_->mailbox_manager()->PushTextureUpdates();
GpuChannelManager* manager = channel_->gpu_channel_manager();
manager->sync_point_manager()->RetireSyncPoint(sync_point);
}
diff --git a/content/content_app_both.target.darwin-arm.mk b/content/content_app_both.target.darwin-arm.mk
index 4e9a581..3877a4b 100644
--- a/content/content_app_both.target.darwin-arm.mk
+++ b/content/content_app_both.target.darwin-arm.mk
@@ -119,6 +119,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -259,6 +260,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/content/content_app_both.target.darwin-arm64.mk b/content/content_app_both.target.darwin-arm64.mk
index bd70b27..77b3ca9 100644
--- a/content/content_app_both.target.darwin-arm64.mk
+++ b/content/content_app_both.target.darwin-arm64.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -236,6 +237,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/content/content_app_both.target.darwin-mips.mk b/content/content_app_both.target.darwin-mips.mk
index 79ddeeb..79e2031 100644
--- a/content/content_app_both.target.darwin-mips.mk
+++ b/content/content_app_both.target.darwin-mips.mk
@@ -111,6 +111,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -243,6 +244,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/content/content_app_both.target.darwin-x86.mk b/content/content_app_both.target.darwin-x86.mk
index 1502beb..7d43185 100644
--- a/content/content_app_both.target.darwin-x86.mk
+++ b/content/content_app_both.target.darwin-x86.mk
@@ -113,6 +113,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -246,6 +247,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/content/content_app_both.target.darwin-x86_64.mk b/content/content_app_both.target.darwin-x86_64.mk
index b1eeebc..c89b5ce 100644
--- a/content/content_app_both.target.darwin-x86_64.mk
+++ b/content/content_app_both.target.darwin-x86_64.mk
@@ -113,6 +113,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -246,6 +247,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/content/content_app_both.target.linux-arm.mk b/content/content_app_both.target.linux-arm.mk
index 4e9a581..3877a4b 100644
--- a/content/content_app_both.target.linux-arm.mk
+++ b/content/content_app_both.target.linux-arm.mk
@@ -119,6 +119,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -259,6 +260,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/content/content_app_both.target.linux-arm64.mk b/content/content_app_both.target.linux-arm64.mk
index bd70b27..77b3ca9 100644
--- a/content/content_app_both.target.linux-arm64.mk
+++ b/content/content_app_both.target.linux-arm64.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -236,6 +237,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/content/content_app_both.target.linux-mips.mk b/content/content_app_both.target.linux-mips.mk
index 79ddeeb..79e2031 100644
--- a/content/content_app_both.target.linux-mips.mk
+++ b/content/content_app_both.target.linux-mips.mk
@@ -111,6 +111,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -243,6 +244,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/content/content_app_both.target.linux-x86.mk b/content/content_app_both.target.linux-x86.mk
index 1502beb..7d43185 100644
--- a/content/content_app_both.target.linux-x86.mk
+++ b/content/content_app_both.target.linux-x86.mk
@@ -113,6 +113,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -246,6 +247,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/content/content_app_both.target.linux-x86_64.mk b/content/content_app_both.target.linux-x86_64.mk
index b1eeebc..c89b5ce 100644
--- a/content/content_app_both.target.linux-x86_64.mk
+++ b/content/content_app_both.target.linux-x86_64.mk
@@ -113,6 +113,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -246,6 +247,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/content/content_browser.target.darwin-arm.mk b/content/content_browser.target.darwin-arm.mk
index 9cf4bbe..071b79d 100644
--- a/content/content_browser.target.darwin-arm.mk
+++ b/content/content_browser.target.darwin-arm.mk
@@ -643,6 +643,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DPROTOBUF_USE_DLLS' \
@@ -831,6 +832,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DPROTOBUF_USE_DLLS' \
diff --git a/content/content_browser.target.darwin-arm64.mk b/content/content_browser.target.darwin-arm64.mk
index c81c139..5aba8d5 100644
--- a/content/content_browser.target.darwin-arm64.mk
+++ b/content/content_browser.target.darwin-arm64.mk
@@ -632,6 +632,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DPROTOBUF_USE_DLLS' \
@@ -808,6 +809,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DPROTOBUF_USE_DLLS' \
diff --git a/content/content_browser.target.darwin-mips.mk b/content/content_browser.target.darwin-mips.mk
index c557bc1..8eed34f 100644
--- a/content/content_browser.target.darwin-mips.mk
+++ b/content/content_browser.target.darwin-mips.mk
@@ -635,6 +635,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DPROTOBUF_USE_DLLS' \
@@ -815,6 +816,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DPROTOBUF_USE_DLLS' \
diff --git a/content/content_browser.target.darwin-x86.mk b/content/content_browser.target.darwin-x86.mk
index 15173ba..bafeeb5 100644
--- a/content/content_browser.target.darwin-x86.mk
+++ b/content/content_browser.target.darwin-x86.mk
@@ -637,6 +637,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DPROTOBUF_USE_DLLS' \
@@ -818,6 +819,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DPROTOBUF_USE_DLLS' \
diff --git a/content/content_browser.target.darwin-x86_64.mk b/content/content_browser.target.darwin-x86_64.mk
index 655c912..d43d5b5 100644
--- a/content/content_browser.target.darwin-x86_64.mk
+++ b/content/content_browser.target.darwin-x86_64.mk
@@ -637,6 +637,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DPROTOBUF_USE_DLLS' \
@@ -818,6 +819,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DPROTOBUF_USE_DLLS' \
diff --git a/content/content_browser.target.linux-arm.mk b/content/content_browser.target.linux-arm.mk
index 9cf4bbe..071b79d 100644
--- a/content/content_browser.target.linux-arm.mk
+++ b/content/content_browser.target.linux-arm.mk
@@ -643,6 +643,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DPROTOBUF_USE_DLLS' \
@@ -831,6 +832,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DPROTOBUF_USE_DLLS' \
diff --git a/content/content_browser.target.linux-arm64.mk b/content/content_browser.target.linux-arm64.mk
index c81c139..5aba8d5 100644
--- a/content/content_browser.target.linux-arm64.mk
+++ b/content/content_browser.target.linux-arm64.mk
@@ -632,6 +632,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DPROTOBUF_USE_DLLS' \
@@ -808,6 +809,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DPROTOBUF_USE_DLLS' \
diff --git a/content/content_browser.target.linux-mips.mk b/content/content_browser.target.linux-mips.mk
index c557bc1..8eed34f 100644
--- a/content/content_browser.target.linux-mips.mk
+++ b/content/content_browser.target.linux-mips.mk
@@ -635,6 +635,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DPROTOBUF_USE_DLLS' \
@@ -815,6 +816,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DPROTOBUF_USE_DLLS' \
diff --git a/content/content_browser.target.linux-x86.mk b/content/content_browser.target.linux-x86.mk
index 15173ba..bafeeb5 100644
--- a/content/content_browser.target.linux-x86.mk
+++ b/content/content_browser.target.linux-x86.mk
@@ -637,6 +637,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DPROTOBUF_USE_DLLS' \
@@ -818,6 +819,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DPROTOBUF_USE_DLLS' \
diff --git a/content/content_browser.target.linux-x86_64.mk b/content/content_browser.target.linux-x86_64.mk
index 655c912..d43d5b5 100644
--- a/content/content_browser.target.linux-x86_64.mk
+++ b/content/content_browser.target.linux-x86_64.mk
@@ -637,6 +637,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DPROTOBUF_USE_DLLS' \
@@ -818,6 +819,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DPROTOBUF_USE_DLLS' \
diff --git a/content/content_child.target.darwin-arm.mk b/content/content_child.target.darwin-arm.mk
index 83e3d57..2d5924d 100644
--- a/content/content_child.target.darwin-arm.mk
+++ b/content/content_child.target.darwin-arm.mk
@@ -215,6 +215,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -368,6 +369,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/content/content_child.target.darwin-arm64.mk b/content/content_child.target.darwin-arm64.mk
index 7ab2962..aced877 100644
--- a/content/content_child.target.darwin-arm64.mk
+++ b/content/content_child.target.darwin-arm64.mk
@@ -204,6 +204,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -345,6 +346,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/content/content_child.target.darwin-mips.mk b/content/content_child.target.darwin-mips.mk
index 178a440..b26cd9e 100644
--- a/content/content_child.target.darwin-mips.mk
+++ b/content/content_child.target.darwin-mips.mk
@@ -207,6 +207,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -352,6 +353,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/content/content_child.target.darwin-x86.mk b/content/content_child.target.darwin-x86.mk
index 11c2af0..7ebfa63 100644
--- a/content/content_child.target.darwin-x86.mk
+++ b/content/content_child.target.darwin-x86.mk
@@ -210,6 +210,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -356,6 +357,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/content/content_child.target.darwin-x86_64.mk b/content/content_child.target.darwin-x86_64.mk
index 41a2c25..cb3eb60 100644
--- a/content/content_child.target.darwin-x86_64.mk
+++ b/content/content_child.target.darwin-x86_64.mk
@@ -209,6 +209,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -355,6 +356,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/content/content_child.target.linux-arm.mk b/content/content_child.target.linux-arm.mk
index 83e3d57..2d5924d 100644
--- a/content/content_child.target.linux-arm.mk
+++ b/content/content_child.target.linux-arm.mk
@@ -215,6 +215,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -368,6 +369,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/content/content_child.target.linux-arm64.mk b/content/content_child.target.linux-arm64.mk
index 7ab2962..aced877 100644
--- a/content/content_child.target.linux-arm64.mk
+++ b/content/content_child.target.linux-arm64.mk
@@ -204,6 +204,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -345,6 +346,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/content/content_child.target.linux-mips.mk b/content/content_child.target.linux-mips.mk
index 178a440..b26cd9e 100644
--- a/content/content_child.target.linux-mips.mk
+++ b/content/content_child.target.linux-mips.mk
@@ -207,6 +207,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -352,6 +353,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/content/content_child.target.linux-x86.mk b/content/content_child.target.linux-x86.mk
index 11c2af0..7ebfa63 100644
--- a/content/content_child.target.linux-x86.mk
+++ b/content/content_child.target.linux-x86.mk
@@ -210,6 +210,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -356,6 +357,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/content/content_child.target.linux-x86_64.mk b/content/content_child.target.linux-x86_64.mk
index 41a2c25..cb3eb60 100644
--- a/content/content_child.target.linux-x86_64.mk
+++ b/content/content_child.target.linux-x86_64.mk
@@ -209,6 +209,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -355,6 +356,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/content/content_common.target.darwin-arm.mk b/content/content_common.target.darwin-arm.mk
index 60047ae..00a17a9 100644
--- a/content/content_common.target.darwin-arm.mk
+++ b/content/content_common.target.darwin-arm.mk
@@ -270,6 +270,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMEDIA_DISABLE_LIBVPX' \
@@ -447,6 +448,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMEDIA_DISABLE_LIBVPX' \
diff --git a/content/content_common.target.darwin-arm64.mk b/content/content_common.target.darwin-arm64.mk
index cea1b3f..c8c789a 100644
--- a/content/content_common.target.darwin-arm64.mk
+++ b/content/content_common.target.darwin-arm64.mk
@@ -259,6 +259,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMEDIA_DISABLE_LIBVPX' \
@@ -424,6 +425,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMEDIA_DISABLE_LIBVPX' \
diff --git a/content/content_common.target.darwin-mips.mk b/content/content_common.target.darwin-mips.mk
index e95c0cc..6a9d213 100644
--- a/content/content_common.target.darwin-mips.mk
+++ b/content/content_common.target.darwin-mips.mk
@@ -262,6 +262,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMEDIA_DISABLE_LIBVPX' \
@@ -431,6 +432,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMEDIA_DISABLE_LIBVPX' \
diff --git a/content/content_common.target.darwin-x86.mk b/content/content_common.target.darwin-x86.mk
index 146362e..d5c3e14 100644
--- a/content/content_common.target.darwin-x86.mk
+++ b/content/content_common.target.darwin-x86.mk
@@ -264,6 +264,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMEDIA_DISABLE_LIBVPX' \
@@ -434,6 +435,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMEDIA_DISABLE_LIBVPX' \
diff --git a/content/content_common.target.darwin-x86_64.mk b/content/content_common.target.darwin-x86_64.mk
index 289051c..439db7c 100644
--- a/content/content_common.target.darwin-x86_64.mk
+++ b/content/content_common.target.darwin-x86_64.mk
@@ -264,6 +264,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMEDIA_DISABLE_LIBVPX' \
@@ -434,6 +435,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMEDIA_DISABLE_LIBVPX' \
diff --git a/content/content_common.target.linux-arm.mk b/content/content_common.target.linux-arm.mk
index 60047ae..00a17a9 100644
--- a/content/content_common.target.linux-arm.mk
+++ b/content/content_common.target.linux-arm.mk
@@ -270,6 +270,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMEDIA_DISABLE_LIBVPX' \
@@ -447,6 +448,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMEDIA_DISABLE_LIBVPX' \
diff --git a/content/content_common.target.linux-arm64.mk b/content/content_common.target.linux-arm64.mk
index cea1b3f..c8c789a 100644
--- a/content/content_common.target.linux-arm64.mk
+++ b/content/content_common.target.linux-arm64.mk
@@ -259,6 +259,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMEDIA_DISABLE_LIBVPX' \
@@ -424,6 +425,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMEDIA_DISABLE_LIBVPX' \
diff --git a/content/content_common.target.linux-mips.mk b/content/content_common.target.linux-mips.mk
index e95c0cc..6a9d213 100644
--- a/content/content_common.target.linux-mips.mk
+++ b/content/content_common.target.linux-mips.mk
@@ -262,6 +262,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMEDIA_DISABLE_LIBVPX' \
@@ -431,6 +432,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMEDIA_DISABLE_LIBVPX' \
diff --git a/content/content_common.target.linux-x86.mk b/content/content_common.target.linux-x86.mk
index 146362e..d5c3e14 100644
--- a/content/content_common.target.linux-x86.mk
+++ b/content/content_common.target.linux-x86.mk
@@ -264,6 +264,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMEDIA_DISABLE_LIBVPX' \
@@ -434,6 +435,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMEDIA_DISABLE_LIBVPX' \
diff --git a/content/content_common.target.linux-x86_64.mk b/content/content_common.target.linux-x86_64.mk
index 289051c..439db7c 100644
--- a/content/content_common.target.linux-x86_64.mk
+++ b/content/content_common.target.linux-x86_64.mk
@@ -264,6 +264,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMEDIA_DISABLE_LIBVPX' \
@@ -434,6 +435,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMEDIA_DISABLE_LIBVPX' \
diff --git a/content/content_gpu.target.darwin-arm.mk b/content/content_gpu.target.darwin-arm.mk
index 0c4b0af..4b71a29 100644
--- a/content/content_gpu.target.darwin-arm.mk
+++ b/content/content_gpu.target.darwin-arm.mk
@@ -113,6 +113,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -250,6 +251,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/content/content_gpu.target.darwin-arm64.mk b/content/content_gpu.target.darwin-arm64.mk
index 1b1f171..97b2364 100644
--- a/content/content_gpu.target.darwin-arm64.mk
+++ b/content/content_gpu.target.darwin-arm64.mk
@@ -102,6 +102,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -227,6 +228,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/content/content_gpu.target.darwin-mips.mk b/content/content_gpu.target.darwin-mips.mk
index dab9afe..3e23157 100644
--- a/content/content_gpu.target.darwin-mips.mk
+++ b/content/content_gpu.target.darwin-mips.mk
@@ -105,6 +105,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -234,6 +235,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/content/content_gpu.target.darwin-x86.mk b/content/content_gpu.target.darwin-x86.mk
index fd6ec5d..b1e29c5 100644
--- a/content/content_gpu.target.darwin-x86.mk
+++ b/content/content_gpu.target.darwin-x86.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -239,6 +240,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/content/content_gpu.target.darwin-x86_64.mk b/content/content_gpu.target.darwin-x86_64.mk
index 6d5e024..5ee578c 100644
--- a/content/content_gpu.target.darwin-x86_64.mk
+++ b/content/content_gpu.target.darwin-x86_64.mk
@@ -107,6 +107,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -237,6 +238,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/content/content_gpu.target.linux-arm.mk b/content/content_gpu.target.linux-arm.mk
index 0c4b0af..4b71a29 100644
--- a/content/content_gpu.target.linux-arm.mk
+++ b/content/content_gpu.target.linux-arm.mk
@@ -113,6 +113,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -250,6 +251,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/content/content_gpu.target.linux-arm64.mk b/content/content_gpu.target.linux-arm64.mk
index 1b1f171..97b2364 100644
--- a/content/content_gpu.target.linux-arm64.mk
+++ b/content/content_gpu.target.linux-arm64.mk
@@ -102,6 +102,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -227,6 +228,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/content/content_gpu.target.linux-mips.mk b/content/content_gpu.target.linux-mips.mk
index dab9afe..3e23157 100644
--- a/content/content_gpu.target.linux-mips.mk
+++ b/content/content_gpu.target.linux-mips.mk
@@ -105,6 +105,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -234,6 +235,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/content/content_gpu.target.linux-x86.mk b/content/content_gpu.target.linux-x86.mk
index fd6ec5d..b1e29c5 100644
--- a/content/content_gpu.target.linux-x86.mk
+++ b/content/content_gpu.target.linux-x86.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -239,6 +240,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/content/content_gpu.target.linux-x86_64.mk b/content/content_gpu.target.linux-x86_64.mk
index 6d5e024..5ee578c 100644
--- a/content/content_gpu.target.linux-x86_64.mk
+++ b/content/content_gpu.target.linux-x86_64.mk
@@ -107,6 +107,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -237,6 +238,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/content/content_renderer.target.darwin-arm.mk b/content/content_renderer.target.darwin-arm.mk
index 18d1768..2190fa7 100644
--- a/content/content_renderer.target.darwin-arm.mk
+++ b/content/content_renderer.target.darwin-arm.mk
@@ -351,6 +351,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -538,6 +539,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
diff --git a/content/content_renderer.target.darwin-arm64.mk b/content/content_renderer.target.darwin-arm64.mk
index 1098439..19b000f 100644
--- a/content/content_renderer.target.darwin-arm64.mk
+++ b/content/content_renderer.target.darwin-arm64.mk
@@ -340,6 +340,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -515,6 +516,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
diff --git a/content/content_renderer.target.darwin-mips.mk b/content/content_renderer.target.darwin-mips.mk
index dfb9c6b..493ecbf 100644
--- a/content/content_renderer.target.darwin-mips.mk
+++ b/content/content_renderer.target.darwin-mips.mk
@@ -343,6 +343,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -522,6 +523,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
diff --git a/content/content_renderer.target.darwin-x86.mk b/content/content_renderer.target.darwin-x86.mk
index fda0d59..974d97c 100644
--- a/content/content_renderer.target.darwin-x86.mk
+++ b/content/content_renderer.target.darwin-x86.mk
@@ -345,6 +345,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -525,6 +526,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
diff --git a/content/content_renderer.target.darwin-x86_64.mk b/content/content_renderer.target.darwin-x86_64.mk
index 6c8ded8..b02977c 100644
--- a/content/content_renderer.target.darwin-x86_64.mk
+++ b/content/content_renderer.target.darwin-x86_64.mk
@@ -345,6 +345,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -525,6 +526,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
diff --git a/content/content_renderer.target.linux-arm.mk b/content/content_renderer.target.linux-arm.mk
index 18d1768..2190fa7 100644
--- a/content/content_renderer.target.linux-arm.mk
+++ b/content/content_renderer.target.linux-arm.mk
@@ -351,6 +351,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -538,6 +539,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
diff --git a/content/content_renderer.target.linux-arm64.mk b/content/content_renderer.target.linux-arm64.mk
index 1098439..19b000f 100644
--- a/content/content_renderer.target.linux-arm64.mk
+++ b/content/content_renderer.target.linux-arm64.mk
@@ -340,6 +340,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -515,6 +516,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
diff --git a/content/content_renderer.target.linux-mips.mk b/content/content_renderer.target.linux-mips.mk
index dfb9c6b..493ecbf 100644
--- a/content/content_renderer.target.linux-mips.mk
+++ b/content/content_renderer.target.linux-mips.mk
@@ -343,6 +343,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -522,6 +523,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
diff --git a/content/content_renderer.target.linux-x86.mk b/content/content_renderer.target.linux-x86.mk
index fda0d59..974d97c 100644
--- a/content/content_renderer.target.linux-x86.mk
+++ b/content/content_renderer.target.linux-x86.mk
@@ -345,6 +345,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -525,6 +526,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
diff --git a/content/content_renderer.target.linux-x86_64.mk b/content/content_renderer.target.linux-x86_64.mk
index 6c8ded8..b02977c 100644
--- a/content/content_renderer.target.linux-x86_64.mk
+++ b/content/content_renderer.target.linux-x86_64.mk
@@ -345,6 +345,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -525,6 +526,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 4f3744d..94b2a85 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -838,6 +838,21 @@
'../third_party/webrtc/modules/modules.gyp:desktop_capture',
],
}],
+ ['enable_webrtc==1 and OS=="mac"', {
+ 'variables': {
+ 'libpeer_target_type%': 'static_library',
+ },
+ 'conditions': [
+ ['libpeer_target_type!="static_library"', {
+ 'copies': [{
+ 'destination': '<(PRODUCT_DIR)/Libraries',
+ 'files': [
+ '<(PRODUCT_DIR)/libpeerconnection.so',
+ ],
+ }],
+ }],
+ ],
+ }],
['enable_webrtc==1 and chromeos==1', {
'sources': [
'browser/media/capture/desktop_capture_device_aura_unittest.cc',
diff --git a/content/content_unittests.isolate b/content/content_unittests.isolate
index 7f4f9c4..87a4ee9 100644
--- a/content/content_unittests.isolate
+++ b/content/content_unittests.isolate
@@ -56,6 +56,13 @@
],
},
}],
+ ['OS=="linux" and libpeer_target_type=="loadable_module"', {
+ 'variables': {
+ 'isolate_dependency_tracked': [
+ '<(PRODUCT_DIR)/lib/libpeerconnection.so',
+ ],
+ },
+ }],
['OS=="mac"', {
'variables': {
'command': [
@@ -91,6 +98,13 @@
],
},
}],
+ ['OS=="win" and libpeer_target_type=="loadable_module"', {
+ 'variables': {
+ 'isolate_dependency_tracked': [
+ '<(PRODUCT_DIR)/libpeerconnection.dll',
+ ],
+ },
+ }],
],
'includes': [
'../base/base.isolate',
diff --git a/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java b/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java
index cd5e675..973c972 100644
--- a/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java
+++ b/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java
@@ -130,6 +130,14 @@
@Override
public void run() {
try {
+ // CommandLine must be initialized before others, e.g., Linker.isUsed()
+ // may check the command line options.
+ synchronized (mMainThread) {
+ while (mCommandLineParams == null) {
+ mMainThread.wait();
+ }
+ }
+ CommandLine.init(mCommandLineParams);
boolean useLinker = Linker.isUsed();
boolean requestedSharedRelro = false;
if (useLinker) {
@@ -138,23 +146,16 @@
mMainThread.wait();
}
}
- if (mLinkerParams != null) {
- if (mLinkerParams.mWaitForSharedRelro) {
- requestedSharedRelro = true;
- Linker.initServiceProcess(mLinkerParams.mBaseLoadAddress);
- } else {
- Linker.disableSharedRelros();
- }
- Linker.setTestRunnerClassName(mLinkerParams.mTestRunnerClassName);
+ assert mLinkerParams != null;
+ if (mLinkerParams.mWaitForSharedRelro) {
+ requestedSharedRelro = true;
+ Linker.initServiceProcess(mLinkerParams.mBaseLoadAddress);
+ } else {
+ Linker.disableSharedRelros();
}
+ Linker.setTestRunnerClassName(mLinkerParams.mTestRunnerClassName);
}
boolean isLoaded = false;
- synchronized (mMainThread) {
- while (mCommandLineParams == null) {
- mMainThread.wait();
- }
- }
- CommandLine.init(mCommandLineParams);
if (CommandLine.getInstance().hasSwitch(
BaseSwitches.RENDERER_WAIT_FOR_JAVA_DEBUGGER)) {
android.os.Debug.waitForDebugger();
@@ -249,9 +250,9 @@
synchronized (mMainThread) {
mCommandLineParams = intent.getStringArrayExtra(
ChildProcessConnection.EXTRA_COMMAND_LINE);
- mLinkerParams = null;
- if (Linker.isUsed())
- mLinkerParams = new ChromiumLinkerParams(intent);
+ // mLinkerParams is never used if Linker.isUsed() returns false.
+ // See onCreate().
+ mLinkerParams = new ChromiumLinkerParams(intent);
mIsBound = true;
mMainThread.notifyAll();
}
diff --git a/content/renderer/media/media_stream_audio_level_calculator.cc b/content/renderer/media/media_stream_audio_level_calculator.cc
index a136e32..9994b69 100644
--- a/content/renderer/media/media_stream_audio_level_calculator.cc
+++ b/content/renderer/media/media_stream_audio_level_calculator.cc
@@ -38,9 +38,11 @@
MediaStreamAudioLevelCalculator::~MediaStreamAudioLevelCalculator() {
}
-int MediaStreamAudioLevelCalculator::Calculate(const int16* audio_data,
- int number_of_channels,
- int number_of_frames) {
+int MediaStreamAudioLevelCalculator::Calculate(
+ const int16* audio_data,
+ int number_of_channels,
+ int number_of_frames,
+ bool force_report_nonzero_energy) {
DCHECK(thread_checker_.CalledOnValidThread());
// |level_| is updated every 10 callbacks. For the case where callback comes
// every 10ms, |level_| will be updated approximately every 100ms.
@@ -50,7 +52,8 @@
max_amplitude_ = std::max(max_amplitude_, max);
if (counter_++ == kUpdateFrequency) {
- level_ = max_amplitude_;
+ level_ = (max_amplitude_ == 0 ?
+ force_report_nonzero_energy : max_amplitude_);
// Decay the absolute maximum amplitude by 1/4.
max_amplitude_ >>= 2;
diff --git a/content/renderer/media/media_stream_audio_level_calculator.h b/content/renderer/media/media_stream_audio_level_calculator.h
index 41c9c34..48dda4c 100644
--- a/content/renderer/media/media_stream_audio_level_calculator.h
+++ b/content/renderer/media/media_stream_audio_level_calculator.h
@@ -21,8 +21,14 @@
// Calculates the signal level of the audio data.
// Returns the absolute value of the amplitude of the signal.
+ // |force_report_nonzero_energy| is a flag forcing the calculator to
+ // report nonzero energy even if the energy of the processed audio is zero.
+ // Since |audio_data| is post processed data, and the audio processing might
+ // zero all the audio data, when the caller detects the pre processed data
+ // contain energy, it could pass |force_report_nonzero_energy| as true to
+ // force calculator to report 1 as energy when |audio_data| is all zero.
int Calculate(const int16* audio_data, int number_of_channels,
- int number_of_frames);
+ int number_of_frames, bool force_report_nonzero_energy);
private:
// Used to DCHECK that the constructor and Calculate() are always called on
diff --git a/content/renderer/media/media_stream_audio_processor.cc b/content/renderer/media/media_stream_audio_processor.cc
index 4efc507..ac41187 100644
--- a/content/renderer/media/media_stream_audio_processor.cc
+++ b/content/renderer/media/media_stream_audio_processor.cc
@@ -19,6 +19,7 @@
#include "media/base/audio_fifo.h"
#include "media/base/channel_layout.h"
#include "third_party/WebKit/public/platform/WebMediaConstraints.h"
+#include "third_party/libjingle/overrides/init_webrtc.h"
#include "third_party/libjingle/source/talk/app/webrtc/mediaconstraintsinterface.h"
#include "third_party/webrtc/modules/audio_processing/typing_detection.h"
@@ -423,7 +424,7 @@
#endif
// Create and configure the webrtc::AudioProcessing.
- audio_processing_.reset(webrtc::AudioProcessing::Create(config));
+ audio_processing_.reset(CreateWebRtcAudioProcessing(config));
// Enable the audio processing components.
if (echo_cancellation) {
diff --git a/content/renderer/media/media_stream_audio_processor_options.cc b/content/renderer/media/media_stream_audio_processor_options.cc
index e386308..8462a65 100644
--- a/content/renderer/media/media_stream_audio_processor_options.cc
+++ b/content/renderer/media/media_stream_audio_processor_options.cc
@@ -251,15 +251,10 @@
void StartEchoCancellationDump(AudioProcessing* audio_processing,
base::File aec_dump_file) {
DCHECK(aec_dump_file.IsValid());
-
- FILE* stream = base::FileToFILE(aec_dump_file.Pass(), "w");
- if (!stream) {
- LOG(ERROR) << "Failed to open AEC dump file";
- return;
- }
-
- if (audio_processing->StartDebugRecording(stream))
+ if (audio_processing->StartDebugRecordingForPlatformFile(
+ aec_dump_file.TakePlatformFile())) {
DLOG(ERROR) << "Fail to start AEC debug recording";
+ }
}
void StopEchoCancellationDump(AudioProcessing* audio_processing) {
diff --git a/content/renderer/media/webaudio_capturer_source.cc b/content/renderer/media/webaudio_capturer_source.cc
index 2095ac6..e175ad2 100644
--- a/content/renderer/media/webaudio_capturer_source.cc
+++ b/content/renderer/media/webaudio_capturer_source.cc
@@ -127,7 +127,7 @@
params_.bits_per_sample() / 8,
audio_data_.get());
track_->Capture(audio_data_.get(), delay, volume, key_pressed,
- need_audio_processing);
+ need_audio_processing, false);
}
}
diff --git a/content/renderer/media/webrtc/webrtc_local_audio_track_adapter_unittest.cc b/content/renderer/media/webrtc/webrtc_local_audio_track_adapter_unittest.cc
index a145c43..8a53608 100644
--- a/content/renderer/media/webrtc/webrtc_local_audio_track_adapter_unittest.cc
+++ b/content/renderer/media/webrtc/webrtc_local_audio_track_adapter_unittest.cc
@@ -74,14 +74,14 @@
EXPECT_CALL(*sink,
OnData(_, 16, params_.sample_rate(), params_.channels(),
params_.frames_per_buffer()));
- track_->Capture(data.get(), base::TimeDelta(), 255, false, false);
+ track_->Capture(data.get(), base::TimeDelta(), 255, false, false, false);
// Remove the sink from the webrtc track.
webrtc_track->RemoveSink(sink.get());
sink.reset();
// Verify that no more callback gets into the sink.
- track_->Capture(data.get(), base::TimeDelta(), 255, false, false);
+ track_->Capture(data.get(), base::TimeDelta(), 255, false, false, false);
}
TEST_F(WebRtcLocalAudioTrackAdapterTest, GetSignalLevel) {
diff --git a/content/renderer/media/webrtc_audio_capturer.cc b/content/renderer/media/webrtc_audio_capturer.cc
index 8635f4d..e313385 100644
--- a/content/renderer/media/webrtc_audio_capturer.cc
+++ b/content/renderer/media/webrtc_audio_capturer.cc
@@ -30,6 +30,20 @@
// The time between two audio power level samples.
const int kPowerMonitorLogIntervalSeconds = 10;
+// Method to check if any of the data in |audio_source| has energy.
+bool HasDataEnergy(const media::AudioBus& audio_source) {
+ for (int ch = 0; ch < audio_source.channels(); ++ch) {
+ const float* channel_ptr = audio_source.channel(ch);
+ for (int frame = 0; frame < audio_source.frames(); ++frame) {
+ if (channel_ptr[frame] != 0)
+ return true;
+ }
+ }
+
+ // All the data is zero.
+ return false;
+}
+
} // namespace
// Reference counted container of WebRtcLocalAudioTrack delegate.
@@ -44,14 +58,16 @@
base::TimeDelta delay,
double volume,
bool key_pressed,
- bool need_audio_processing) {
+ bool need_audio_processing,
+ bool force_report_nonzero_energy) {
base::AutoLock lock(lock_);
if (delegate_) {
delegate_->Capture(audio_data,
delay,
volume,
key_pressed,
- need_audio_processing);
+ need_audio_processing,
+ force_report_nonzero_energy);
}
}
@@ -514,6 +530,12 @@
audio_power_monitor_.Reset();
}
+ // Figure out if the pre-processed data has any energy or not, the
+ // information will be passed to the track to force the calculator
+ // to report energy in case the post-processed data is zeroed by the audio
+ // processing.
+ const bool force_report_nonzero_energy = HasDataEnergy(*audio_source);
+
// Push the data to the processor for processing.
audio_processor_->PushCaptureData(audio_source);
@@ -527,7 +549,7 @@
for (TrackList::ItemList::const_iterator it = tracks.begin();
it != tracks.end(); ++it) {
(*it)->Capture(output, audio_delay, current_volume, key_pressed,
- need_audio_processing);
+ need_audio_processing, force_report_nonzero_energy);
}
if (new_volume) {
diff --git a/content/renderer/media/webrtc_local_audio_track.cc b/content/renderer/media/webrtc_local_audio_track.cc
index d499233..99ada98 100644
--- a/content/renderer/media/webrtc_local_audio_track.cc
+++ b/content/renderer/media/webrtc_local_audio_track.cc
@@ -42,13 +42,14 @@
base::TimeDelta delay,
int volume,
bool key_pressed,
- bool need_audio_processing) {
+ bool need_audio_processing,
+ bool force_report_nonzero_energy) {
DCHECK(capture_thread_checker_.CalledOnValidThread());
// Calculate the signal level regardless if the track is disabled or enabled.
int signal_level = level_calculator_->Calculate(
audio_data, audio_parameters_.channels(),
- audio_parameters_.frames_per_buffer());
+ audio_parameters_.frames_per_buffer(), force_report_nonzero_energy);
adapter_->SetSignalLevel(signal_level);
scoped_refptr<WebRtcAudioCapturer> capturer;
diff --git a/content/renderer/media/webrtc_local_audio_track.h b/content/renderer/media/webrtc_local_audio_track.h
index c2cb81b..97be7ff 100644
--- a/content/renderer/media/webrtc_local_audio_track.h
+++ b/content/renderer/media/webrtc_local_audio_track.h
@@ -70,7 +70,8 @@
base::TimeDelta delay,
int volume,
bool key_pressed,
- bool need_audio_processing);
+ bool need_audio_processing,
+ bool force_report_nonzero_energy);
// Method called by the capturer to set the audio parameters used by source
// of the capture data..
diff --git a/content/renderer/p2p/ipc_socket_factory.cc b/content/renderer/p2p/ipc_socket_factory.cc
index 3055016..0c666f4 100644
--- a/content/renderer/p2p/ipc_socket_factory.cc
+++ b/content/renderer/p2p/ipc_socket_factory.cc
@@ -11,6 +11,7 @@
#include "base/debug/trace_event.h"
#include "base/message_loop/message_loop.h"
#include "base/message_loop/message_loop_proxy.h"
+#include "base/metrics/histogram.h"
#include "base/strings/stringprintf.h"
#include "base/threading/non_thread_safe.h"
#include "content/renderer/media/webrtc_logging.h"
@@ -113,6 +114,10 @@
IS_ERROR,
};
+ // Increment the counter for consecutive bytes discarded as socket is running
+ // out of buffer.
+ void IncrementDiscardCounters(size_t bytes_discarded);
+
// Update trace of send throttling internal state. This should be called
// immediately after any changes to |send_bytes_available_| and/or
// |in_flight_packet_sizes_|.
@@ -160,6 +165,15 @@
int error_;
int options_[P2P_SOCKET_OPT_MAX];
+ // Track the maximum and current consecutive bytes discarded due to not enough
+ // send_bytes_available_.
+ size_t max_discard_bytes_sequence_;
+ size_t current_discard_bytes_sequence_;
+
+ // Track the total number of packets and the number of packets discarded.
+ size_t packets_discarded_;
+ size_t total_packets_;
+
DISALLOW_COPY_AND_ASSIGN(IpcPacketSocket);
};
@@ -195,7 +209,11 @@
state_(IS_UNINITIALIZED),
send_bytes_available_(kMaximumInFlightBytes),
writable_signal_expected_(false),
- error_(0) {
+ error_(0),
+ max_discard_bytes_sequence_(0),
+ current_discard_bytes_sequence_(0),
+ packets_discarded_(0),
+ total_packets_(0) {
COMPILE_ASSERT(kMaximumInFlightBytes > 0, would_send_at_zero_rate);
std::fill_n(options_, static_cast<int> (P2P_SOCKET_OPT_MAX),
kDefaultNonSetOptionValue);
@@ -206,6 +224,14 @@
state_ == IS_ERROR) {
Close();
}
+
+ UMA_HISTOGRAM_COUNTS_10000("WebRTC.ApplicationMaxConsecutiveBytesDiscard",
+ max_discard_bytes_sequence_);
+
+ if (total_packets_ > 0) {
+ UMA_HISTOGRAM_PERCENTAGE("WebRTC.ApplicationPercentPacketsDiscarded",
+ (packets_discarded_ * 100) / total_packets_);
+ }
}
void IpcPacketSocket::TraceSendThrottlingState() const {
@@ -215,6 +241,15 @@
in_flight_packet_sizes_.size());
}
+void IpcPacketSocket::IncrementDiscardCounters(size_t bytes_discarded) {
+ current_discard_bytes_sequence_ += bytes_discarded;
+ packets_discarded_++;
+
+ if (current_discard_bytes_sequence_ > max_discard_bytes_sequence_) {
+ max_discard_bytes_sequence_ = current_discard_bytes_sequence_;
+ }
+}
+
bool IpcPacketSocket::Init(P2PSocketType type,
P2PSocketClientImpl* client,
const rtc::SocketAddress& local_address,
@@ -316,6 +351,8 @@
return 0;
}
+ total_packets_++;
+
if (data_size > send_bytes_available_) {
TRACE_EVENT_INSTANT1("p2p", "MaxPendingBytesWouldBlock",
TRACE_EVENT_SCOPE_THREAD,
@@ -330,7 +367,10 @@
}
error_ = EWOULDBLOCK;
+ IncrementDiscardCounters(data_size);
return -1;
+ } else {
+ current_discard_bytes_sequence_ = 0;
}
net::IPEndPoint address_chrome;
diff --git a/content/renderer/pepper/pepper_device_enumeration_host_helper.cc b/content/renderer/pepper/pepper_device_enumeration_host_helper.cc
index d983f4a..edc0840 100644
--- a/content/renderer/pepper/pepper_device_enumeration_host_helper.cc
+++ b/content/renderer/pepper/pepper_device_enumeration_host_helper.cc
@@ -46,6 +46,7 @@
// EnumerateDevicesCallbackBody() to ensure that we always call |callback|
// asynchronously.
sync_call_ = true;
+ DCHECK(owner_->delegate_);
request_id_ = owner_->delegate_->EnumerateDevices(
owner_->device_type_,
owner_->document_url_,
@@ -54,7 +55,7 @@
}
~ScopedRequest() {
- if (requested_) {
+ if (requested_ && owner_->delegate_) {
owner_->delegate_->StopEnumerateDevices(request_id_);
}
}
@@ -91,7 +92,7 @@
PepperDeviceEnumerationHostHelper::PepperDeviceEnumerationHostHelper(
ppapi::host::ResourceHost* resource_host,
- Delegate* delegate,
+ base::WeakPtr<Delegate> delegate,
PP_DeviceType_Dev device_type,
const GURL& document_url)
: resource_host_(resource_host),
diff --git a/content/renderer/pepper/pepper_device_enumeration_host_helper.h b/content/renderer/pepper/pepper_device_enumeration_host_helper.h
index 088d466..ea1a7fc 100644
--- a/content/renderer/pepper/pepper_device_enumeration_host_helper.h
+++ b/content/renderer/pepper/pepper_device_enumeration_host_helper.h
@@ -10,6 +10,7 @@
#include "base/basictypes.h"
#include "base/callback_forward.h"
#include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
#include "content/common/content_export.h"
#include "ppapi/c/dev/ppb_device_ref_dev.h"
#include "ppapi/host/host_message_context.h"
@@ -58,7 +59,7 @@
// |resource_host| and |delegate| must outlive this object.
PepperDeviceEnumerationHostHelper(ppapi::host::ResourceHost* resource_host,
- Delegate* delegate,
+ base::WeakPtr<Delegate> delegate,
PP_DeviceType_Dev device_type,
const GURL& document_url);
~PepperDeviceEnumerationHostHelper();
@@ -93,7 +94,7 @@
// Non-owning pointers.
ppapi::host::ResourceHost* resource_host_;
- Delegate* delegate_;
+ base::WeakPtr<Delegate> delegate_;
PP_DeviceType_Dev device_type_;
GURL document_url_;
diff --git a/content/renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc b/content/renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc
index a9b2579..6d9f325 100644
--- a/content/renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc
+++ b/content/renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc
@@ -7,6 +7,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/logging.h"
+#include "base/memory/weak_ptr.h"
#include "content/renderer/pepper/pepper_device_enumeration_host_helper.h"
#include "ppapi/c/pp_errors.h"
#include "ppapi/host/host_message_context.h"
@@ -24,7 +25,8 @@
namespace {
-class TestDelegate : public PepperDeviceEnumerationHostHelper::Delegate {
+class TestDelegate : public PepperDeviceEnumerationHostHelper::Delegate,
+ public base::SupportsWeakPtr<TestDelegate> {
public:
TestDelegate() : last_used_id_(0) {}
@@ -76,7 +78,7 @@
: ppapi_host_(&sink_, ppapi::PpapiPermissions()),
resource_host_(&ppapi_host_, 12345, 67890),
device_enumeration_(&resource_host_,
- &delegate_,
+ delegate_.AsWeakPtr(),
PP_DEVICETYPE_DEV_AUDIOCAPTURE,
GURL("http://example.com")) {}
diff --git a/content/renderer/pepper/pepper_media_device_manager.cc b/content/renderer/pepper/pepper_media_device_manager.cc
index 0d54964..676b2fb 100644
--- a/content/renderer/pepper/pepper_media_device_manager.cc
+++ b/content/renderer/pepper/pepper_media_device_manager.cc
@@ -25,13 +25,14 @@
} // namespace
-PepperMediaDeviceManager* PepperMediaDeviceManager::GetForRenderFrame(
+base::WeakPtr<PepperMediaDeviceManager>
+PepperMediaDeviceManager::GetForRenderFrame(
RenderFrame* render_frame) {
PepperMediaDeviceManager* handler =
PepperMediaDeviceManager::Get(render_frame);
if (!handler)
handler = new PepperMediaDeviceManager(render_frame);
- return handler;
+ return handler->AsWeakPtr();
}
PepperMediaDeviceManager::PepperMediaDeviceManager(RenderFrame* render_frame)
diff --git a/content/renderer/pepper/pepper_media_device_manager.h b/content/renderer/pepper/pepper_media_device_manager.h
index b3d94e0..c9a9440 100644
--- a/content/renderer/pepper/pepper_media_device_manager.h
+++ b/content/renderer/pepper/pepper_media_device_manager.h
@@ -23,7 +23,8 @@
public RenderFrameObserverTracker<PepperMediaDeviceManager>,
public base::SupportsWeakPtr<PepperMediaDeviceManager> {
public:
- static PepperMediaDeviceManager* GetForRenderFrame(RenderFrame* render_frame);
+ static base::WeakPtr<PepperMediaDeviceManager> GetForRenderFrame(
+ RenderFrame* render_frame);
virtual ~PepperMediaDeviceManager();
// PepperDeviceEnumerationHostHelper::Delegate implementation:
diff --git a/content/renderer/pepper/pepper_platform_audio_input.cc b/content/renderer/pepper/pepper_platform_audio_input.cc
index b1d62f0..9b46120 100644
--- a/content/renderer/pepper/pepper_platform_audio_input.cc
+++ b/content/renderer/pepper/pepper_platform_audio_input.cc
@@ -289,7 +289,7 @@
RenderFrameImpl* const render_frame =
RenderFrameImpl::FromRoutingID(render_frame_id_);
return render_frame ?
- PepperMediaDeviceManager::GetForRenderFrame(render_frame) : NULL;
+ PepperMediaDeviceManager::GetForRenderFrame(render_frame).get() : NULL;
}
} // namespace content
diff --git a/content/renderer/pepper/pepper_platform_video_capture.cc b/content/renderer/pepper/pepper_platform_video_capture.cc
index f883d1b..0d011f3 100644
--- a/content/renderer/pepper/pepper_platform_video_capture.cc
+++ b/content/renderer/pepper/pepper_platform_video_capture.cc
@@ -152,7 +152,7 @@
RenderFrameImpl* const render_frame =
RenderFrameImpl::FromRoutingID(render_frame_id_);
return render_frame ?
- PepperMediaDeviceManager::GetForRenderFrame(render_frame) : NULL;
+ PepperMediaDeviceManager::GetForRenderFrame(render_frame).get() : NULL;
}
} // namespace content
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 43bac58..8f6f8e6 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -1070,13 +1070,9 @@
}
}
- // Unconsumed touchmove acks should never be throttled as they're required to
- // dispatch compositor-handled scroll gestures.
bool event_type_can_be_rate_limited =
input_event->type == WebInputEvent::MouseMove ||
- input_event->type == WebInputEvent::MouseWheel ||
- (input_event->type == WebInputEvent::TouchMove &&
- ack_result == INPUT_EVENT_ACK_STATE_CONSUMED);
+ input_event->type == WebInputEvent::MouseWheel;
bool frame_pending = compositor_ && compositor_->BeginMainFrameRequested();
diff --git a/google_apis/gcm/engine/connection_handler_impl.cc b/google_apis/gcm/engine/connection_handler_impl.cc
index 751b1cd..ccb6362 100644
--- a/google_apis/gcm/engine/connection_handler_impl.cc
+++ b/google_apis/gcm/engine/connection_handler_impl.cc
@@ -22,7 +22,13 @@
const int kVersionPacketLen = 1;
// # of bytes a tag packet consumes.
const int kTagPacketLen = 1;
-// Max # of bytes a length packet consumes.
+// Max # of bytes a length packet consumes. A Varint32 can consume up to 5 bytes
+// (the MSB in each byte is reserved for denoting whether more bytes follow).
+// But, the protocol only allows for 4KiB payloads, and the socket stream buffer
+// is only of size 8KiB. As such we should never need more than 2 bytes (max
+// value of 16KiB). Anything higher than that will result in an error, either
+// because the socket stream buffer overflowed or too many bytes were required
+// in the size packet.
const int kSizePacketLenMin = 1;
const int kSizePacketLenMax = 2;
@@ -321,7 +327,7 @@
}
bool need_another_byte = false;
- int prev_byte_count = input_stream_->ByteCount();
+ int prev_byte_count = input_stream_->UnreadByteCount();
{
CodedInputStream coded_input_stream(input_stream_.get());
if (!coded_input_stream.ReadVarint32(&message_size_))
@@ -332,12 +338,12 @@
DVLOG(1) << "Expecting another message size byte.";
if (prev_byte_count >= kSizePacketLenMax) {
// Already had enough bytes, something else went wrong.
- LOG(ERROR) << "Failed to process message size.";
- read_callback_.Run(scoped_ptr<google::protobuf::MessageLite>());
+ LOG(ERROR) << "Failed to process message size, too many bytes needed.";
+ connection_callback_.Run(net::ERR_FILE_TOO_BIG);
return;
}
// Back up by the amount read (should always be 1 byte).
- int bytes_read = prev_byte_count - input_stream_->ByteCount();
+ int bytes_read = prev_byte_count - input_stream_->UnreadByteCount();
DCHECK_EQ(bytes_read, 1);
input_stream_->BackUp(bytes_read);
WaitForData(MCS_FULL_SIZE);
@@ -367,8 +373,7 @@
return;
}
- if (!protobuf.get() ||
- input_stream_->GetState() != SocketInputStream::READY) {
+ if (input_stream_->GetState() != SocketInputStream::READY) {
LOG(ERROR) << "Failed to extract protobuf bytes of type "
<< static_cast<unsigned int>(message_tag_);
// Reset the connection.
@@ -376,6 +381,13 @@
return;
}
+ if (!protobuf.get()) {
+ LOG(ERROR) << "Received message of invalid type "
+ << static_cast<unsigned int>(message_tag_);
+ connection_callback_.Run(net::ERR_INVALID_ARGUMENT);
+ return;
+ }
+
{
CodedInputStream coded_input_stream(input_stream_.get());
if (!protobuf->ParsePartialFromCodedStream(&coded_input_stream)) {
diff --git a/google_apis/gcm/engine/connection_handler_impl_unittest.cc b/google_apis/gcm/engine/connection_handler_impl_unittest.cc
index 6b89644..4e3ef69 100644
--- a/google_apis/gcm/engine/connection_handler_impl_unittest.cc
+++ b/google_apis/gcm/engine/connection_handler_impl_unittest.cc
@@ -41,6 +41,7 @@
"this is a second long from that will result in a message > 128 bytes";
const char kDataMsgCategoryLong2[] =
"this is a second long category that will result in a message > 128 bytes";
+const uint8 kInvalidTag = 100; // An invalid tag.
// ---- Helpers for building messages. ----
@@ -136,8 +137,6 @@
ReadList mock_reads_;
WriteList mock_writes_;
scoped_ptr<net::DelayedSocketData> data_provider_;
- scoped_ptr<SocketInputStream> socket_input_stream_;
- scoped_ptr<SocketOutputStream> socket_output_stream_;
// The connection handler being tested.
scoped_ptr<ConnectionHandlerImpl> connection_handler_;
@@ -674,8 +673,8 @@
}
// Receive a message whose size field was corrupted and is larger than the
-// socket's buffer. Should fail gracefully.
-TEST_F(GCMConnectionHandlerImplTest, CorruptedSize) {
+// socket's buffer. Should fail gracefully with a size error.
+TEST_F(GCMConnectionHandlerImplTest, OutOfBuffer) {
std::string handshake_request = EncodeHandshakeRequest();
WriteList write_list(1, net::MockWrite(net::ASYNC,
handshake_request.c_str(),
@@ -705,5 +704,106 @@
EXPECT_EQ(net::ERR_FILE_TOO_BIG, last_error());
}
+// Receive a message whose size field was corrupted and takes more than two
+// bytes to encode. Should fail gracefully with a size error.
+TEST_F(GCMConnectionHandlerImplTest, InvalidSizePacket) {
+ std::string handshake_request = EncodeHandshakeRequest();
+ WriteList write_list(1, net::MockWrite(net::ASYNC,
+ handshake_request.c_str(),
+ handshake_request.size()));
+ std::string handshake_response = EncodeHandshakeResponse();
+
+ // Fill a string with 20000 character zero (which uses more than 2 bytes to
+ // encode the size packet).
+ std::string data_message_proto(20000, '0');
+ std::string data_message_pkt =
+ EncodePacket(kDataMessageStanzaTag, data_message_proto);
+ ReadList read_list;
+ read_list.push_back(net::MockRead(net::ASYNC,
+ handshake_response.c_str(),
+ handshake_response.size()));
+ read_list.push_back(net::MockRead(net::ASYNC,
+ data_message_pkt.c_str(),
+ data_message_pkt.size()));
+ BuildSocket(read_list, write_list);
+
+ ScopedMessage received_message;
+ Connect(&received_message);
+ WaitForMessage(); // The login send.
+ WaitForMessage(); // The login response.
+ received_message.reset();
+ WaitForMessage(); // The data message.
+ EXPECT_FALSE(received_message.get());
+ EXPECT_EQ(net::ERR_FILE_TOO_BIG, last_error());
+}
+
+// Make sure a message with an invalid tag is handled gracefully and resets
+// the connection with an invalid argument error.
+TEST_F(GCMConnectionHandlerImplTest, InvalidTag) {
+ std::string handshake_request = EncodeHandshakeRequest();
+ WriteList write_list(1, net::MockWrite(net::ASYNC,
+ handshake_request.c_str(),
+ handshake_request.size()));
+ std::string handshake_response = EncodeHandshakeResponse();
+
+ std::string invalid_message = "0";
+ std::string invalid_message_pkt =
+ EncodePacket(kInvalidTag, invalid_message);
+ ReadList read_list;
+ read_list.push_back(net::MockRead(net::ASYNC,
+ handshake_response.c_str(),
+ handshake_response.size()));
+ read_list.push_back(net::MockRead(net::ASYNC,
+ invalid_message_pkt.c_str(),
+ invalid_message_pkt.size()));
+ BuildSocket(read_list, write_list);
+
+ ScopedMessage received_message;
+ Connect(&received_message);
+ WaitForMessage(); // The login send.
+ WaitForMessage(); // The login response.
+ received_message.reset();
+ WaitForMessage(); // The invalid message.
+ EXPECT_FALSE(received_message.get());
+ EXPECT_EQ(net::ERR_INVALID_ARGUMENT, last_error());
+}
+
+// Receive a message where the size field spans two socket reads.
+TEST_F(GCMConnectionHandlerImplTest, RecvMsgSplitSize) {
+ std::string handshake_request = EncodeHandshakeRequest();
+ WriteList write_list(1, net::MockWrite(net::ASYNC,
+ handshake_request.c_str(),
+ handshake_request.size()));
+ std::string handshake_response = EncodeHandshakeResponse();
+
+ std::string data_message_proto =
+ BuildDataMessage(kDataMsgFromLong, kDataMsgCategoryLong);
+ std::string data_message_pkt =
+ EncodePacket(kDataMessageStanzaTag, data_message_proto);
+ DCHECK_GT(data_message_pkt.size(), 128U);
+ ReadList read_list;
+ read_list.push_back(net::MockRead(net::ASYNC,
+ handshake_response.c_str(),
+ handshake_response.size()));
+ // The first two bytes are the tag byte and the first byte of the size packet.
+ read_list.push_back(net::MockRead(net::ASYNC,
+ data_message_pkt.c_str(),
+ 2));
+ // Start from the second byte of the size packet.
+ read_list.push_back(net::MockRead(net::ASYNC,
+ data_message_pkt.c_str() + 2,
+ data_message_pkt.size() - 2));
+ BuildSocket(read_list, write_list);
+
+ ScopedMessage received_message;
+ Connect(&received_message);
+ WaitForMessage(); // The login send.
+ WaitForMessage(); // The login response.
+ WaitForMessage(); // The data message.
+ ASSERT_TRUE(received_message.get());
+ EXPECT_EQ(data_message_proto, received_message->SerializeAsString());
+ EXPECT_EQ(net::OK, last_error());
+}
+
} // namespace
} // namespace gcm
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 47185c2..85f4a0a 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -9803,11 +9803,11 @@
const void* cmd_data) {
const gles2::cmds::WaitSyncPointCHROMIUM& c =
*static_cast<const gles2::cmds::WaitSyncPointCHROMIUM*>(cmd_data);
- group_->mailbox_manager()->PullTextureUpdates();
+ uint32 sync_point = c.sync_point;
if (wait_sync_point_callback_.is_null())
return error::kNoError;
- return wait_sync_point_callback_.Run(c.sync_point) ?
+ return wait_sync_point_callback_.Run(sync_point) ?
error::kNoError : error::kDeferCommandUntilLater;
}
diff --git a/gpu/command_buffer/service/in_process_command_buffer.cc b/gpu/command_buffer/service/in_process_command_buffer.cc
index da7433e..ed259e4 100644
--- a/gpu/command_buffer/service/in_process_command_buffer.cc
+++ b/gpu/command_buffer/service/in_process_command_buffer.cc
@@ -179,11 +179,6 @@
base::LazyInstance<SyncPointManager> g_sync_point_manager =
LAZY_INSTANCE_INITIALIZER;
-bool WaitSyncPoint(uint32 sync_point) {
- g_sync_point_manager.Get().WaitSyncPoint(sync_point);
- return true;
-}
-
} // anonyous namespace
InProcessCommandBuffer::Service::Service() {}
@@ -426,7 +421,9 @@
decoder_->SetResizeCallback(base::Bind(
&InProcessCommandBuffer::OnResizeView, gpu_thread_weak_ptr_));
}
- decoder_->SetWaitSyncPointCallback(base::Bind(&WaitSyncPoint));
+ decoder_->SetWaitSyncPointCallback(
+ base::Bind(&InProcessCommandBuffer::WaitSyncPointOnGpuThread,
+ base::Unretained(this)));
return true;
}
@@ -721,7 +718,7 @@
make_current_success = MakeCurrent();
}
if (make_current_success)
- mailbox_manager->PushTextureUpdates();
+ mailbox_manager->PushTextureUpdates(sync_point);
}
g_sync_point_manager.Get().RetireSyncPoint(sync_point);
}
@@ -735,6 +732,14 @@
WrapCallback(callback)));
}
+bool InProcessCommandBuffer::WaitSyncPointOnGpuThread(unsigned sync_point) {
+ g_sync_point_manager.Get().WaitSyncPoint(sync_point);
+ gles2::MailboxManager* mailbox_manager =
+ decoder_->GetContextGroup()->mailbox_manager();
+ mailbox_manager->PullTextureUpdates(sync_point);
+ return true;
+}
+
void InProcessCommandBuffer::SignalSyncPointOnGpuThread(
unsigned sync_point,
const base::Closure& callback) {
diff --git a/gpu/command_buffer/service/in_process_command_buffer.h b/gpu/command_buffer/service/in_process_command_buffer.h
index 8b34d4b..4c5c308 100644
--- a/gpu/command_buffer/service/in_process_command_buffer.h
+++ b/gpu/command_buffer/service/in_process_command_buffer.h
@@ -204,6 +204,7 @@
void RetireSyncPointOnGpuThread(uint32 sync_point);
void SignalSyncPointOnGpuThread(uint32 sync_point,
const base::Closure& callback);
+ bool WaitSyncPointOnGpuThread(uint32 sync_point);
void SignalQueryOnGpuThread(unsigned query_id, const base::Closure& callback);
void DestroyTransferBufferOnGpuThread(int32 id);
void RegisterGpuMemoryBufferOnGpuThread(
diff --git a/gpu/command_buffer/service/mailbox_manager.cc b/gpu/command_buffer/service/mailbox_manager.cc
index e6962df..b4d6e79 100644
--- a/gpu/command_buffer/service/mailbox_manager.cc
+++ b/gpu/command_buffer/service/mailbox_manager.cc
@@ -84,14 +84,14 @@
sync_->TextureDeleted(texture);
}
-void MailboxManager::PushTextureUpdates() {
+void MailboxManager::PushTextureUpdates(uint32 sync_point) {
if (sync_)
- sync_->PushTextureUpdates(this);
+ sync_->PushTextureUpdates(this, sync_point);
}
-void MailboxManager::PullTextureUpdates() {
+void MailboxManager::PullTextureUpdates(uint32 sync_point) {
if (sync_)
- sync_->PullTextureUpdates(this);
+ sync_->PullTextureUpdates(this, sync_point);
}
MailboxManager::TargetName::TargetName(unsigned target, const Mailbox& mailbox)
diff --git a/gpu/command_buffer/service/mailbox_manager.h b/gpu/command_buffer/service/mailbox_manager.h
index e1b36cb..a00b965 100644
--- a/gpu/command_buffer/service/mailbox_manager.h
+++ b/gpu/command_buffer/service/mailbox_manager.h
@@ -41,8 +41,8 @@
// Used with the MailboxSynchronizer to push/pull texture state to/from
// other manager instances.
- void PushTextureUpdates();
- void PullTextureUpdates();
+ void PushTextureUpdates(uint32 sync_point);
+ void PullTextureUpdates(uint32 sync_point);
// Destroy any mailbox that reference the given texture.
void TextureDeleted(Texture* texture);
diff --git a/gpu/command_buffer/service/mailbox_manager_unittest.cc b/gpu/command_buffer/service/mailbox_manager_unittest.cc
index df1cd4e..63ffc6d 100644
--- a/gpu/command_buffer/service/mailbox_manager_unittest.cc
+++ b/gpu/command_buffer/service/mailbox_manager_unittest.cc
@@ -300,8 +300,8 @@
EXPECT_EQ(texture, manager_->ConsumeTexture(GL_TEXTURE_2D, name));
// Synchronize
- manager_->PushTextureUpdates();
- manager2_->PullTextureUpdates();
+ manager_->PushTextureUpdates(0);
+ manager2_->PullTextureUpdates(0);
DestroyTexture(texture);
EXPECT_EQ(NULL, manager_->ConsumeTexture(GL_TEXTURE_2D, name));
@@ -321,8 +321,8 @@
EXPECT_EQ(texture, manager_->ConsumeTexture(GL_TEXTURE_2D, name));
// Synchronize
- manager_->PushTextureUpdates();
- manager2_->PullTextureUpdates();
+ manager_->PushTextureUpdates(0);
+ manager2_->PullTextureUpdates(0);
EXPECT_CALL(*gl_, GenTextures(1, _))
.WillOnce(SetArgPointee<1>(kNewTextureId));
@@ -349,10 +349,10 @@
EXPECT_TRUE(texture->GetLevelImage(GL_TEXTURE_2D, 0) == NULL);
// Synchronize again
- manager_->PushTextureUpdates();
+ manager_->PushTextureUpdates(0);
SetupUpdateTexParamExpectations(
kNewTextureId, GL_LINEAR, GL_LINEAR, GL_REPEAT, GL_REPEAT);
- manager2_->PullTextureUpdates();
+ manager2_->PullTextureUpdates(0);
GLsizei width, height;
new_texture->GetLevelSize(GL_TEXTURE_2D, 0, &width, &height);
EXPECT_EQ(16, width);
@@ -382,7 +382,7 @@
// The last change to the texture should be visible without a sync point (i.e.
// push).
- manager2_->PullTextureUpdates();
+ manager2_->PullTextureUpdates(0);
new_texture->GetLevelSize(GL_TEXTURE_2D, 0, &width, &height);
EXPECT_EQ(64, width);
EXPECT_EQ(64, height);
@@ -410,8 +410,8 @@
manager2_->ProduceTexture(GL_TEXTURE_2D, name2, texture2);
// Make visible.
- manager_->PushTextureUpdates();
- manager2_->PushTextureUpdates();
+ manager_->PushTextureUpdates(0);
+ manager2_->PushTextureUpdates(0);
// Create textures in the other manager instances for texture1 and texture2,
// respectively to create a real sharing scenario. Otherwise, there would
@@ -438,7 +438,7 @@
SetParameter(texture1, GL_TEXTURE_MIN_FILTER, GL_NEAREST));
// Make sure this does not clobber it with the previous version we pushed.
- manager_->PullTextureUpdates();
+ manager_->PullTextureUpdates(0);
// Make a change to texture2
DCHECK_EQ(static_cast<GLuint>(GL_LINEAR), texture2->mag_filter());
@@ -448,16 +448,16 @@
Mock::VerifyAndClearExpectations(gl_.get());
// Synchronize in both directions
- manager_->PushTextureUpdates();
- manager2_->PushTextureUpdates();
+ manager_->PushTextureUpdates(0);
+ manager2_->PushTextureUpdates(0);
// manager1 should see the change to texture2 mag_filter being applied.
SetupUpdateTexParamExpectations(
new_texture2->service_id(), GL_LINEAR, GL_NEAREST, GL_REPEAT, GL_REPEAT);
- manager_->PullTextureUpdates();
+ manager_->PullTextureUpdates(0);
// manager2 should see the change to texture1 min_filter being applied.
SetupUpdateTexParamExpectations(
new_texture1->service_id(), GL_NEAREST, GL_LINEAR, GL_REPEAT, GL_REPEAT);
- manager2_->PullTextureUpdates();
+ manager2_->PullTextureUpdates(0);
DestroyTexture(texture1);
DestroyTexture(texture2);
diff --git a/gpu/command_buffer/service/mailbox_synchronizer.cc b/gpu/command_buffer/service/mailbox_synchronizer.cc
index eac31f9..81a2793 100644
--- a/gpu/command_buffer/service/mailbox_synchronizer.cc
+++ b/gpu/command_buffer/service/mailbox_synchronizer.cc
@@ -7,8 +7,13 @@
#include "base/bind.h"
#include "gpu/command_buffer/service/mailbox_manager.h"
#include "gpu/command_buffer/service/texture_manager.h"
+#include "ui/gl/gl_fence.h"
#include "ui/gl/gl_implementation.h"
+#if !defined(OS_MACOSX)
+#include "ui/gl/gl_fence_egl.h"
+#endif
+
namespace gpu {
namespace gles2 {
@@ -136,7 +141,8 @@
}
}
-void MailboxSynchronizer::PushTextureUpdates(MailboxManager* manager) {
+void MailboxSynchronizer::PushTextureUpdates(MailboxManager* manager,
+ uint32 sync_point) {
base::AutoLock lock(lock_);
for (MailboxManager::MailboxToTextureMap::const_iterator texture_it =
manager->mailbox_to_textures_.begin();
@@ -179,6 +185,33 @@
textures_.insert(std::make_pair(texture, TextureVersion(group)));
}
}
+
+ CreateFenceLocked(sync_point);
+}
+
+void MailboxSynchronizer::CreateFenceLocked(uint32 sync_point) {
+ lock_.AssertAcquired();
+ if (gfx::GetGLImplementation() == gfx::kGLImplementationMockGL)
+ return;
+
+#if !defined(OS_MACOSX)
+ if (sync_point) {
+ while (!sync_points_.empty() &&
+ sync_points_.front()->second->HasCompleted()) {
+ sync_point_to_fence_.erase(sync_points_.front());
+ sync_points_.pop();
+ }
+ // Need to use EGL fences since we are likely not in a single share group.
+ linked_ptr<gfx::GLFence> fence(make_linked_ptr(new gfx::GLFenceEGL(true)));
+ if (fence.get()) {
+ std::pair<SyncPointToFenceMap::iterator, bool> result =
+ sync_point_to_fence_.insert(std::make_pair(sync_point, fence));
+ DCHECK(result.second);
+ sync_points_.push(result.first);
+ }
+ DCHECK(sync_points_.size() == sync_point_to_fence_.size());
+ }
+#endif
}
void MailboxSynchronizer::UpdateTextureLocked(Texture* texture,
@@ -208,8 +241,20 @@
gl_image ? image_buffer : NULL);
}
-void MailboxSynchronizer::PullTextureUpdates(MailboxManager* manager) {
+void MailboxSynchronizer::AcquireFenceLocked(uint32 sync_point) {
+ lock_.AssertAcquired();
+ SyncPointToFenceMap::iterator fence_it =
+ sync_point_to_fence_.find(sync_point);
+ if (fence_it != sync_point_to_fence_.end()) {
+ fence_it->second->ServerWait();
+ }
+}
+
+void MailboxSynchronizer::PullTextureUpdates(MailboxManager* manager,
+ uint32 sync_point) {
base::AutoLock lock(lock_);
+ AcquireFenceLocked(sync_point);
+
for (MailboxManager::MailboxToTextureMap::const_iterator texture_it =
manager->mailbox_to_textures_.begin();
texture_it != manager->mailbox_to_textures_.end();
diff --git a/gpu/command_buffer/service/mailbox_synchronizer.h b/gpu/command_buffer/service/mailbox_synchronizer.h
index a845963..3ddb9d0 100644
--- a/gpu/command_buffer/service/mailbox_synchronizer.h
+++ b/gpu/command_buffer/service/mailbox_synchronizer.h
@@ -8,6 +8,7 @@
#include "gpu/command_buffer/common/mailbox.h"
#include <map>
+#include <queue>
#include <set>
#include "base/memory/linked_ptr.h"
@@ -15,6 +16,10 @@
#include "gpu/command_buffer/service/texture_definition.h"
#include "gpu/gpu_export.h"
+namespace gfx {
+class GLFence;
+}
+
namespace gpu {
namespace gles2 {
@@ -34,8 +39,8 @@
// Create a texture from a globally visible mailbox.
Texture* CreateTextureFromMailbox(unsigned target, const Mailbox& mailbox);
- void PushTextureUpdates(MailboxManager* manager);
- void PullTextureUpdates(MailboxManager* manager);
+ void PushTextureUpdates(MailboxManager* manager, uint32 sync_point);
+ void PullTextureUpdates(MailboxManager* manager, uint32 sync_point);
void TextureDeleted(Texture* texture);
@@ -85,6 +90,12 @@
const TargetName& target_name,
TextureGroup* group);
void UpdateTextureLocked(Texture* texture, TextureVersion& texture_version);
+ void CreateFenceLocked(uint32 sync_point);
+ void AcquireFenceLocked(uint32 sync_point);
+
+ typedef std::map<uint32, linked_ptr<gfx::GLFence> > SyncPointToFenceMap;
+ SyncPointToFenceMap sync_point_to_fence_;
+ std::queue<SyncPointToFenceMap::iterator> sync_points_;
DISALLOW_COPY_AND_ASSIGN(MailboxSynchronizer);
};
diff --git a/gpu/command_buffer/service/texture_definition.cc b/gpu/command_buffer/service/texture_definition.cc
index 08af4aa..f9323b9 100644
--- a/gpu/command_buffer/service/texture_definition.cc
+++ b/gpu/command_buffer/service/texture_definition.cc
@@ -15,7 +15,6 @@
#include "ui/gl/scoped_binders.h"
#if !defined(OS_MACOSX)
-#include "ui/gl/gl_fence_egl.h"
#include "ui/gl/gl_surface_egl.h"
#endif
@@ -89,23 +88,15 @@
}
void GLImageSync::WillUseTexImage() {
- if (buffer_.get())
- buffer_->WillRead(this);
}
void GLImageSync::DidUseTexImage() {
- if (buffer_.get())
- buffer_->DidRead(this);
}
void GLImageSync::WillModifyTexImage() {
- if (buffer_.get())
- buffer_->WillWrite(this);
}
void GLImageSync::DidModifyTexImage() {
- if (buffer_.get())
- buffer_->DidWrite(this);
}
bool GLImageSync::ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
@@ -133,10 +124,6 @@
virtual void RemoveClient(gfx::GLImage* client) OVERRIDE;
virtual bool IsClient(gfx::GLImage* client) OVERRIDE;
virtual void BindToTexture(GLenum target) OVERRIDE;
- virtual void WillRead(gfx::GLImage* client) OVERRIDE;
- virtual void WillWrite(gfx::GLImage* client) OVERRIDE;
- virtual void DidRead(gfx::GLImage* client) OVERRIDE;
- virtual void DidWrite(gfx::GLImage* client) OVERRIDE;
EGLDisplay egl_display_;
EGLImageKHR egl_image_;
@@ -149,10 +136,8 @@
gfx::GLImage* client;
bool needs_wait_before_read;
- linked_ptr<gfx::GLFence> read_fence;
};
std::list<ClientInfo> client_infos_;
- scoped_ptr<gfx::GLFence> write_fence_;
gfx::GLImage* write_client_;
DISALLOW_COPY_AND_ASSIGN(NativeImageBufferEGL);
@@ -169,8 +154,7 @@
DCHECK(gfx::g_driver_egl.ext.b_EGL_KHR_image_base &&
gfx::g_driver_egl.ext.b_EGL_KHR_gl_texture_2D_image &&
- gfx::g_driver_gl.ext.b_GL_OES_EGL_image &&
- gfx::g_driver_egl.ext.b_EGL_KHR_fence_sync);
+ gfx::g_driver_gl.ext.b_GL_OES_EGL_image);
const EGLint egl_attrib_list[] = {
EGL_GL_TEXTURE_LEVEL_KHR, 0, EGL_IMAGE_PRESERVED_KHR, EGL_TRUE, EGL_NONE};
@@ -196,7 +180,6 @@
: NativeImageBuffer(),
egl_display_(display),
egl_image_(image),
- write_fence_(new gfx::GLFenceEGL(true)),
write_client_(NULL) {
DCHECK(egl_display_ != EGL_NO_DISPLAY);
DCHECK(egl_image_ != EGL_NO_IMAGE_KHR);
@@ -246,64 +229,6 @@
DCHECK_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
}
-void NativeImageBufferEGL::WillRead(gfx::GLImage* client) {
- base::AutoLock lock(lock_);
- if (!write_fence_.get() || write_client_ == client)
- return;
-
- for (std::list<ClientInfo>::iterator it = client_infos_.begin();
- it != client_infos_.end();
- it++) {
- if (it->client == client) {
- if (it->needs_wait_before_read) {
- it->needs_wait_before_read = false;
- write_fence_->ServerWait();
- }
- return;
- }
- }
- NOTREACHED();
-}
-
-void NativeImageBufferEGL::WillWrite(gfx::GLImage* client) {
- base::AutoLock lock(lock_);
- if (write_client_ != client)
- write_fence_->ServerWait();
-
- for (std::list<ClientInfo>::iterator it = client_infos_.begin();
- it != client_infos_.end();
- it++) {
- if (it->read_fence.get() && it->client != client)
- it->read_fence->ServerWait();
- }
-}
-
-void NativeImageBufferEGL::DidRead(gfx::GLImage* client) {
- base::AutoLock lock(lock_);
- for (std::list<ClientInfo>::iterator it = client_infos_.begin();
- it != client_infos_.end();
- it++) {
- if (it->client == client) {
- it->read_fence = make_linked_ptr(new gfx::GLFenceEGL(true));
- return;
- }
- }
- NOTREACHED();
-}
-
-void NativeImageBufferEGL::DidWrite(gfx::GLImage* client) {
- base::AutoLock lock(lock_);
- // Sharing semantics require the client to flush in order to make changes
- // visible to other clients.
- write_fence_.reset(new gfx::GLFenceEGL(false));
- write_client_ = client;
- for (std::list<ClientInfo>::iterator it = client_infos_.begin();
- it != client_infos_.end();
- it++) {
- it->needs_wait_before_read = true;
- }
-}
-
#endif
class NativeImageBufferStub : public NativeImageBuffer {
@@ -316,10 +241,6 @@
virtual void RemoveClient(gfx::GLImage* client) OVERRIDE {}
virtual bool IsClient(gfx::GLImage* client) OVERRIDE { return true; }
virtual void BindToTexture(GLenum target) OVERRIDE {}
- virtual void WillRead(gfx::GLImage* client) OVERRIDE {}
- virtual void WillWrite(gfx::GLImage* client) OVERRIDE {}
- virtual void DidRead(gfx::GLImage* client) OVERRIDE {}
- virtual void DidWrite(gfx::GLImage* client) OVERRIDE {}
DISALLOW_COPY_AND_ASSIGN(NativeImageBufferStub);
};
diff --git a/gpu/command_buffer/service/texture_definition.h b/gpu/command_buffer/service/texture_definition.h
index 6df4b86..cb21abd 100644
--- a/gpu/command_buffer/service/texture_definition.h
+++ b/gpu/command_buffer/service/texture_definition.h
@@ -27,10 +27,6 @@
virtual void RemoveClient(gfx::GLImage* client) = 0;
virtual bool IsClient(gfx::GLImage* client) = 0;
virtual void BindToTexture(GLenum target) = 0;
- virtual void WillRead(gfx::GLImage* client) = 0;
- virtual void WillWrite(gfx::GLImage* client) = 0;
- virtual void DidRead(gfx::GLImage* client) = 0;
- virtual void DidWrite(gfx::GLImage* client) = 0;
protected:
friend class base::RefCountedThreadSafe<NativeImageBuffer>;
diff --git a/gpu/command_buffer_service.target.darwin-arm.mk b/gpu/command_buffer_service.target.darwin-arm.mk
index 0579895..5ca9aa8 100644
--- a/gpu/command_buffer_service.target.darwin-arm.mk
+++ b/gpu/command_buffer_service.target.darwin-arm.mk
@@ -155,6 +155,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
@@ -299,6 +300,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
diff --git a/gpu/command_buffer_service.target.darwin-arm64.mk b/gpu/command_buffer_service.target.darwin-arm64.mk
index 70b4ae2..8945e1a 100644
--- a/gpu/command_buffer_service.target.darwin-arm64.mk
+++ b/gpu/command_buffer_service.target.darwin-arm64.mk
@@ -144,6 +144,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
@@ -276,6 +277,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
diff --git a/gpu/command_buffer_service.target.darwin-mips.mk b/gpu/command_buffer_service.target.darwin-mips.mk
index 6e63612..24a8250 100644
--- a/gpu/command_buffer_service.target.darwin-mips.mk
+++ b/gpu/command_buffer_service.target.darwin-mips.mk
@@ -147,6 +147,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
@@ -283,6 +284,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
diff --git a/gpu/command_buffer_service.target.darwin-x86.mk b/gpu/command_buffer_service.target.darwin-x86.mk
index 9e23d83..7105be0 100644
--- a/gpu/command_buffer_service.target.darwin-x86.mk
+++ b/gpu/command_buffer_service.target.darwin-x86.mk
@@ -150,6 +150,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
@@ -288,6 +289,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
diff --git a/gpu/command_buffer_service.target.darwin-x86_64.mk b/gpu/command_buffer_service.target.darwin-x86_64.mk
index 04324c2..98310b7 100644
--- a/gpu/command_buffer_service.target.darwin-x86_64.mk
+++ b/gpu/command_buffer_service.target.darwin-x86_64.mk
@@ -149,6 +149,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
@@ -286,6 +287,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
diff --git a/gpu/command_buffer_service.target.linux-arm.mk b/gpu/command_buffer_service.target.linux-arm.mk
index 0579895..5ca9aa8 100644
--- a/gpu/command_buffer_service.target.linux-arm.mk
+++ b/gpu/command_buffer_service.target.linux-arm.mk
@@ -155,6 +155,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
@@ -299,6 +300,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
diff --git a/gpu/command_buffer_service.target.linux-arm64.mk b/gpu/command_buffer_service.target.linux-arm64.mk
index 70b4ae2..8945e1a 100644
--- a/gpu/command_buffer_service.target.linux-arm64.mk
+++ b/gpu/command_buffer_service.target.linux-arm64.mk
@@ -144,6 +144,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
@@ -276,6 +277,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
diff --git a/gpu/command_buffer_service.target.linux-mips.mk b/gpu/command_buffer_service.target.linux-mips.mk
index 6e63612..24a8250 100644
--- a/gpu/command_buffer_service.target.linux-mips.mk
+++ b/gpu/command_buffer_service.target.linux-mips.mk
@@ -147,6 +147,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
@@ -283,6 +284,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
diff --git a/gpu/command_buffer_service.target.linux-x86.mk b/gpu/command_buffer_service.target.linux-x86.mk
index 9e23d83..7105be0 100644
--- a/gpu/command_buffer_service.target.linux-x86.mk
+++ b/gpu/command_buffer_service.target.linux-x86.mk
@@ -150,6 +150,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
@@ -288,6 +289,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
diff --git a/gpu/command_buffer_service.target.linux-x86_64.mk b/gpu/command_buffer_service.target.linux-x86_64.mk
index 04324c2..98310b7 100644
--- a/gpu/command_buffer_service.target.linux-x86_64.mk
+++ b/gpu/command_buffer_service.target.linux-x86_64.mk
@@ -149,6 +149,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
@@ -286,6 +287,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
diff --git a/gpu/config/software_rendering_list_json.cc b/gpu/config/software_rendering_list_json.cc
index 453cd2f..78d584a 100644
--- a/gpu/config/software_rendering_list_json.cc
+++ b/gpu/config/software_rendering_list_json.cc
@@ -18,7 +18,7 @@
{
"name": "software rendering list",
// Please update the version number whenever you change this file.
- "version": "9.10",
+ "version": "9.11",
"entries": [
{
"id": 1,
@@ -1123,6 +1123,23 @@
"features": [
"accelerated_video_decode"
]
+ },
+ {
+ "id": 103,
+ "description": "Intel GM965/GL960 crash often on Mac OS 10.6",
+ "cr_bugs": [421641],
+ "os": {
+ "type": "macosx",
+ "version": {
+ "op": "=",
+ "value": "10.6"
+ }
+ },
+ "vendor_id": "0x8086",
+ "device_id": ["0x2a02"],
+ "features": [
+ "all"
+ ]
}
]
}
diff --git a/gpu/skia_bindings/gpu_skia_bindings.target.darwin-arm.mk b/gpu/skia_bindings/gpu_skia_bindings.target.darwin-arm.mk
index 55f527a..5a3ec7d 100644
--- a/gpu/skia_bindings/gpu_skia_bindings.target.darwin-arm.mk
+++ b/gpu/skia_bindings/gpu_skia_bindings.target.darwin-arm.mk
@@ -105,6 +105,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -234,6 +235,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/gpu/skia_bindings/gpu_skia_bindings.target.darwin-arm64.mk b/gpu/skia_bindings/gpu_skia_bindings.target.darwin-arm64.mk
index aafff1e..bc61835 100644
--- a/gpu/skia_bindings/gpu_skia_bindings.target.darwin-arm64.mk
+++ b/gpu/skia_bindings/gpu_skia_bindings.target.darwin-arm64.mk
@@ -94,6 +94,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -211,6 +212,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/gpu/skia_bindings/gpu_skia_bindings.target.darwin-mips.mk b/gpu/skia_bindings/gpu_skia_bindings.target.darwin-mips.mk
index ec553b9..01f0f4a 100644
--- a/gpu/skia_bindings/gpu_skia_bindings.target.darwin-mips.mk
+++ b/gpu/skia_bindings/gpu_skia_bindings.target.darwin-mips.mk
@@ -97,6 +97,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -218,6 +219,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/gpu/skia_bindings/gpu_skia_bindings.target.darwin-x86.mk b/gpu/skia_bindings/gpu_skia_bindings.target.darwin-x86.mk
index 1c9abdd..0d28e54 100644
--- a/gpu/skia_bindings/gpu_skia_bindings.target.darwin-x86.mk
+++ b/gpu/skia_bindings/gpu_skia_bindings.target.darwin-x86.mk
@@ -100,6 +100,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -223,6 +224,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/gpu/skia_bindings/gpu_skia_bindings.target.darwin-x86_64.mk b/gpu/skia_bindings/gpu_skia_bindings.target.darwin-x86_64.mk
index c117411..eece3f7 100644
--- a/gpu/skia_bindings/gpu_skia_bindings.target.darwin-x86_64.mk
+++ b/gpu/skia_bindings/gpu_skia_bindings.target.darwin-x86_64.mk
@@ -99,6 +99,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -221,6 +222,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/gpu/skia_bindings/gpu_skia_bindings.target.linux-arm.mk b/gpu/skia_bindings/gpu_skia_bindings.target.linux-arm.mk
index 55f527a..5a3ec7d 100644
--- a/gpu/skia_bindings/gpu_skia_bindings.target.linux-arm.mk
+++ b/gpu/skia_bindings/gpu_skia_bindings.target.linux-arm.mk
@@ -105,6 +105,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -234,6 +235,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/gpu/skia_bindings/gpu_skia_bindings.target.linux-arm64.mk b/gpu/skia_bindings/gpu_skia_bindings.target.linux-arm64.mk
index aafff1e..bc61835 100644
--- a/gpu/skia_bindings/gpu_skia_bindings.target.linux-arm64.mk
+++ b/gpu/skia_bindings/gpu_skia_bindings.target.linux-arm64.mk
@@ -94,6 +94,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -211,6 +212,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/gpu/skia_bindings/gpu_skia_bindings.target.linux-mips.mk b/gpu/skia_bindings/gpu_skia_bindings.target.linux-mips.mk
index ec553b9..01f0f4a 100644
--- a/gpu/skia_bindings/gpu_skia_bindings.target.linux-mips.mk
+++ b/gpu/skia_bindings/gpu_skia_bindings.target.linux-mips.mk
@@ -97,6 +97,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -218,6 +219,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/gpu/skia_bindings/gpu_skia_bindings.target.linux-x86.mk b/gpu/skia_bindings/gpu_skia_bindings.target.linux-x86.mk
index 1c9abdd..0d28e54 100644
--- a/gpu/skia_bindings/gpu_skia_bindings.target.linux-x86.mk
+++ b/gpu/skia_bindings/gpu_skia_bindings.target.linux-x86.mk
@@ -100,6 +100,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -223,6 +224,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/gpu/skia_bindings/gpu_skia_bindings.target.linux-x86_64.mk b/gpu/skia_bindings/gpu_skia_bindings.target.linux-x86_64.mk
index c117411..eece3f7 100644
--- a/gpu/skia_bindings/gpu_skia_bindings.target.linux-x86_64.mk
+++ b/gpu/skia_bindings/gpu_skia_bindings.target.linux-x86_64.mk
@@ -99,6 +99,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -221,6 +222,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/media/audio/alsa/alsa_input.cc b/media/audio/alsa/alsa_input.cc
index 0bc9f31..3c555a0 100644
--- a/media/audio/alsa/alsa_input.cc
+++ b/media/audio/alsa/alsa_input.cc
@@ -336,6 +336,10 @@
return static_cast<double>(current_volume);
}
+bool AlsaPcmInputStream::IsMuted() {
+ return false;
+}
+
void AlsaPcmInputStream::HandleError(const char* method, int error) {
LOG(WARNING) << method << ": " << wrapper_->StrError(error);
callback_->OnError(this);
diff --git a/media/audio/alsa/alsa_input.h b/media/audio/alsa/alsa_input.h
index c26f3e2..f227c40 100644
--- a/media/audio/alsa/alsa_input.h
+++ b/media/audio/alsa/alsa_input.h
@@ -49,6 +49,7 @@
virtual double GetMaxVolume() OVERRIDE;
virtual void SetVolume(double volume) OVERRIDE;
virtual double GetVolume() OVERRIDE;
+ virtual bool IsMuted() OVERRIDE;
private:
// Logs the error and invokes any registered callbacks.
diff --git a/media/audio/android/audio_record_input.cc b/media/audio/android/audio_record_input.cc
index 3f19588..1dd6118 100644
--- a/media/audio/android/audio_record_input.cc
+++ b/media/audio/android/audio_record_input.cc
@@ -134,4 +134,9 @@
return false;
}
+bool AudioRecordInputStream::IsMuted() {
+ NOTIMPLEMENTED();
+ return false;
+}
+
} // namespace media
diff --git a/media/audio/android/audio_record_input.h b/media/audio/android/audio_record_input.h
index c240038..0b42b7b 100644
--- a/media/audio/android/audio_record_input.h
+++ b/media/audio/android/audio_record_input.h
@@ -40,6 +40,7 @@
virtual double GetVolume() OVERRIDE;
virtual void SetAutomaticGainControl(bool enabled) OVERRIDE;
virtual bool GetAutomaticGainControl() OVERRIDE;
+ virtual bool IsMuted() OVERRIDE;
static bool RegisterAudioRecordInput(JNIEnv* env);
diff --git a/media/audio/android/opensles_input.cc b/media/audio/android/opensles_input.cc
index 1ef3aac..d8e5f63 100644
--- a/media/audio/android/opensles_input.cc
+++ b/media/audio/android/opensles_input.cc
@@ -185,6 +185,11 @@
return false;
}
+bool OpenSLESInputStream::IsMuted() {
+ NOTIMPLEMENTED();
+ return false;
+}
+
bool OpenSLESInputStream::CreateRecorder() {
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(!engine_object_.Get());
diff --git a/media/audio/android/opensles_input.h b/media/audio/android/opensles_input.h
index 288ab43..0443ea0 100644
--- a/media/audio/android/opensles_input.h
+++ b/media/audio/android/opensles_input.h
@@ -43,6 +43,7 @@
virtual double GetVolume() OVERRIDE;
virtual void SetAutomaticGainControl(bool enabled) OVERRIDE;
virtual bool GetAutomaticGainControl() OVERRIDE;
+ virtual bool IsMuted() OVERRIDE;
private:
bool CreateRecorder();
diff --git a/media/audio/audio_input_controller.cc b/media/audio/audio_input_controller.cc
index 2429995..d57a113 100644
--- a/media/audio/audio_input_controller.cc
+++ b/media/audio/audio_input_controller.cc
@@ -577,11 +577,24 @@
if (!handler_)
return;
+ // Detect if the user has enabled hardware mute by pressing the mute
+ // button in audio settings for the selected microphone.
+ const bool microphone_is_muted = stream_->IsMuted();
+ if (microphone_is_muted) {
+ LogMicrophoneMuteResult(MICROPHONE_IS_MUTED);
+ handler_->OnLog(this, "AIC::OnData: microphone is muted!");
+ // Return early if microphone is muted. No need to adding logs and UMA stats
+ // of audio levels if we know that the micropone is muted.
+ return;
+ }
+
+ LogMicrophoneMuteResult(MICROPHONE_IS_NOT_MUTED);
+
std::string log_string = base::StringPrintf(
"AIC::OnData: average audio level=%.2f dBFS", level_dbfs);
static const float kSilenceThresholdDBFS = -72.24719896f;
if (level_dbfs < kSilenceThresholdDBFS)
- log_string += " <=> no audio input!";
+ log_string += " <=> low audio input level!";
handler_->OnLog(this, log_string);
UpdateSilenceState(level_dbfs < kSilenceThresholdDBFS);
@@ -592,20 +605,6 @@
if (microphone_volume_percent < kLowLevelMicrophoneLevelPercent)
log_string += " <=> low microphone level!";
handler_->OnLog(this, log_string);
-
- // Try to detect if the user has enabled hardware mute by pressing the mute
- // button in audio settings for the selected microphone. The idea here is to
- // detect when all input samples are zeros but the actual volume slider is
- // larger than zero. It should correspond to a hardware mute state.
- if (level_dbfs == -std::numeric_limits<float>::infinity() &&
- microphone_volume_percent > 0) {
- LogMicrophoneMuteResult(MICROPHONE_IS_MUTED);
- log_string = base::StringPrintf(
- "AIC::OnData: microphone is muted!");
- handler_->OnLog(this, log_string);
- } else {
- LogMicrophoneMuteResult(MICROPHONE_IS_NOT_MUTED);
- }
#endif
}
diff --git a/media/audio/audio_io.h b/media/audio/audio_io.h
index 1e1eba4..8a1ddd9 100644
--- a/media/audio/audio_io.h
+++ b/media/audio/audio_io.h
@@ -166,6 +166,9 @@
// Returns the Automatic Gain Control (AGC) state.
virtual bool GetAutomaticGainControl() = 0;
+
+ // Returns the current muting state for the microphone.
+ virtual bool IsMuted() = 0;
};
} // namespace media
diff --git a/media/audio/cras/cras_input.cc b/media/audio/cras/cras_input.cc
index 0b86446..3fae8df 100644
--- a/media/audio/cras/cras_input.cc
+++ b/media/audio/cras/cras_input.cc
@@ -301,6 +301,10 @@
return GetVolumeRatioFromDecibels(dB);
}
+bool CrasInputStream::IsMuted() {
+ return false;
+}
+
double CrasInputStream::GetVolumeRatioFromDecibels(double dB) const {
return pow(10, dB / 20.0);
}
diff --git a/media/audio/cras/cras_input.h b/media/audio/cras/cras_input.h
index 1919224..3ba186a 100644
--- a/media/audio/cras/cras_input.h
+++ b/media/audio/cras/cras_input.h
@@ -40,6 +40,7 @@
virtual double GetMaxVolume() OVERRIDE;
virtual void SetVolume(double volume) OVERRIDE;
virtual double GetVolume() OVERRIDE;
+ virtual bool IsMuted() OVERRIDE;
private:
// Handles requests to get samples from the provided buffer. This will be
diff --git a/media/audio/fake_audio_input_stream.cc b/media/audio/fake_audio_input_stream.cc
index 74ac579..157d397 100644
--- a/media/audio/fake_audio_input_stream.cc
+++ b/media/audio/fake_audio_input_stream.cc
@@ -203,6 +203,11 @@
return 1.0;
}
+bool FakeAudioInputStream::IsMuted() {
+ DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread());
+ return false;
+}
+
void FakeAudioInputStream::SetAutomaticGainControl(bool enabled) {}
bool FakeAudioInputStream::GetAutomaticGainControl() {
diff --git a/media/audio/fake_audio_input_stream.h b/media/audio/fake_audio_input_stream.h
index 4c3c24c..8413a13 100644
--- a/media/audio/fake_audio_input_stream.h
+++ b/media/audio/fake_audio_input_stream.h
@@ -36,6 +36,7 @@
virtual double GetVolume() OVERRIDE;
virtual void SetAutomaticGainControl(bool enabled) OVERRIDE;
virtual bool GetAutomaticGainControl() OVERRIDE;
+ virtual bool IsMuted() OVERRIDE;
// Generate one beep sound. This method is called by
// FakeVideoCaptureDevice to test audio/video synchronization.
diff --git a/media/audio/mac/audio_input_mac.cc b/media/audio/mac/audio_input_mac.cc
index b7f6e17..af5d9bc 100644
--- a/media/audio/mac/audio_input_mac.cc
+++ b/media/audio/mac/audio_input_mac.cc
@@ -136,6 +136,11 @@
return 0.0;
}
+bool PCMQueueInAudioInputStream::IsMuted() {
+ NOTREACHED() << "Only supported for low-latency mode.";
+ return false;
+}
+
void PCMQueueInAudioInputStream::SetAutomaticGainControl(bool enabled) {
NOTREACHED() << "Only supported for low-latency mode.";
}
diff --git a/media/audio/mac/audio_input_mac.h b/media/audio/mac/audio_input_mac.h
index a6e897e..0d78dd6 100644
--- a/media/audio/mac/audio_input_mac.h
+++ b/media/audio/mac/audio_input_mac.h
@@ -38,6 +38,7 @@
virtual double GetVolume() OVERRIDE;
virtual void SetAutomaticGainControl(bool enabled) OVERRIDE;
virtual bool GetAutomaticGainControl() OVERRIDE;
+ virtual bool IsMuted() OVERRIDE;
private:
// Issue the OnError to |callback_|;
diff --git a/media/audio/mac/audio_low_latency_input_mac.cc b/media/audio/mac/audio_low_latency_input_mac.cc
index 3d95f90..cb0779e 100644
--- a/media/audio/mac/audio_low_latency_input_mac.cc
+++ b/media/audio/mac/audio_low_latency_input_mac.cc
@@ -450,6 +450,29 @@
return 0.0;
}
+bool AUAudioInputStream::IsMuted() {
+ // Verify that we have a valid device.
+ DCHECK_NE(input_device_id_, kAudioObjectUnknown) << "Device ID is unknown";
+
+ AudioObjectPropertyAddress property_address = {
+ kAudioDevicePropertyMute,
+ kAudioDevicePropertyScopeInput,
+ kAudioObjectPropertyElementMaster
+ };
+
+ if (!AudioObjectHasProperty(input_device_id_, &property_address)) {
+ DLOG(ERROR) << "Device does not support checking master mute state";
+ return false;
+ }
+
+ UInt32 muted = 0;
+ UInt32 size = sizeof(muted);
+ OSStatus result = AudioObjectGetPropertyData(
+ input_device_id_, &property_address, 0, NULL, &size, &muted);
+ DLOG_IF(WARNING, result != noErr) << "Failed to get mute state";
+ return result == noErr && muted != 0;
+}
+
// AUHAL AudioDeviceOutput unit callback
OSStatus AUAudioInputStream::InputProc(void* user_data,
AudioUnitRenderActionFlags* flags,
diff --git a/media/audio/mac/audio_low_latency_input_mac.h b/media/audio/mac/audio_low_latency_input_mac.h
index c8e43fa..0ce1f8f 100644
--- a/media/audio/mac/audio_low_latency_input_mac.h
+++ b/media/audio/mac/audio_low_latency_input_mac.h
@@ -72,6 +72,7 @@
virtual double GetMaxVolume() OVERRIDE;
virtual void SetVolume(double volume) OVERRIDE;
virtual double GetVolume() OVERRIDE;
+ virtual bool IsMuted() OVERRIDE;
// Returns the current hardware sample rate for the default input device.
MEDIA_EXPORT static int HardwareSampleRate();
diff --git a/media/audio/pulse/pulse_input.cc b/media/audio/pulse/pulse_input.cc
index 4a56d3a..60afcdc 100644
--- a/media/audio/pulse/pulse_input.cc
+++ b/media/audio/pulse/pulse_input.cc
@@ -4,8 +4,6 @@
#include "media/audio/pulse/pulse_input.h"
-#include <pulse/pulseaudio.h>
-
#include "base/logging.h"
#include "media/audio/pulse/audio_manager_pulse.h"
#include "media/audio/pulse/pulse_util.h"
@@ -30,6 +28,7 @@
channels_(0),
volume_(0.0),
stream_started_(false),
+ muted_(false),
fifo_(params.channels(),
params.frames_per_buffer(),
kNumberOfBlocksBufferInFifo),
@@ -185,20 +184,17 @@
// Return zero and the callback will asynchronously update the |volume_|.
return 0.0;
} else {
- // Called by other thread, put an AutoPulseLock and wait for the operation.
- AutoPulseLock auto_lock(pa_mainloop_);
- if (!handle_)
- return 0.0;
-
- size_t index = pa_stream_get_device_index(handle_);
- pa_operation* operation = pa_context_get_source_info_by_index(
- pa_context_, index, &VolumeCallback, this);
- WaitForOperationCompletion(pa_mainloop_, operation);
-
+ GetSourceInformation(&VolumeCallback);
return volume_;
}
}
+bool PulseAudioInputStream::IsMuted() {
+ DCHECK(thread_checker_.CalledOnValidThread());
+ GetSourceInformation(&MuteCallback);
+ return muted_;
+}
+
// static, used by pa_stream_set_read_callback.
void PulseAudioInputStream::ReadCallback(pa_stream* handle,
size_t length,
@@ -236,11 +232,32 @@
stream->volume_ = static_cast<double>(volume);
}
+// static, used by pa_context_get_source_info_by_index.
+void PulseAudioInputStream::MuteCallback(pa_context* context,
+ const pa_source_info* info,
+ int error,
+ void* user_data) {
+ // Runs on PulseAudio callback thread. It might be possible to make this
+ // method more thread safe by passing a struct (or pair) of a local copy of
+ // |pa_mainloop_| and |muted_| instead.
+ PulseAudioInputStream* stream =
+ reinterpret_cast<PulseAudioInputStream*>(user_data);
+
+ // Avoid infinite wait loop in case of error.
+ if (error) {
+ pa_threaded_mainloop_signal(stream->pa_mainloop_, 0);
+ return;
+ }
+
+ stream->muted_ = info->mute != 0;
+}
+
// static, used by pa_stream_set_state_callback.
void PulseAudioInputStream::StreamNotifyCallback(pa_stream* s,
void* user_data) {
PulseAudioInputStream* stream =
reinterpret_cast<PulseAudioInputStream*>(user_data);
+
if (s && stream->callback_ &&
pa_stream_get_state(s) == PA_STREAM_FAILED) {
stream->callback_->OnError(stream);
@@ -301,4 +318,16 @@
pa_threaded_mainloop_signal(pa_mainloop_, 0);
}
+bool PulseAudioInputStream::GetSourceInformation(pa_source_info_cb_t callback) {
+ AutoPulseLock auto_lock(pa_mainloop_);
+ if (!handle_)
+ return false;
+
+ size_t index = pa_stream_get_device_index(handle_);
+ pa_operation* operation =
+ pa_context_get_source_info_by_index(pa_context_, index, callback, this);
+ WaitForOperationCompletion(pa_mainloop_, operation);
+ return true;
+}
+
} // namespace media
diff --git a/media/audio/pulse/pulse_input.h b/media/audio/pulse/pulse_input.h
index 9f08379..15cae53 100644
--- a/media/audio/pulse/pulse_input.h
+++ b/media/audio/pulse/pulse_input.h
@@ -5,6 +5,7 @@
#ifndef MEDIA_AUDIO_PULSE_PULSE_INPUT_H_
#define MEDIA_AUDIO_PULSE_PULSE_INPUT_H_
+#include <pulse/pulseaudio.h>
#include <string>
#include "base/threading/thread_checker.h"
@@ -14,11 +15,6 @@
#include "media/audio/audio_parameters.h"
#include "media/base/audio_block_fifo.h"
-struct pa_context;
-struct pa_source_info;
-struct pa_stream;
-struct pa_threaded_mainloop;
-
namespace media {
class AudioManagerPulse;
@@ -41,6 +37,7 @@
virtual double GetMaxVolume() OVERRIDE;
virtual void SetVolume(double volume) OVERRIDE;
virtual double GetVolume() OVERRIDE;
+ virtual bool IsMuted() OVERRIDE;
private:
// PulseAudio Callbacks.
@@ -48,10 +45,17 @@
static void StreamNotifyCallback(pa_stream* stream, void* user_data);
static void VolumeCallback(pa_context* context, const pa_source_info* info,
int error, void* user_data);
+ static void MuteCallback(pa_context* context,
+ const pa_source_info* info,
+ int error,
+ void* user_data);
// Helper for the ReadCallback.
void ReadData();
+ // Utility method used by GetVolume() and IsMuted().
+ bool GetSourceInformation(pa_source_info_cb_t callback);
+
AudioManagerPulse* audio_manager_;
AudioInputCallback* callback_;
std::string device_name_;
@@ -60,6 +64,10 @@
double volume_;
bool stream_started_;
+ // Set to true in IsMuted() if user has muted the selected microphone in the
+ // sound settings UI.
+ bool muted_;
+
// Holds the data from the OS.
AudioBlockFifo fifo_;
diff --git a/media/audio/virtual_audio_input_stream.cc b/media/audio/virtual_audio_input_stream.cc
index f660b9c..da34947 100644
--- a/media/audio/virtual_audio_input_stream.cc
+++ b/media/audio/virtual_audio_input_stream.cc
@@ -173,4 +173,8 @@
return false;
}
+bool VirtualAudioInputStream::IsMuted() {
+ return false;
+}
+
} // namespace media
diff --git a/media/audio/virtual_audio_input_stream.h b/media/audio/virtual_audio_input_stream.h
index 17e2730..2a52d9e 100644
--- a/media/audio/virtual_audio_input_stream.h
+++ b/media/audio/virtual_audio_input_stream.h
@@ -56,6 +56,7 @@
virtual double GetVolume() OVERRIDE;
virtual void SetAutomaticGainControl(bool enabled) OVERRIDE;
virtual bool GetAutomaticGainControl() OVERRIDE;
+ virtual bool IsMuted() OVERRIDE;
// Attaches a VirtualAudioOutputStream to be used as input. This
// VirtualAudioInputStream must outlive all attached streams, so any attached
diff --git a/media/audio/win/audio_low_latency_input_win.cc b/media/audio/win/audio_low_latency_input_win.cc
index 9fe061b..8df8620 100644
--- a/media/audio/win/audio_low_latency_input_win.cc
+++ b/media/audio/win/audio_low_latency_input_win.cc
@@ -253,7 +253,7 @@
}
double WASAPIAudioInputStream::GetVolume() {
- DLOG_IF(ERROR, !opened_) << "Open() has not been called successfully";
+ DCHECK(opened_) << "Open() has not been called successfully";
if (!opened_)
return 0.0;
@@ -265,6 +265,20 @@
return static_cast<double>(level);
}
+bool WASAPIAudioInputStream::IsMuted() {
+ DCHECK(opened_) << "Open() has not been called successfully";
+ DCHECK(CalledOnValidThread());
+ if (!opened_)
+ return false;
+
+ // Retrieves the current muting state for the audio session.
+ BOOL is_muted = FALSE;
+ HRESULT hr = simple_audio_volume_->GetMute(&is_muted);
+ DLOG_IF(WARNING, FAILED(hr)) << "Failed to get input master volume.";
+
+ return is_muted != FALSE;
+}
+
// static
AudioParameters WASAPIAudioInputStream::GetInputStreamParameters(
const std::string& device_id) {
diff --git a/media/audio/win/audio_low_latency_input_win.h b/media/audio/win/audio_low_latency_input_win.h
index 91fdde1..efd776f 100644
--- a/media/audio/win/audio_low_latency_input_win.h
+++ b/media/audio/win/audio_low_latency_input_win.h
@@ -102,6 +102,7 @@
virtual double GetMaxVolume() OVERRIDE;
virtual void SetVolume(double volume) OVERRIDE;
virtual double GetVolume() OVERRIDE;
+ virtual bool IsMuted() OVERRIDE;
bool started() const { return started_; }
diff --git a/media/audio/win/wavein_input_win.cc b/media/audio/win/wavein_input_win.cc
index e96a877..72c5841 100644
--- a/media/audio/win/wavein_input_win.cc
+++ b/media/audio/win/wavein_input_win.cc
@@ -226,6 +226,11 @@
return false;
}
+bool PCMWaveInAudioInputStream::IsMuted() {
+ NOTIMPLEMENTED();
+ return false;
+}
+
void PCMWaveInAudioInputStream::HandleError(MMRESULT error) {
DLOG(WARNING) << "PCMWaveInAudio error " << error;
if (callback_)
diff --git a/media/audio/win/wavein_input_win.h b/media/audio/win/wavein_input_win.h
index 5b1edd5..67ea043 100644
--- a/media/audio/win/wavein_input_win.h
+++ b/media/audio/win/wavein_input_win.h
@@ -45,6 +45,7 @@
virtual double GetVolume() OVERRIDE;
virtual void SetAutomaticGainControl(bool enabled) OVERRIDE;
virtual bool GetAutomaticGainControl() OVERRIDE;
+ virtual bool IsMuted() OVERRIDE;
private:
enum State {
diff --git a/media/blink/media_blink.target.darwin-arm.mk b/media/blink/media_blink.target.darwin-arm.mk
index 51801dd..8670cda 100644
--- a/media/blink/media_blink.target.darwin-arm.mk
+++ b/media/blink/media_blink.target.darwin-arm.mk
@@ -123,6 +123,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -277,6 +278,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/media/blink/media_blink.target.darwin-arm64.mk b/media/blink/media_blink.target.darwin-arm64.mk
index c7eadda..5e08cb6 100644
--- a/media/blink/media_blink.target.darwin-arm64.mk
+++ b/media/blink/media_blink.target.darwin-arm64.mk
@@ -112,6 +112,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -254,6 +255,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/media/blink/media_blink.target.darwin-mips.mk b/media/blink/media_blink.target.darwin-mips.mk
index 0c178e3..8098113 100644
--- a/media/blink/media_blink.target.darwin-mips.mk
+++ b/media/blink/media_blink.target.darwin-mips.mk
@@ -116,6 +116,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -263,6 +264,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/media/blink/media_blink.target.darwin-x86.mk b/media/blink/media_blink.target.darwin-x86.mk
index 64f01ca..7c1593e 100644
--- a/media/blink/media_blink.target.darwin-x86.mk
+++ b/media/blink/media_blink.target.darwin-x86.mk
@@ -118,6 +118,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -265,6 +266,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/media/blink/media_blink.target.darwin-x86_64.mk b/media/blink/media_blink.target.darwin-x86_64.mk
index e87d82f..cbf7bd3 100644
--- a/media/blink/media_blink.target.darwin-x86_64.mk
+++ b/media/blink/media_blink.target.darwin-x86_64.mk
@@ -117,6 +117,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -264,6 +265,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/media/blink/media_blink.target.linux-arm.mk b/media/blink/media_blink.target.linux-arm.mk
index 51801dd..8670cda 100644
--- a/media/blink/media_blink.target.linux-arm.mk
+++ b/media/blink/media_blink.target.linux-arm.mk
@@ -123,6 +123,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -277,6 +278,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/media/blink/media_blink.target.linux-arm64.mk b/media/blink/media_blink.target.linux-arm64.mk
index c7eadda..5e08cb6 100644
--- a/media/blink/media_blink.target.linux-arm64.mk
+++ b/media/blink/media_blink.target.linux-arm64.mk
@@ -112,6 +112,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -254,6 +255,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/media/blink/media_blink.target.linux-mips.mk b/media/blink/media_blink.target.linux-mips.mk
index 0c178e3..8098113 100644
--- a/media/blink/media_blink.target.linux-mips.mk
+++ b/media/blink/media_blink.target.linux-mips.mk
@@ -116,6 +116,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -263,6 +264,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/media/blink/media_blink.target.linux-x86.mk b/media/blink/media_blink.target.linux-x86.mk
index 64f01ca..7c1593e 100644
--- a/media/blink/media_blink.target.linux-x86.mk
+++ b/media/blink/media_blink.target.linux-x86.mk
@@ -118,6 +118,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -265,6 +266,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/media/blink/media_blink.target.linux-x86_64.mk b/media/blink/media_blink.target.linux-x86_64.mk
index e87d82f..cbf7bd3 100644
--- a/media/blink/media_blink.target.linux-x86_64.mk
+++ b/media/blink/media_blink.target.linux-x86_64.mk
@@ -117,6 +117,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -264,6 +265,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/media/media.target.darwin-arm.mk b/media/media.target.darwin-arm.mk
index ca26343..5ddc81a 100644
--- a/media/media.target.darwin-arm.mk
+++ b/media/media.target.darwin-arm.mk
@@ -305,6 +305,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -445,6 +446,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/media/media.target.darwin-arm64.mk b/media/media.target.darwin-arm64.mk
index fd78fb2..9ed9e03 100644
--- a/media/media.target.darwin-arm64.mk
+++ b/media/media.target.darwin-arm64.mk
@@ -294,6 +294,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -422,6 +423,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/media/media.target.darwin-mips.mk b/media/media.target.darwin-mips.mk
index c0bfe53..22d9e2f 100644
--- a/media/media.target.darwin-mips.mk
+++ b/media/media.target.darwin-mips.mk
@@ -297,6 +297,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -429,6 +430,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/media/media.target.darwin-x86.mk b/media/media.target.darwin-x86.mk
index a1597f7..05a74e3 100644
--- a/media/media.target.darwin-x86.mk
+++ b/media/media.target.darwin-x86.mk
@@ -301,6 +301,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -435,6 +436,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/media/media.target.darwin-x86_64.mk b/media/media.target.darwin-x86_64.mk
index 2705a44..1ff0a87 100644
--- a/media/media.target.darwin-x86_64.mk
+++ b/media/media.target.darwin-x86_64.mk
@@ -300,6 +300,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -433,6 +434,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/media/media.target.linux-arm.mk b/media/media.target.linux-arm.mk
index ca26343..5ddc81a 100644
--- a/media/media.target.linux-arm.mk
+++ b/media/media.target.linux-arm.mk
@@ -305,6 +305,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -445,6 +446,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/media/media.target.linux-arm64.mk b/media/media.target.linux-arm64.mk
index fd78fb2..9ed9e03 100644
--- a/media/media.target.linux-arm64.mk
+++ b/media/media.target.linux-arm64.mk
@@ -294,6 +294,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -422,6 +423,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/media/media.target.linux-mips.mk b/media/media.target.linux-mips.mk
index c0bfe53..22d9e2f 100644
--- a/media/media.target.linux-mips.mk
+++ b/media/media.target.linux-mips.mk
@@ -297,6 +297,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -429,6 +430,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/media/media.target.linux-x86.mk b/media/media.target.linux-x86.mk
index a1597f7..05a74e3 100644
--- a/media/media.target.linux-x86.mk
+++ b/media/media.target.linux-x86.mk
@@ -301,6 +301,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -435,6 +436,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/media/media.target.linux-x86_64.mk b/media/media.target.linux-x86_64.mk
index 2705a44..1ff0a87 100644
--- a/media/media.target.linux-x86_64.mk
+++ b/media/media.target.linux-x86_64.mk
@@ -300,6 +300,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -433,6 +434,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/net/base/data_url.cc b/net/base/data_url.cc
index 0ec345e..58036c6 100644
--- a/net/base/data_url.cc
+++ b/net/base/data_url.cc
@@ -66,10 +66,16 @@
}
if (mime_type->empty()) {
- // fallback to defaults if nothing specified in the URL:
+ // Fallback to the default if nothing specified in the mediatype part as
+ // specified in RFC2045. As specified in RFC2397, we use |charset| even if
+ // |mime_type| is empty.
mime_type->assign("text/plain");
} else if (!ParseMimeTypeWithoutParameter(*mime_type, NULL, NULL)) {
- return false;
+ // Fallback to the default as recommended in RFC2045 when the mediatype
+ // value is invalid. For this case, we don't respect |charset| but force it
+ // set to "US-ASCII".
+ mime_type->assign("text/plain");
+ charset->assign("US-ASCII");
}
if (charset->empty())
charset->assign("US-ASCII");
diff --git a/net/base/data_url.h b/net/base/data_url.h
index 3c1e303..ee9c6d3 100644
--- a/net/base/data_url.h
+++ b/net/base/data_url.h
@@ -35,8 +35,23 @@
// decoded data (e.g.., if the data URL specifies base64 encoding, then the
// returned data is base64 decoded, and any %-escaped bytes are unescaped).
//
- // If the URL is malformed, then this method will return false, and its
- // output variables will remain unchanged. On success, true is returned.
+ // If the media type value doesn't match the media-type production defined in
+ // RFC 7231, mime_type will be set to the default value "text/plain". We
+ // don't simply fail for this grammar violation since Chromium had been
+ // accepting such invalid values. For example, <img> element with the src
+ // attribute set to a data URL with an invalid media type "image" (without a
+ // slash and subtype) had been displayed. However, the value this method will
+ // store in mime_type argument can be used for generating other headers, etc.
+ // This could lead to security vulnerability. We don't want to accept
+ // arbitrary value and ask each caller to validate the return value.
+ //
+ // If the charset parameter is specified but its value doesn't match the
+ // token production defined in RFC 7230, this method simply fails and returns
+ // false.
+ //
+ // If there's any other grammar violation in the URL, then this method will
+ // return false. Output variables may be changed and contain invalid data. On
+ // success, true is returned.
//
// OPTIONAL: If |data| is NULL, then the <data> section will not be parsed
// or validated.
diff --git a/net/base/data_url_unittest.cc b/net/base/data_url_unittest.cc
index 5a5dbe8..3876301 100644
--- a/net/base/data_url_unittest.cc
+++ b/net/base/data_url_unittest.cc
@@ -63,6 +63,28 @@
"US-ASCII",
"hello world" },
+ // Allow invalid mediatype for backward compatibility but set mime_type to
+ // "text/plain" instead of the invalid mediatype.
+ { "data:foo,boo",
+ true,
+ "text/plain",
+ "US-ASCII",
+ "boo" },
+
+ // When accepting an invalid mediatype, override charset with "US-ASCII"
+ { "data:foo;charset=UTF-8,boo",
+ true,
+ "text/plain",
+ "US-ASCII",
+ "boo" },
+
+ // Invalid mediatype. Includes a slash but the type part is not a token.
+ { "data:f(oo/bar;baz=1;charset=kk,boo",
+ true,
+ "text/plain",
+ "US-ASCII",
+ "boo" },
+
{ "data:foo/bar;baz=1;charset=kk,boo",
true,
"foo/bar",
@@ -88,13 +110,6 @@
"US-ASCII",
"<html><body><b>hello world</b></body></html>" },
- // Bad mime type
- { "data:f(oo/bar;baz=1;charset=kk,boo",
- false,
- "",
- "",
- "" },
-
// the comma cannot be url-escaped!
{ "data:%2Cblah",
false,
diff --git a/net/quic/quic_reliable_client_stream.cc b/net/quic/quic_reliable_client_stream.cc
index 79397bc..af4b462 100644
--- a/net/quic/quic_reliable_client_stream.cc
+++ b/net/quic/quic_reliable_client_stream.cc
@@ -42,12 +42,12 @@
return data_len;
}
-void QuicReliableClientStream::OnFinRead() {
+void QuicReliableClientStream::OnClose() {
if (delegate_) {
delegate_->OnClose(connection_error());
delegate_ = NULL;
}
- ReliableQuicStream::OnFinRead();
+ ReliableQuicStream::OnClose();
}
void QuicReliableClientStream::OnCanWrite() {
diff --git a/net/quic/quic_reliable_client_stream.h b/net/quic/quic_reliable_client_stream.h
index 2d5b818..2251492 100644
--- a/net/quic/quic_reliable_client_stream.h
+++ b/net/quic/quic_reliable_client_stream.h
@@ -55,7 +55,7 @@
// QuicDataStream
virtual uint32 ProcessData(const char* data, uint32 data_len) OVERRIDE;
- virtual void OnFinRead() OVERRIDE;
+ virtual void OnClose() OVERRIDE;
virtual void OnCanWrite() OVERRIDE;
virtual QuicPriority EffectivePriority() const OVERRIDE;
diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc
index 7860a1c..994a4d6 100644
--- a/net/socket/ssl_client_socket_openssl.cc
+++ b/net/socket/ssl_client_socket_openssl.cc
@@ -632,7 +632,7 @@
user_read_buf_ = buf;
user_read_buf_len_ = buf_len;
- int rv = DoReadLoop(OK);
+ int rv = DoReadLoop();
if (rv == ERR_IO_PENDING) {
user_read_callback_ = callback;
@@ -657,7 +657,7 @@
user_write_buf_ = buf;
user_write_buf_len_ = buf_len;
- int rv = DoWriteLoop(OK);
+ int rv = DoWriteLoop();
if (rv == ERR_IO_PENDING) {
user_write_callback_ = callback;
@@ -1235,7 +1235,7 @@
if (!user_read_buf_.get())
return;
- int rv = DoReadLoop(result);
+ int rv = DoReadLoop();
if (rv != ERR_IO_PENDING)
DoReadCallback(rv);
}
@@ -1287,10 +1287,7 @@
return rv;
}
-int SSLClientSocketOpenSSL::DoReadLoop(int result) {
- if (result < 0)
- return result;
-
+int SSLClientSocketOpenSSL::DoReadLoop() {
bool network_moved;
int rv;
do {
@@ -1301,10 +1298,7 @@
return rv;
}
-int SSLClientSocketOpenSSL::DoWriteLoop(int result) {
- if (result < 0)
- return result;
-
+int SSLClientSocketOpenSSL::DoWriteLoop() {
bool network_moved;
int rv;
do {
@@ -1362,6 +1356,15 @@
} else if (*next_result < 0) {
int err = SSL_get_error(ssl_, *next_result);
*next_result = MapOpenSSLError(err, err_tracer);
+
+ // Many servers do not reliably send a close_notify alert when shutting
+ // down a connection, and instead terminate the TCP connection. This is
+ // reported as ERR_CONNECTION_CLOSED. Because of this, map the unclean
+ // shutdown to a graceful EOF, instead of treating it as an error as it
+ // should be.
+ if (*next_result == ERR_CONNECTION_CLOSED)
+ *next_result = 0;
+
if (rv > 0 && *next_result == ERR_IO_PENDING) {
// If at least some data was read from SSL_read(), do not treat
// insufficient data as an error to return in the next call to
diff --git a/net/socket/ssl_client_socket_openssl.h b/net/socket/ssl_client_socket_openssl.h
index 1465f84..0493827 100644
--- a/net/socket/ssl_client_socket_openssl.h
+++ b/net/socket/ssl_client_socket_openssl.h
@@ -130,8 +130,8 @@
void OnRecvComplete(int result);
int DoHandshakeLoop(int last_io_result);
- int DoReadLoop(int result);
- int DoWriteLoop(int result);
+ int DoReadLoop();
+ int DoWriteLoop();
int DoPayloadRead();
int DoPayloadWrite();
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc
index 4e844cd..7573dbd 100644
--- a/net/socket/ssl_client_socket_unittest.cc
+++ b/net/socket/ssl_client_socket_unittest.cc
@@ -276,7 +276,7 @@
// If there is already a pending asynchronous read, the configured error
// will not be returned until that asynchronous read has completed and Read()
// is called again.
- void SetNextReadError(Error error) {
+ void SetNextReadError(int error) {
DCHECK_GE(0, error);
have_read_error_ = true;
pending_read_error_ = error;
@@ -286,7 +286,7 @@
// If there is already a pending asynchronous write, the configured error
// will not be returned until that asynchronous write has completed and
// Write() is called again.
- void SetNextWriteError(Error error) {
+ void SetNextWriteError(int error) {
DCHECK_GE(0, error);
have_write_error_ = true;
pending_write_error_ = error;
@@ -1827,6 +1827,126 @@
#endif
}
+// Tests that SSLClientSocket fails the handshake if the underlying
+// transport is cleanly closed.
+TEST_F(SSLClientSocketTest, Connect_WithZeroReturn) {
+ SpawnedTestServer test_server(SpawnedTestServer::TYPE_HTTPS,
+ SpawnedTestServer::kLocalhost,
+ base::FilePath());
+ ASSERT_TRUE(test_server.Start());
+
+ AddressList addr;
+ ASSERT_TRUE(test_server.GetAddressList(&addr));
+
+ TestCompletionCallback callback;
+ scoped_ptr<StreamSocket> real_transport(
+ new TCPClientSocket(addr, NULL, NetLog::Source()));
+ scoped_ptr<SynchronousErrorStreamSocket> transport(
+ new SynchronousErrorStreamSocket(real_transport.Pass()));
+ int rv = callback.GetResult(transport->Connect(callback.callback()));
+ EXPECT_EQ(OK, rv);
+
+ SynchronousErrorStreamSocket* raw_transport = transport.get();
+ scoped_ptr<SSLClientSocket> sock(
+ CreateSSLClientSocket(transport.PassAs<StreamSocket>(),
+ test_server.host_port_pair(),
+ kDefaultSSLConfig));
+
+ raw_transport->SetNextReadError(0);
+
+ rv = callback.GetResult(sock->Connect(callback.callback()));
+ EXPECT_EQ(ERR_CONNECTION_CLOSED, rv);
+ EXPECT_FALSE(sock->IsConnected());
+}
+
+// Tests that SSLClientSocket cleanly returns a Read of size 0 if the
+// underlying socket is cleanly closed.
+// This is a regression test for https://crbug.com/422246
+TEST_F(SSLClientSocketTest, Read_WithZeroReturn) {
+ SpawnedTestServer test_server(SpawnedTestServer::TYPE_HTTPS,
+ SpawnedTestServer::kLocalhost,
+ base::FilePath());
+ ASSERT_TRUE(test_server.Start());
+
+ AddressList addr;
+ ASSERT_TRUE(test_server.GetAddressList(&addr));
+
+ TestCompletionCallback callback;
+ scoped_ptr<StreamSocket> real_transport(
+ new TCPClientSocket(addr, NULL, NetLog::Source()));
+ scoped_ptr<SynchronousErrorStreamSocket> transport(
+ new SynchronousErrorStreamSocket(real_transport.Pass()));
+ int rv = callback.GetResult(transport->Connect(callback.callback()));
+ EXPECT_EQ(OK, rv);
+
+ // Disable TLS False Start to ensure the handshake has completed.
+ SSLConfig ssl_config;
+ ssl_config.false_start_enabled = false;
+
+ SynchronousErrorStreamSocket* raw_transport = transport.get();
+ scoped_ptr<SSLClientSocket> sock(
+ CreateSSLClientSocket(transport.PassAs<StreamSocket>(),
+ test_server.host_port_pair(),
+ ssl_config));
+
+ rv = callback.GetResult(sock->Connect(callback.callback()));
+ EXPECT_EQ(OK, rv);
+ EXPECT_TRUE(sock->IsConnected());
+
+ raw_transport->SetNextReadError(0);
+ scoped_refptr<IOBuffer> buf(new IOBuffer(4096));
+ rv = callback.GetResult(sock->Read(buf.get(), 4096, callback.callback()));
+ EXPECT_EQ(0, rv);
+}
+
+// Tests that SSLClientSocket cleanly returns a Read of size 0 if the
+// underlying socket is cleanly closed asynchronously.
+// This is a regression test for https://crbug.com/422246
+TEST_F(SSLClientSocketTest, Read_WithAsyncZeroReturn) {
+ SpawnedTestServer test_server(SpawnedTestServer::TYPE_HTTPS,
+ SpawnedTestServer::kLocalhost,
+ base::FilePath());
+ ASSERT_TRUE(test_server.Start());
+
+ AddressList addr;
+ ASSERT_TRUE(test_server.GetAddressList(&addr));
+
+ TestCompletionCallback callback;
+ scoped_ptr<StreamSocket> real_transport(
+ new TCPClientSocket(addr, NULL, NetLog::Source()));
+ scoped_ptr<SynchronousErrorStreamSocket> error_socket(
+ new SynchronousErrorStreamSocket(real_transport.Pass()));
+ SynchronousErrorStreamSocket* raw_error_socket = error_socket.get();
+ scoped_ptr<FakeBlockingStreamSocket> transport(
+ new FakeBlockingStreamSocket(error_socket.PassAs<StreamSocket>()));
+ FakeBlockingStreamSocket* raw_transport = transport.get();
+ int rv = callback.GetResult(transport->Connect(callback.callback()));
+ EXPECT_EQ(OK, rv);
+
+ // Disable TLS False Start to ensure the handshake has completed.
+ SSLConfig ssl_config;
+ ssl_config.false_start_enabled = false;
+
+ scoped_ptr<SSLClientSocket> sock(
+ CreateSSLClientSocket(transport.PassAs<StreamSocket>(),
+ test_server.host_port_pair(),
+ ssl_config));
+
+ rv = callback.GetResult(sock->Connect(callback.callback()));
+ EXPECT_EQ(OK, rv);
+ EXPECT_TRUE(sock->IsConnected());
+
+ raw_error_socket->SetNextReadError(0);
+ raw_transport->BlockReadResult();
+ scoped_refptr<IOBuffer> buf(new IOBuffer(4096));
+ rv = sock->Read(buf.get(), 4096, callback.callback());
+ EXPECT_EQ(ERR_IO_PENDING, rv);
+
+ raw_transport->UnblockReadResult();
+ rv = callback.GetResult(rv);
+ EXPECT_EQ(0, rv);
+}
+
TEST_F(SSLClientSocketTest, Read_SmallChunks) {
SpawnedTestServer test_server(SpawnedTestServer::TYPE_HTTPS,
SpawnedTestServer::kLocalhost,
diff --git a/net/url_request/url_request_data_job_unittest.cc b/net/url_request/url_request_data_job_unittest.cc
index 81903be..49a7ecd 100644
--- a/net/url_request/url_request_data_job_unittest.cc
+++ b/net/url_request/url_request_data_job_unittest.cc
@@ -63,12 +63,17 @@
scoped_refptr<net::HttpResponseHeaders> headers(
new net::HttpResponseHeaders(std::string()));
- // MIME type contains delimiters. Must be rejected.
+ // MIME type contains delimiters. Must be accepted but Content-Type header
+ // should be generated as if the mediatype was text/plain.
EXPECT_EQ(
- net::ERR_INVALID_URL,
+ net::OK,
URLRequestDataJob::BuildResponse(
GURL("data:f(o/b)r,test"),
&mime_type, &charset, &data, headers.get()));
+
+ std::string value;
+ EXPECT_TRUE(headers->GetNormalizedHeader("Content-Type", &value));
+ EXPECT_EQ(value, "text/plain;charset=US-ASCII");
}
TEST(BuildResponseTest, InvalidCharset) {
diff --git a/printing/printing.target.darwin-arm.mk b/printing/printing.target.darwin-arm.mk
index 7588d80..7a01545 100644
--- a/printing/printing.target.darwin-arm.mk
+++ b/printing/printing.target.darwin-arm.mk
@@ -128,6 +128,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -262,6 +263,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/printing/printing.target.darwin-arm64.mk b/printing/printing.target.darwin-arm64.mk
index 00c8279..e4e7665 100644
--- a/printing/printing.target.darwin-arm64.mk
+++ b/printing/printing.target.darwin-arm64.mk
@@ -117,6 +117,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -239,6 +240,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/printing/printing.target.darwin-mips.mk b/printing/printing.target.darwin-mips.mk
index 7b4b2ba..8966b87 100644
--- a/printing/printing.target.darwin-mips.mk
+++ b/printing/printing.target.darwin-mips.mk
@@ -120,6 +120,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -246,6 +247,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/printing/printing.target.darwin-x86.mk b/printing/printing.target.darwin-x86.mk
index 12c084c..2843b17 100644
--- a/printing/printing.target.darwin-x86.mk
+++ b/printing/printing.target.darwin-x86.mk
@@ -123,6 +123,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -251,6 +252,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/printing/printing.target.darwin-x86_64.mk b/printing/printing.target.darwin-x86_64.mk
index ca94365..4ed9d1a 100644
--- a/printing/printing.target.darwin-x86_64.mk
+++ b/printing/printing.target.darwin-x86_64.mk
@@ -122,6 +122,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -249,6 +250,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/printing/printing.target.linux-arm.mk b/printing/printing.target.linux-arm.mk
index 7588d80..7a01545 100644
--- a/printing/printing.target.linux-arm.mk
+++ b/printing/printing.target.linux-arm.mk
@@ -128,6 +128,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -262,6 +263,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/printing/printing.target.linux-arm64.mk b/printing/printing.target.linux-arm64.mk
index 00c8279..e4e7665 100644
--- a/printing/printing.target.linux-arm64.mk
+++ b/printing/printing.target.linux-arm64.mk
@@ -117,6 +117,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -239,6 +240,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/printing/printing.target.linux-mips.mk b/printing/printing.target.linux-mips.mk
index 7b4b2ba..8966b87 100644
--- a/printing/printing.target.linux-mips.mk
+++ b/printing/printing.target.linux-mips.mk
@@ -120,6 +120,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -246,6 +247,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/printing/printing.target.linux-x86.mk b/printing/printing.target.linux-x86.mk
index 12c084c..2843b17 100644
--- a/printing/printing.target.linux-x86.mk
+++ b/printing/printing.target.linux-x86.mk
@@ -123,6 +123,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -251,6 +252,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/printing/printing.target.linux-x86_64.mk b/printing/printing.target.linux-x86_64.mk
index ca94365..4ed9d1a 100644
--- a/printing/printing.target.linux-x86_64.mk
+++ b/printing/printing.target.linux-x86_64.mk
@@ -122,6 +122,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -249,6 +250,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/remoting/client/plugin/normalizing_input_filter_cros.cc b/remoting/client/plugin/normalizing_input_filter_cros.cc
index 5ad77ee..bd4cb80 100644
--- a/remoting/client/plugin/normalizing_input_filter_cros.cc
+++ b/remoting/client/plugin/normalizing_input_filter_cros.cc
@@ -12,11 +12,17 @@
// Returns true for OSKey codes.
static bool IsOsKey(unsigned int code) {
- const unsigned int kUsbLeftOsKey = 0x0700e3;
- const unsigned int kUsbRightOsKey = 0x0700e7;
+ const unsigned int kUsbLeftOsKey = 0x0700e3;
+ const unsigned int kUsbRightOsKey = 0x0700e7;
return code == kUsbLeftOsKey || code == kUsbRightOsKey;
}
+// Returns true for the left-hand Alt key.
+static bool IsLeftAltKey(unsigned int code) {
+ const unsigned int kUsbLeftAltKey = 0x0700e2;
+ return code == kUsbLeftAltKey;
+}
+
// Returns true for codes generated by EventRewriter::RewriteFunctionKeys().
static bool IsRewrittenFunctionKey(unsigned int code) {
const unsigned int kUsbFunctionKeyMin = 0x07003a;
@@ -72,14 +78,27 @@
// - If the OSKey keyup is received then we send it and we move to State #1.
// - All other key event pass through the filter unchanged.
//
+// ChromeOS also maps Alt+LeftClick to RightClick (even for an external mouse).
+// As with the OSKey remapping described above, this is fed into this filter
+// as Alt followed by RightClick. However, because there are other ways to
+// generate RightClick (two-finger tap, for example), rather than suppressing
+// the Alt key as we do for the OSKey (which would allow Alt+LeftClick to be
+// interpreted as interpreted as RightClick as per the ChromeOS idiom), the
+// filter maps RightClick to LeftClick while LeftAlt is held, which allows
+// Alt+LeftClick to be injected. The equivalent mapping using RightAlt is
+// unchanged, allowing Alt+RightClick also to be injected, as long as the
+// target application doesn't distinguish between left and right Alt keys.
+//
// This file must be kept up-to-date with changes to
-// chrome/browser/ui/ash/event_rewriter.cc
+// chrome/browser/chromeos/events/event_rewriter.cc
+
NormalizingInputFilterCros::NormalizingInputFilterCros(
protocol::InputStub* input_stub)
: protocol::InputFilter(input_stub),
deferred_key_is_rewriting_(false),
- modifying_key_(0) {
+ modifying_key_(0),
+ left_alt_is_pressed_(false) {
}
NormalizingInputFilterCros::~NormalizingInputFilterCros() {}
@@ -100,7 +119,13 @@
const protocol::MouseEvent& event) {
if (deferred_keydown_event_.has_usb_keycode())
SwitchRewritingKeyToModifying();
- InputFilter::InjectMouseEvent(event);
+ protocol::MouseEvent newEvent = event;
+ if (left_alt_is_pressed_ &&
+ event.has_button() &&
+ event.button() == protocol::MouseEvent::BUTTON_RIGHT) {
+ newEvent.set_button(protocol::MouseEvent::BUTTON_LEFT);
+ }
+ InputFilter::InjectMouseEvent(newEvent);
}
void NormalizingInputFilterCros::ProcessKeyDown(
@@ -140,6 +165,9 @@
SwitchRewritingKeyToModifying();
}
+ if (IsLeftAltKey(event.usb_keycode()))
+ left_alt_is_pressed_ = true;
+
InputFilter::InjectKeyEvent(event);
}
@@ -159,6 +187,9 @@
if (modifying_key_ == event.usb_keycode())
modifying_key_ = 0;
+ if (IsLeftAltKey(event.usb_keycode()))
+ left_alt_is_pressed_ = false;
+
InputFilter::InjectKeyEvent(event);
}
diff --git a/remoting/client/plugin/normalizing_input_filter_cros.h b/remoting/client/plugin/normalizing_input_filter_cros.h
index 977c90c..9b726da 100644
--- a/remoting/client/plugin/normalizing_input_filter_cros.h
+++ b/remoting/client/plugin/normalizing_input_filter_cros.h
@@ -48,6 +48,9 @@
// Stores the code of the OSKey while it is pressed for use as a Modifier.
uint32 modifying_key_;
+ // True if the left Alt key is pressed.
+ bool left_alt_is_pressed_;
+
DISALLOW_COPY_AND_ASSIGN(NormalizingInputFilterCros);
};
diff --git a/remoting/client/plugin/normalizing_input_filter_cros_unittest.cc b/remoting/client/plugin/normalizing_input_filter_cros_unittest.cc
index 9001471..1e3e2fb 100644
--- a/remoting/client/plugin/normalizing_input_filter_cros_unittest.cc
+++ b/remoting/client/plugin/normalizing_input_filter_cros_unittest.cc
@@ -21,6 +21,8 @@
const unsigned int kUsbLeftOsKey = 0x0700e3;
const unsigned int kUsbRightOsKey = 0x0700e7;
+const unsigned int kUsbLeftAltKey = 0x0700e2;
+const unsigned int kUsbRightAltKey = 0x0700e6;
const unsigned int kUsbFunctionKey = 0x07003a; // F1
const unsigned int kUsbExtendedKey = 0x070049; // Insert
@@ -52,6 +54,10 @@
return arg.x() == x && arg.y() == y;
}
+MATCHER_P2(EqualsMouseButtonEvent, button, button_down, "") {
+ return arg.button() == button && arg.button_down() == button_down;
+}
+
static MouseEvent MakeMouseMoveEvent(int x, int y) {
MouseEvent event;
event.set_x(x);
@@ -59,6 +65,14 @@
return event;
}
+static MouseEvent MakeMouseButtonEvent(MouseEvent::MouseButton button,
+ bool button_down) {
+ MouseEvent event;
+ event.set_button(button);
+ event.set_button_down(button_down);
+ return event;
+}
+
} // namespace
// Test OSKey press/release.
@@ -210,4 +224,58 @@
processor->InjectKeyEvent(MakeKeyEvent(kUsbLeftOsKey, false));
}
+// Test left alt + right click is remapped to left alt + left click.
+TEST(NormalizingInputFilterCrosTest, LeftAltClick) {
+ MockInputStub stub;
+ scoped_ptr<protocol::InputFilter> processor(
+ new NormalizingInputFilterCros(&stub));
+
+ {
+ InSequence s;
+
+ EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbLeftAltKey, true)));
+ EXPECT_CALL(stub, InjectMouseEvent(
+ EqualsMouseButtonEvent(MouseEvent::BUTTON_LEFT, true)));
+ EXPECT_CALL(stub, InjectMouseEvent(
+ EqualsMouseButtonEvent(MouseEvent::BUTTON_LEFT, false)));
+ EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbLeftAltKey, false)));
+ }
+
+ // Hold the left alt key while left-clicking. ChromeOS will rewrite this as
+ // Alt+RightClick
+ processor->InjectKeyEvent(MakeKeyEvent(kUsbLeftAltKey, true));
+ processor->InjectMouseEvent(
+ MakeMouseButtonEvent(MouseEvent::BUTTON_RIGHT, true));
+ processor->InjectMouseEvent(
+ MakeMouseButtonEvent(MouseEvent::BUTTON_RIGHT, false));
+ processor->InjectKeyEvent(MakeKeyEvent(kUsbLeftAltKey, false));
+}
+
+// Test that right alt + right click is unchanged.
+TEST(NormalizingInputFilterCrosTest, RightAltClick) {
+ MockInputStub stub;
+ scoped_ptr<protocol::InputFilter> processor(
+ new NormalizingInputFilterCros(&stub));
+
+ {
+ InSequence s;
+
+ EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbRightAltKey, true)));
+ EXPECT_CALL(stub, InjectMouseEvent(
+ EqualsMouseButtonEvent(MouseEvent::BUTTON_RIGHT, true)));
+ EXPECT_CALL(stub, InjectMouseEvent(
+ EqualsMouseButtonEvent(MouseEvent::BUTTON_RIGHT, false)));
+ EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbRightAltKey, false)));
+ }
+
+ // Hold the right alt key while left-clicking. ChromeOS will rewrite this as
+ // Alt+RightClick
+ processor->InjectKeyEvent(MakeKeyEvent(kUsbRightAltKey, true));
+ processor->InjectMouseEvent(
+ MakeMouseButtonEvent(MouseEvent::BUTTON_RIGHT, true));
+ processor->InjectMouseEvent(
+ MakeMouseButtonEvent(MouseEvent::BUTTON_RIGHT, false));
+ processor->InjectKeyEvent(MakeKeyEvent(kUsbRightAltKey, false));
+}
+
} // namespace remoting
diff --git a/skia/skia_chrome.target.darwin-arm.mk b/skia/skia_chrome.target.darwin-arm.mk
index e4fa0ca..8bcaa8c 100644
--- a/skia/skia_chrome.target.darwin-arm.mk
+++ b/skia/skia_chrome.target.darwin-arm.mk
@@ -139,6 +139,7 @@
'-DSK_USE_POSIX_THREADS' \
'-DSK_ARM_HAS_OPTIONAL_NEON' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -278,6 +279,7 @@
'-DSK_USE_POSIX_THREADS' \
'-DSK_ARM_HAS_OPTIONAL_NEON' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/skia/skia_chrome.target.darwin-arm64.mk b/skia/skia_chrome.target.darwin-arm64.mk
index 56cca44..2c81852 100644
--- a/skia/skia_chrome.target.darwin-arm64.mk
+++ b/skia/skia_chrome.target.darwin-arm64.mk
@@ -127,6 +127,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -253,6 +254,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/skia/skia_chrome.target.darwin-mips.mk b/skia/skia_chrome.target.darwin-mips.mk
index a26629c..971676d 100644
--- a/skia/skia_chrome.target.darwin-mips.mk
+++ b/skia/skia_chrome.target.darwin-mips.mk
@@ -131,6 +131,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -262,6 +263,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/skia/skia_chrome.target.darwin-x86.mk b/skia/skia_chrome.target.darwin-x86.mk
index 12d8cdc..9df19c4 100644
--- a/skia/skia_chrome.target.darwin-x86.mk
+++ b/skia/skia_chrome.target.darwin-x86.mk
@@ -133,6 +133,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -265,6 +266,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/skia/skia_chrome.target.darwin-x86_64.mk b/skia/skia_chrome.target.darwin-x86_64.mk
index b171c26..27906b0 100644
--- a/skia/skia_chrome.target.darwin-x86_64.mk
+++ b/skia/skia_chrome.target.darwin-x86_64.mk
@@ -132,6 +132,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -263,6 +264,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/skia/skia_chrome.target.linux-arm.mk b/skia/skia_chrome.target.linux-arm.mk
index e4fa0ca..8bcaa8c 100644
--- a/skia/skia_chrome.target.linux-arm.mk
+++ b/skia/skia_chrome.target.linux-arm.mk
@@ -139,6 +139,7 @@
'-DSK_USE_POSIX_THREADS' \
'-DSK_ARM_HAS_OPTIONAL_NEON' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -278,6 +279,7 @@
'-DSK_USE_POSIX_THREADS' \
'-DSK_ARM_HAS_OPTIONAL_NEON' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/skia/skia_chrome.target.linux-arm64.mk b/skia/skia_chrome.target.linux-arm64.mk
index 56cca44..2c81852 100644
--- a/skia/skia_chrome.target.linux-arm64.mk
+++ b/skia/skia_chrome.target.linux-arm64.mk
@@ -127,6 +127,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -253,6 +254,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/skia/skia_chrome.target.linux-mips.mk b/skia/skia_chrome.target.linux-mips.mk
index a26629c..971676d 100644
--- a/skia/skia_chrome.target.linux-mips.mk
+++ b/skia/skia_chrome.target.linux-mips.mk
@@ -131,6 +131,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -262,6 +263,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/skia/skia_chrome.target.linux-x86.mk b/skia/skia_chrome.target.linux-x86.mk
index 12d8cdc..9df19c4 100644
--- a/skia/skia_chrome.target.linux-x86.mk
+++ b/skia/skia_chrome.target.linux-x86.mk
@@ -133,6 +133,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -265,6 +266,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/skia/skia_chrome.target.linux-x86_64.mk b/skia/skia_chrome.target.linux-x86_64.mk
index b171c26..27906b0 100644
--- a/skia/skia_chrome.target.linux-x86_64.mk
+++ b/skia/skia_chrome.target.linux-x86_64.mk
@@ -132,6 +132,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -263,6 +264,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/skia/skia_library.target.darwin-arm.mk b/skia/skia_library.target.darwin-arm.mk
index eb68f21..726d305 100644
--- a/skia/skia_library.target.darwin-arm.mk
+++ b/skia/skia_library.target.darwin-arm.mk
@@ -532,6 +532,7 @@
'-DSK_USE_POSIX_THREADS' \
'-DSK_ARM_HAS_OPTIONAL_NEON' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DXML_STATIC' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -684,6 +685,7 @@
'-DSK_USE_POSIX_THREADS' \
'-DSK_ARM_HAS_OPTIONAL_NEON' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DXML_STATIC' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/skia/skia_library.target.darwin-arm64.mk b/skia/skia_library.target.darwin-arm64.mk
index 2eab88e..d5b3097 100644
--- a/skia/skia_library.target.darwin-arm64.mk
+++ b/skia/skia_library.target.darwin-arm64.mk
@@ -519,6 +519,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DXML_STATIC' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -658,6 +659,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DXML_STATIC' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/skia/skia_library.target.darwin-mips.mk b/skia/skia_library.target.darwin-mips.mk
index df238d0..35e967b 100644
--- a/skia/skia_library.target.darwin-mips.mk
+++ b/skia/skia_library.target.darwin-mips.mk
@@ -523,6 +523,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DXML_STATIC' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -667,6 +668,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DXML_STATIC' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/skia/skia_library.target.darwin-x86.mk b/skia/skia_library.target.darwin-x86.mk
index 49ac2fd..2970a83 100644
--- a/skia/skia_library.target.darwin-x86.mk
+++ b/skia/skia_library.target.darwin-x86.mk
@@ -526,6 +526,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DXML_STATIC' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -671,6 +672,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DXML_STATIC' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/skia/skia_library.target.darwin-x86_64.mk b/skia/skia_library.target.darwin-x86_64.mk
index 1410096..4b1d9ea 100644
--- a/skia/skia_library.target.darwin-x86_64.mk
+++ b/skia/skia_library.target.darwin-x86_64.mk
@@ -525,6 +525,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DXML_STATIC' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -669,6 +670,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DXML_STATIC' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/skia/skia_library.target.linux-arm.mk b/skia/skia_library.target.linux-arm.mk
index eb68f21..726d305 100644
--- a/skia/skia_library.target.linux-arm.mk
+++ b/skia/skia_library.target.linux-arm.mk
@@ -532,6 +532,7 @@
'-DSK_USE_POSIX_THREADS' \
'-DSK_ARM_HAS_OPTIONAL_NEON' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DXML_STATIC' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -684,6 +685,7 @@
'-DSK_USE_POSIX_THREADS' \
'-DSK_ARM_HAS_OPTIONAL_NEON' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DXML_STATIC' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/skia/skia_library.target.linux-arm64.mk b/skia/skia_library.target.linux-arm64.mk
index 2eab88e..d5b3097 100644
--- a/skia/skia_library.target.linux-arm64.mk
+++ b/skia/skia_library.target.linux-arm64.mk
@@ -519,6 +519,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DXML_STATIC' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -658,6 +659,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DXML_STATIC' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/skia/skia_library.target.linux-mips.mk b/skia/skia_library.target.linux-mips.mk
index df238d0..35e967b 100644
--- a/skia/skia_library.target.linux-mips.mk
+++ b/skia/skia_library.target.linux-mips.mk
@@ -523,6 +523,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DXML_STATIC' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -667,6 +668,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DXML_STATIC' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/skia/skia_library.target.linux-x86.mk b/skia/skia_library.target.linux-x86.mk
index 49ac2fd..2970a83 100644
--- a/skia/skia_library.target.linux-x86.mk
+++ b/skia/skia_library.target.linux-x86.mk
@@ -526,6 +526,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DXML_STATIC' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -671,6 +672,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DXML_STATIC' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/skia/skia_library.target.linux-x86_64.mk b/skia/skia_library.target.linux-x86_64.mk
index 1410096..4b1d9ea 100644
--- a/skia/skia_library.target.linux-x86_64.mk
+++ b/skia/skia_library.target.linux-x86_64.mk
@@ -525,6 +525,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DXML_STATIC' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -669,6 +670,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DXML_STATIC' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/storage/storage.target.darwin-arm.mk b/storage/storage.target.darwin-arm.mk
index 05e25e9..69b7720 100644
--- a/storage/storage.target.darwin-arm.mk
+++ b/storage/storage.target.darwin-arm.mk
@@ -172,6 +172,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -327,6 +328,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/storage/storage.target.darwin-arm64.mk b/storage/storage.target.darwin-arm64.mk
index 49a0541..255a08a 100644
--- a/storage/storage.target.darwin-arm64.mk
+++ b/storage/storage.target.darwin-arm64.mk
@@ -161,6 +161,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -304,6 +305,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/storage/storage.target.darwin-mips.mk b/storage/storage.target.darwin-mips.mk
index e11ab9d..c12de31 100644
--- a/storage/storage.target.darwin-mips.mk
+++ b/storage/storage.target.darwin-mips.mk
@@ -164,6 +164,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -311,6 +312,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/storage/storage.target.darwin-x86.mk b/storage/storage.target.darwin-x86.mk
index 74a3a87..2aa751b 100644
--- a/storage/storage.target.darwin-x86.mk
+++ b/storage/storage.target.darwin-x86.mk
@@ -166,6 +166,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -314,6 +315,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/storage/storage.target.darwin-x86_64.mk b/storage/storage.target.darwin-x86_64.mk
index 3ab849a..b9ff342 100644
--- a/storage/storage.target.darwin-x86_64.mk
+++ b/storage/storage.target.darwin-x86_64.mk
@@ -166,6 +166,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -314,6 +315,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/storage/storage.target.linux-arm.mk b/storage/storage.target.linux-arm.mk
index 05e25e9..69b7720 100644
--- a/storage/storage.target.linux-arm.mk
+++ b/storage/storage.target.linux-arm.mk
@@ -172,6 +172,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -327,6 +328,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/storage/storage.target.linux-arm64.mk b/storage/storage.target.linux-arm64.mk
index 49a0541..255a08a 100644
--- a/storage/storage.target.linux-arm64.mk
+++ b/storage/storage.target.linux-arm64.mk
@@ -161,6 +161,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -304,6 +305,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/storage/storage.target.linux-mips.mk b/storage/storage.target.linux-mips.mk
index e11ab9d..c12de31 100644
--- a/storage/storage.target.linux-mips.mk
+++ b/storage/storage.target.linux-mips.mk
@@ -164,6 +164,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -311,6 +312,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/storage/storage.target.linux-x86.mk b/storage/storage.target.linux-x86.mk
index 74a3a87..2aa751b 100644
--- a/storage/storage.target.linux-x86.mk
+++ b/storage/storage.target.linux-x86.mk
@@ -166,6 +166,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -314,6 +315,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/storage/storage.target.linux-x86_64.mk b/storage/storage.target.linux-x86_64.mk
index 3ab849a..b9ff342 100644
--- a/storage/storage.target.linux-x86_64.mk
+++ b/storage/storage.target.linux-x86_64.mk
@@ -166,6 +166,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -314,6 +315,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/sync/android/java/src/org/chromium/sync/internal_api/pub/SyncDecryptionPassphraseType.java b/sync/android/java/src/org/chromium/sync/internal_api/pub/SyncDecryptionPassphraseType.java
index 27de932..2437953 100644
--- a/sync/android/java/src/org/chromium/sync/internal_api/pub/SyncDecryptionPassphraseType.java
+++ b/sync/android/java/src/org/chromium/sync/internal_api/pub/SyncDecryptionPassphraseType.java
@@ -80,14 +80,21 @@
return visibleTypes;
}
- public Set<SyncDecryptionPassphraseType> getAllowedTypes() {
+ /**
+ * Get the types that are allowed to be enabled from the current type.
+ *
+ * @param encryptEverythingAllowed Whether encrypting all data is allowed.
+ */
+ public Set<SyncDecryptionPassphraseType> getAllowedTypes(boolean encryptEverythingAllowed) {
Set<SyncDecryptionPassphraseType> allowedTypes = new HashSet<>();
switch (this) {
case NONE: // Intentional fall through.
case IMPLICIT_PASSPHRASE: // Intentional fall through.
case KEYSTORE_PASSPHRASE:
allowedTypes.add(this);
- allowedTypes.add(CUSTOM_PASSPHRASE);
+ if (encryptEverythingAllowed) {
+ allowedTypes.add(CUSTOM_PASSPHRASE);
+ }
break;
case FROZEN_IMPLICIT_PASSPHRASE: // Intentional fall through.
case CUSTOM_PASSPHRASE: // Intentional fall through.
@@ -98,6 +105,14 @@
return allowedTypes;
}
+ /**
+ * TODO(maxbogue): Remove when no longer used in Clank; see http://crbug.com/424187.
+ */
+ @Deprecated
+ public Set<SyncDecryptionPassphraseType> getAllowedTypes() {
+ return getAllowedTypes(true);
+ }
+
public int internalValue() {
// Since the values in this enums are constant and very small, this cast is safe.
return mNativeValue;
diff --git a/third_party/libjingle/BUILD.gn b/third_party/libjingle/BUILD.gn
index 02c2bf9..69a744e 100644
--- a/third_party/libjingle/BUILD.gn
+++ b/third_party/libjingle/BUILD.gn
@@ -548,6 +548,7 @@
deps = [
":libjingle_webrtc_common",
"//third_party/webrtc",
+ "//third_party/webrtc/modules/audio_processing",
"//third_party/webrtc/system_wrappers",
"//third_party/webrtc/voice_engine",
]
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index 0eaf86c..63a5230 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -589,6 +589,7 @@
'<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.h',
],
'dependencies': [
+ '<(DEPTH)/third_party/webrtc/modules/modules.gyp:audio_processing',
'<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine',
'<(DEPTH)/third_party/webrtc/webrtc.gyp:webrtc',
diff --git a/third_party/libjingle/overrides/init_webrtc.cc b/third_party/libjingle/overrides/init_webrtc.cc
index ab89d58..0004d8e 100644
--- a/third_party/libjingle/overrides/init_webrtc.cc
+++ b/third_party/libjingle/overrides/init_webrtc.cc
@@ -11,6 +11,8 @@
#include "base/metrics/field_trial.h"
#include "base/native_library.h"
#include "base/path_service.h"
+#include "third_party/webrtc/common.h"
+#include "third_party/webrtc/modules/audio_processing/include/audio_processing.h"
#include "webrtc/base/basictypes.h"
#include "webrtc/base/logging.h"
@@ -53,6 +55,13 @@
return true;
}
+webrtc::AudioProcessing* CreateWebRtcAudioProcessing(
+ const webrtc::Config& config) {
+ // libpeerconnection is being compiled as a static lib, use
+ // webrtc::AudioProcessing directly.
+ return webrtc::AudioProcessing::Create(config);
+}
+
#else // !LIBPEERCONNECTION_LIB
// When being compiled as a shared library, we need to bridge the gap between
@@ -62,6 +71,7 @@
// Global function pointers to the factory functions in the shared library.
CreateWebRtcMediaEngineFunction g_create_webrtc_media_engine = NULL;
DestroyWebRtcMediaEngineFunction g_destroy_webrtc_media_engine = NULL;
+CreateWebRtcAudioProcessingFunction g_create_webrtc_audio_processing = NULL;
// Returns the full or relative path to the libpeerconnection module depending
// on what platform we're on.
@@ -135,8 +145,8 @@
&AddTraceEvent,
&g_create_webrtc_media_engine,
&g_destroy_webrtc_media_engine,
- &init_diagnostic_logging);
-
+ &init_diagnostic_logging,
+ &g_create_webrtc_audio_processing);
if (init_ok)
rtc::SetExtraLoggingInit(init_diagnostic_logging);
return init_ok;
@@ -160,4 +170,12 @@
g_destroy_webrtc_media_engine(media_engine);
}
+webrtc::AudioProcessing* CreateWebRtcAudioProcessing(
+ const webrtc::Config& config) {
+ // The same as CreateWebRtcMediaEngine(), we call InitializeWebRtcModule here
+ // for convenience of tests.
+ InitializeWebRtcModule();
+ return g_create_webrtc_audio_processing(config);
+}
+
#endif // LIBPEERCONNECTION_LIB
diff --git a/third_party/libjingle/overrides/init_webrtc.h b/third_party/libjingle/overrides/init_webrtc.h
index c5c190c..4d06e9e 100644
--- a/third_party/libjingle/overrides/init_webrtc.h
+++ b/third_party/libjingle/overrides/init_webrtc.h
@@ -23,6 +23,8 @@
namespace webrtc {
class AudioDeviceModule;
+class AudioProcessing;
+class Config;
} // namespace webrtc
typedef std::string (*FieldTrialFindFullName)(const std::string& trial_name);
@@ -39,6 +41,9 @@
typedef void (*InitDiagnosticLoggingDelegateFunctionFunction)(
void (*DelegateFunction)(const std::string&));
+typedef webrtc::AudioProcessing* (*CreateWebRtcAudioProcessingFunction)(
+ const webrtc::Config& config);
+
// A typedef for the main initialize function in libpeerconnection.
// This will initialize logging in the module with the proper arguments
// as well as provide pointers back to a couple webrtc factory functions.
@@ -56,7 +61,8 @@
webrtc::AddTraceEventPtr trace_add_trace_event,
CreateWebRtcMediaEngineFunction* create_media_engine,
DestroyWebRtcMediaEngineFunction* destroy_media_engine,
- InitDiagnosticLoggingDelegateFunctionFunction* init_diagnostic_logging);
+ InitDiagnosticLoggingDelegateFunctionFunction* init_diagnostic_logging,
+ CreateWebRtcAudioProcessingFunction* create_audio_processing);
#if !defined(LIBPEERCONNECTION_IMPLEMENTATION)
// Load and initialize the shared WebRTC module (libpeerconnection).
@@ -65,6 +71,11 @@
// If not called explicitly, this function will still be called from the main
// CreateWebRtcMediaEngine factory function the first time it is called.
bool InitializeWebRtcModule();
+
+// Return a webrtc::AudioProcessing object.
+webrtc::AudioProcessing* CreateWebRtcAudioProcessing(
+ const webrtc::Config& config);
+
#endif
#endif // THIRD_PARTY_LIBJINGLE_OVERRIDES_INIT_WEBRTC_H_
diff --git a/third_party/libjingle/overrides/initialize_module.cc b/third_party/libjingle/overrides/initialize_module.cc
index ce11567..b84e2d8 100644
--- a/third_party/libjingle/overrides/initialize_module.cc
+++ b/third_party/libjingle/overrides/initialize_module.cc
@@ -8,6 +8,7 @@
#include "base/logging.h"
#include "init_webrtc.h"
#include "talk/media/webrtc/webrtcmediaengine.h"
+#include "third_party/webrtc/modules/audio_processing/include/audio_processing.h"
#include "webrtc/base/basictypes.h"
#include "webrtc/base/logging.h"
@@ -71,7 +72,9 @@
CreateWebRtcMediaEngineFunction* create_media_engine,
DestroyWebRtcMediaEngineFunction* destroy_media_engine,
InitDiagnosticLoggingDelegateFunctionFunction*
- init_diagnostic_logging) {
+ init_diagnostic_logging,
+ CreateWebRtcAudioProcessingFunction*
+ create_audio_processing) {
#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
g_alloc = alloc;
g_dealloc = dealloc;
@@ -82,6 +85,7 @@
*create_media_engine = &CreateWebRtcMediaEngine;
*destroy_media_engine = &DestroyWebRtcMediaEngine;
*init_diagnostic_logging = &rtc::InitDiagnosticLoggingDelegateFunction;
+ *create_audio_processing = &webrtc::AudioProcessing::Create;
if (CommandLine::Init(0, NULL)) {
#if !defined(OS_WIN)
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 0976bd9..267c3b8 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -4954,6 +4954,14 @@
<summary>Result of DNS probes sent by the probe service.</summary>
</histogram>
+<histogram name="DocumentActivity.Enabled" enum="RunningMode">
+ <owner>mariakhomenko@chromium.org</owner>
+ <summary>
+ Recorded only for Android. Records on every metrics upload whether document
+ mode is enabled.
+ </summary>
+</histogram>
+
<histogram name="DomainBoundCerts.DBLoadedCount">
<owner>mattm@chromium.org</owner>
<summary>Number of certs loaded from domain bound cert database.</summary>
@@ -5984,6 +5992,17 @@
</summary>
</histogram>
+<histogram name="EasyUnlock.SignIn.LoginEvent" enum="EasyUnlockLoginEvent">
+ <owner>xiaowenx@google.com</owner>
+ <owner>xiyuan@google.com</owner>
+ <summary>
+ Measures the use of Easy sign-in: records whether an Easy sign-in login
+ succeeded or failed; or if a password fallback was used, the reason why.
+ Recorded upon a login attempt for users who have the Easy sign-in feature
+ enabled.
+ </summary>
+</histogram>
+
<histogram name="EasyUnlock.StartupTimeFromSuspend" units="milliseconds">
<owner>joshwoodward@google.com</owner>
<owner>tengs@chromium.org</owner>
@@ -37951,6 +37970,23 @@
</summary>
</histogram>
+<histogram name="WebRTC.ApplicationMaxConsecutiveBytesDiscard">
+ <owner>guoweis@chromium.org</owner>
+ <summary>
+ The maximum consecutive discarded bytes caused by not enough buffer
+ available in WebRTC's socket implementation. This happens when WebRTC
+ IpcPacketSocket's throttling mechanism kicks in.
+ </summary>
+</histogram>
+
+<histogram name="WebRTC.ApplicationPercentPacketsDiscarded" units="%">
+ <owner>guoweis@chromium.org</owner>
+ <summary>
+ The percentage of packets discarded by WebRTC's socket layer due to
+ EWOULDBLOCKs when WebRTC IpcPacketSocket's throttling mechanism kicks in.
+ </summary>
+</histogram>
+
<histogram name="WebRTC.AudioCaptureTime" units="milliseconds">
<obsolete>
Removed from code 2014/2/25.
@@ -38182,6 +38218,23 @@
</summary>
</histogram>
+<histogram name="WebRTC.SystemMaxConsecutiveBytesDelayed">
+ <owner>guoweis@chromium.org</owner>
+ <summary>
+ The maximum of consecutive delayed bytes caused by EWOULDBLOCKs from system.
+ This happens when system can't send any packet synchronously at that moment.
+ </summary>
+</histogram>
+
+<histogram name="WebRTC.SystemPercentPacketsDelayed" units="%">
+ <owner>guoweis@chromium.org</owner>
+ <summary>
+ The percentage of packets delayed due to ERR_IO_PENDING from system in a
+ WebRTC socket. This happens when system can't send any packet synchronously
+ at that moment.
+ </summary>
+</histogram>
+
<histogram name="WebRTC.UnreliableDataChannelMessageSize" units="bytes">
<owner>perkj@chromium.org</owner>
<summary>
@@ -40566,6 +40619,24 @@
<int value="5" label="Disable"/>
</enum>
+<enum name="EasyUnlockLoginEvent" type="int">
+ <int value="0" label="Easy sign-in success"/>
+ <int value="1" label="Easy sign-in failure"/>
+ <int value="2" label="Password sign-in: No pairing"/>
+ <int value="3" label="Password sign-in: Pairing changed"/>
+ <int value="4" label="Password sign-in: User hardlock"/>
+ <int value="5" label="Password sign-in: Service not active"/>
+ <int value="6" label="Password sign-in: No Bluetooth"/>
+ <int value="7" label="Password sign-in: Bluetooth connecting"/>
+ <int value="8" label="Password sign-in: No phone"/>
+ <int value="9" label="Password sign-in: Phone not authenticated"/>
+ <int value="10" label="Password sign-in: Phone locked"/>
+ <int value="11" label="Password sign-in: Phone not lockable"/>
+ <int value="12" label="Password sign-in: Phone not nearby"/>
+ <int value="13" label="Password sign-in: Phone not supported"/>
+ <int value="14" label="Password sign-in: Phone authenticated"/>
+</enum>
+
<enum name="EasyUnlockNotificationEvent" type="int">
<int value="0" label="Set up notification shown"/>
<int value="1" label="Set up notification clicked"/>
@@ -50163,6 +50234,11 @@
<int value="12" label="Import resource"/>
</enum>
+<enum name="RunningMode" type="int">
+ <int value="0" label="Document Mode"/>
+ <int value="1" label="Tabbed Mode"/>
+</enum>
+
<enum name="SavePasswordPromptResponseType" type="int">
<int value="0" label="NO_RESPONSE"/>
<int value="1" label="REMEMBER_PASSWORD"/>
@@ -54119,6 +54195,13 @@
<affected-histogram name="Net.TCP_Connection_Latency_Interval"/>
</histogram_suffixes>
+<histogram_suffixes name="IPProtocolType" separator="_">
+ <suffix name="UDP"/>
+ <suffix name="TCP"/>
+ <affected-histogram name="WebRTC.SystemMaxConsecutiveBytesDelayed"/>
+ <affected-histogram name="WebRTC.SystemPercentPacketsDelayed"/>
+</histogram_suffixes>
+
<histogram_suffixes name="IPv6_Probe">
<suffix name="IPv6_probe_skipped"
label="with IPv6 not probed, and default OS settings used"/>
diff --git a/ui/accessibility/accessibility.target.darwin-arm.mk b/ui/accessibility/accessibility.target.darwin-arm.mk
index 8f0ec04..8a63f3f 100644
--- a/ui/accessibility/accessibility.target.darwin-arm.mk
+++ b/ui/accessibility/accessibility.target.darwin-arm.mk
@@ -115,6 +115,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -248,6 +249,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/accessibility/accessibility.target.darwin-arm64.mk b/ui/accessibility/accessibility.target.darwin-arm64.mk
index a1564f1..38c965b 100644
--- a/ui/accessibility/accessibility.target.darwin-arm64.mk
+++ b/ui/accessibility/accessibility.target.darwin-arm64.mk
@@ -104,6 +104,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -225,6 +226,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/accessibility/accessibility.target.darwin-mips.mk b/ui/accessibility/accessibility.target.darwin-mips.mk
index 7741648..bca0ca3 100644
--- a/ui/accessibility/accessibility.target.darwin-mips.mk
+++ b/ui/accessibility/accessibility.target.darwin-mips.mk
@@ -107,6 +107,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -232,6 +233,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/accessibility/accessibility.target.darwin-x86.mk b/ui/accessibility/accessibility.target.darwin-x86.mk
index e467127..aa3752f 100644
--- a/ui/accessibility/accessibility.target.darwin-x86.mk
+++ b/ui/accessibility/accessibility.target.darwin-x86.mk
@@ -110,6 +110,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -237,6 +238,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/accessibility/accessibility.target.darwin-x86_64.mk b/ui/accessibility/accessibility.target.darwin-x86_64.mk
index 1ee551d..407464e 100644
--- a/ui/accessibility/accessibility.target.darwin-x86_64.mk
+++ b/ui/accessibility/accessibility.target.darwin-x86_64.mk
@@ -109,6 +109,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -235,6 +236,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/accessibility/accessibility.target.linux-arm.mk b/ui/accessibility/accessibility.target.linux-arm.mk
index 8f0ec04..8a63f3f 100644
--- a/ui/accessibility/accessibility.target.linux-arm.mk
+++ b/ui/accessibility/accessibility.target.linux-arm.mk
@@ -115,6 +115,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -248,6 +249,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/accessibility/accessibility.target.linux-arm64.mk b/ui/accessibility/accessibility.target.linux-arm64.mk
index a1564f1..38c965b 100644
--- a/ui/accessibility/accessibility.target.linux-arm64.mk
+++ b/ui/accessibility/accessibility.target.linux-arm64.mk
@@ -104,6 +104,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -225,6 +226,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/accessibility/accessibility.target.linux-mips.mk b/ui/accessibility/accessibility.target.linux-mips.mk
index 7741648..bca0ca3 100644
--- a/ui/accessibility/accessibility.target.linux-mips.mk
+++ b/ui/accessibility/accessibility.target.linux-mips.mk
@@ -107,6 +107,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -232,6 +233,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/accessibility/accessibility.target.linux-x86.mk b/ui/accessibility/accessibility.target.linux-x86.mk
index e467127..aa3752f 100644
--- a/ui/accessibility/accessibility.target.linux-x86.mk
+++ b/ui/accessibility/accessibility.target.linux-x86.mk
@@ -110,6 +110,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -237,6 +238,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/accessibility/accessibility.target.linux-x86_64.mk b/ui/accessibility/accessibility.target.linux-x86_64.mk
index 1ee551d..407464e 100644
--- a/ui/accessibility/accessibility.target.linux-x86_64.mk
+++ b/ui/accessibility/accessibility.target.linux-x86_64.mk
@@ -109,6 +109,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -235,6 +236,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/base/ui_base.target.darwin-arm.mk b/ui/base/ui_base.target.darwin-arm.mk
index 41804de..b051652 100644
--- a/ui/base/ui_base.target.darwin-arm.mk
+++ b/ui/base/ui_base.target.darwin-arm.mk
@@ -162,6 +162,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -298,6 +299,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/base/ui_base.target.darwin-arm64.mk b/ui/base/ui_base.target.darwin-arm64.mk
index 951f756..2ce8305 100644
--- a/ui/base/ui_base.target.darwin-arm64.mk
+++ b/ui/base/ui_base.target.darwin-arm64.mk
@@ -151,6 +151,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -275,6 +276,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/base/ui_base.target.darwin-mips.mk b/ui/base/ui_base.target.darwin-mips.mk
index d9dd854..34a268f 100644
--- a/ui/base/ui_base.target.darwin-mips.mk
+++ b/ui/base/ui_base.target.darwin-mips.mk
@@ -154,6 +154,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -282,6 +283,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/base/ui_base.target.darwin-x86.mk b/ui/base/ui_base.target.darwin-x86.mk
index 81207b9..207d0e8 100644
--- a/ui/base/ui_base.target.darwin-x86.mk
+++ b/ui/base/ui_base.target.darwin-x86.mk
@@ -156,6 +156,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -285,6 +286,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/base/ui_base.target.darwin-x86_64.mk b/ui/base/ui_base.target.darwin-x86_64.mk
index c31abaf..b467a0b 100644
--- a/ui/base/ui_base.target.darwin-x86_64.mk
+++ b/ui/base/ui_base.target.darwin-x86_64.mk
@@ -156,6 +156,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -285,6 +286,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/base/ui_base.target.linux-arm.mk b/ui/base/ui_base.target.linux-arm.mk
index 41804de..b051652 100644
--- a/ui/base/ui_base.target.linux-arm.mk
+++ b/ui/base/ui_base.target.linux-arm.mk
@@ -162,6 +162,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -298,6 +299,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/base/ui_base.target.linux-arm64.mk b/ui/base/ui_base.target.linux-arm64.mk
index 951f756..2ce8305 100644
--- a/ui/base/ui_base.target.linux-arm64.mk
+++ b/ui/base/ui_base.target.linux-arm64.mk
@@ -151,6 +151,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -275,6 +276,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/base/ui_base.target.linux-mips.mk b/ui/base/ui_base.target.linux-mips.mk
index d9dd854..34a268f 100644
--- a/ui/base/ui_base.target.linux-mips.mk
+++ b/ui/base/ui_base.target.linux-mips.mk
@@ -154,6 +154,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -282,6 +283,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/base/ui_base.target.linux-x86.mk b/ui/base/ui_base.target.linux-x86.mk
index 81207b9..207d0e8 100644
--- a/ui/base/ui_base.target.linux-x86.mk
+++ b/ui/base/ui_base.target.linux-x86.mk
@@ -156,6 +156,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -285,6 +286,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/base/ui_base.target.linux-x86_64.mk b/ui/base/ui_base.target.linux-x86_64.mk
index c31abaf..b467a0b 100644
--- a/ui/base/ui_base.target.linux-x86_64.mk
+++ b/ui/base/ui_base.target.linux-x86_64.mk
@@ -156,6 +156,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -285,6 +286,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/events/events.target.darwin-arm.mk b/ui/events/events.target.darwin-arm.mk
index f7dd913..15c23dd 100644
--- a/ui/events/events.target.darwin-arm.mk
+++ b/ui/events/events.target.darwin-arm.mk
@@ -114,6 +114,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -247,6 +248,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/events/events.target.darwin-arm64.mk b/ui/events/events.target.darwin-arm64.mk
index a711f2e..b945b19 100644
--- a/ui/events/events.target.darwin-arm64.mk
+++ b/ui/events/events.target.darwin-arm64.mk
@@ -103,6 +103,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -224,6 +225,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/events/events.target.darwin-mips.mk b/ui/events/events.target.darwin-mips.mk
index 50ee4eb..0150232 100644
--- a/ui/events/events.target.darwin-mips.mk
+++ b/ui/events/events.target.darwin-mips.mk
@@ -106,6 +106,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -231,6 +232,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/events/events.target.darwin-x86.mk b/ui/events/events.target.darwin-x86.mk
index a4e9d17..3146f42 100644
--- a/ui/events/events.target.darwin-x86.mk
+++ b/ui/events/events.target.darwin-x86.mk
@@ -109,6 +109,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -236,6 +237,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/events/events.target.darwin-x86_64.mk b/ui/events/events.target.darwin-x86_64.mk
index fc86fc3..6f2fc83 100644
--- a/ui/events/events.target.darwin-x86_64.mk
+++ b/ui/events/events.target.darwin-x86_64.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -234,6 +235,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/events/events.target.linux-arm.mk b/ui/events/events.target.linux-arm.mk
index f7dd913..15c23dd 100644
--- a/ui/events/events.target.linux-arm.mk
+++ b/ui/events/events.target.linux-arm.mk
@@ -114,6 +114,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -247,6 +248,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/events/events.target.linux-arm64.mk b/ui/events/events.target.linux-arm64.mk
index a711f2e..b945b19 100644
--- a/ui/events/events.target.linux-arm64.mk
+++ b/ui/events/events.target.linux-arm64.mk
@@ -103,6 +103,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -224,6 +225,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/events/events.target.linux-mips.mk b/ui/events/events.target.linux-mips.mk
index 50ee4eb..0150232 100644
--- a/ui/events/events.target.linux-mips.mk
+++ b/ui/events/events.target.linux-mips.mk
@@ -106,6 +106,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -231,6 +232,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/events/events.target.linux-x86.mk b/ui/events/events.target.linux-x86.mk
index a4e9d17..3146f42 100644
--- a/ui/events/events.target.linux-x86.mk
+++ b/ui/events/events.target.linux-x86.mk
@@ -109,6 +109,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -236,6 +237,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/events/events.target.linux-x86_64.mk b/ui/events/events.target.linux-x86_64.mk
index fc86fc3..6f2fc83 100644
--- a/ui/events/events.target.linux-x86_64.mk
+++ b/ui/events/events.target.linux-x86_64.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -234,6 +235,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/events/events_base.target.darwin-arm.mk b/ui/events/events_base.target.darwin-arm.mk
index 14bcbba..4cc9afa 100644
--- a/ui/events/events_base.target.darwin-arm.mk
+++ b/ui/events/events_base.target.darwin-arm.mk
@@ -114,6 +114,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -247,6 +248,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/events/events_base.target.darwin-arm64.mk b/ui/events/events_base.target.darwin-arm64.mk
index d2333d9..b577f86 100644
--- a/ui/events/events_base.target.darwin-arm64.mk
+++ b/ui/events/events_base.target.darwin-arm64.mk
@@ -103,6 +103,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -224,6 +225,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/events/events_base.target.darwin-mips.mk b/ui/events/events_base.target.darwin-mips.mk
index 6b8d540..069daf7 100644
--- a/ui/events/events_base.target.darwin-mips.mk
+++ b/ui/events/events_base.target.darwin-mips.mk
@@ -106,6 +106,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -231,6 +232,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/events/events_base.target.darwin-x86.mk b/ui/events/events_base.target.darwin-x86.mk
index aa851c3..9cb080e 100644
--- a/ui/events/events_base.target.darwin-x86.mk
+++ b/ui/events/events_base.target.darwin-x86.mk
@@ -109,6 +109,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -236,6 +237,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/events/events_base.target.darwin-x86_64.mk b/ui/events/events_base.target.darwin-x86_64.mk
index 74f0f84..30ee1bd 100644
--- a/ui/events/events_base.target.darwin-x86_64.mk
+++ b/ui/events/events_base.target.darwin-x86_64.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -234,6 +235,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/events/events_base.target.linux-arm.mk b/ui/events/events_base.target.linux-arm.mk
index 14bcbba..4cc9afa 100644
--- a/ui/events/events_base.target.linux-arm.mk
+++ b/ui/events/events_base.target.linux-arm.mk
@@ -114,6 +114,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -247,6 +248,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/events/events_base.target.linux-arm64.mk b/ui/events/events_base.target.linux-arm64.mk
index d2333d9..b577f86 100644
--- a/ui/events/events_base.target.linux-arm64.mk
+++ b/ui/events/events_base.target.linux-arm64.mk
@@ -103,6 +103,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -224,6 +225,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/events/events_base.target.linux-mips.mk b/ui/events/events_base.target.linux-mips.mk
index 6b8d540..069daf7 100644
--- a/ui/events/events_base.target.linux-mips.mk
+++ b/ui/events/events_base.target.linux-mips.mk
@@ -106,6 +106,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -231,6 +232,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/events/events_base.target.linux-x86.mk b/ui/events/events_base.target.linux-x86.mk
index aa851c3..9cb080e 100644
--- a/ui/events/events_base.target.linux-x86.mk
+++ b/ui/events/events_base.target.linux-x86.mk
@@ -109,6 +109,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -236,6 +237,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/events/events_base.target.linux-x86_64.mk b/ui/events/events_base.target.linux-x86_64.mk
index 74f0f84..30ee1bd 100644
--- a/ui/events/events_base.target.linux-x86_64.mk
+++ b/ui/events/events_base.target.linux-x86_64.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -234,6 +235,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/events/gesture_detection.target.darwin-arm.mk b/ui/events/gesture_detection.target.darwin-arm.mk
index d9d6b68..68af551 100644
--- a/ui/events/gesture_detection.target.darwin-arm.mk
+++ b/ui/events/gesture_detection.target.darwin-arm.mk
@@ -119,6 +119,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -252,6 +253,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/events/gesture_detection.target.darwin-arm64.mk b/ui/events/gesture_detection.target.darwin-arm64.mk
index ce9a004..769a491 100644
--- a/ui/events/gesture_detection.target.darwin-arm64.mk
+++ b/ui/events/gesture_detection.target.darwin-arm64.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -229,6 +230,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/events/gesture_detection.target.darwin-mips.mk b/ui/events/gesture_detection.target.darwin-mips.mk
index 3c813e2..aaa04fe 100644
--- a/ui/events/gesture_detection.target.darwin-mips.mk
+++ b/ui/events/gesture_detection.target.darwin-mips.mk
@@ -111,6 +111,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -236,6 +237,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/events/gesture_detection.target.darwin-x86.mk b/ui/events/gesture_detection.target.darwin-x86.mk
index 70eb7ed..a0af287 100644
--- a/ui/events/gesture_detection.target.darwin-x86.mk
+++ b/ui/events/gesture_detection.target.darwin-x86.mk
@@ -114,6 +114,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -241,6 +242,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/events/gesture_detection.target.darwin-x86_64.mk b/ui/events/gesture_detection.target.darwin-x86_64.mk
index bfe8d49..72fc574 100644
--- a/ui/events/gesture_detection.target.darwin-x86_64.mk
+++ b/ui/events/gesture_detection.target.darwin-x86_64.mk
@@ -113,6 +113,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -239,6 +240,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/events/gesture_detection.target.linux-arm.mk b/ui/events/gesture_detection.target.linux-arm.mk
index d9d6b68..68af551 100644
--- a/ui/events/gesture_detection.target.linux-arm.mk
+++ b/ui/events/gesture_detection.target.linux-arm.mk
@@ -119,6 +119,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -252,6 +253,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/events/gesture_detection.target.linux-arm64.mk b/ui/events/gesture_detection.target.linux-arm64.mk
index ce9a004..769a491 100644
--- a/ui/events/gesture_detection.target.linux-arm64.mk
+++ b/ui/events/gesture_detection.target.linux-arm64.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -229,6 +230,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/events/gesture_detection.target.linux-mips.mk b/ui/events/gesture_detection.target.linux-mips.mk
index 3c813e2..aaa04fe 100644
--- a/ui/events/gesture_detection.target.linux-mips.mk
+++ b/ui/events/gesture_detection.target.linux-mips.mk
@@ -111,6 +111,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -236,6 +237,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/events/gesture_detection.target.linux-x86.mk b/ui/events/gesture_detection.target.linux-x86.mk
index 70eb7ed..a0af287 100644
--- a/ui/events/gesture_detection.target.linux-x86.mk
+++ b/ui/events/gesture_detection.target.linux-x86.mk
@@ -114,6 +114,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -241,6 +242,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/events/gesture_detection.target.linux-x86_64.mk b/ui/events/gesture_detection.target.linux-x86_64.mk
index bfe8d49..72fc574 100644
--- a/ui/events/gesture_detection.target.linux-x86_64.mk
+++ b/ui/events/gesture_detection.target.linux-x86_64.mk
@@ -113,6 +113,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -239,6 +240,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/gfx/gfx.target.darwin-arm.mk b/ui/gfx/gfx.target.darwin-arm.mk
index 0525987..dd6a8c7 100644
--- a/ui/gfx/gfx.target.darwin-arm.mk
+++ b/ui/gfx/gfx.target.darwin-arm.mk
@@ -166,6 +166,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -308,6 +309,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/ui/gfx/gfx.target.darwin-arm64.mk b/ui/gfx/gfx.target.darwin-arm64.mk
index ec424be..d40bcac 100644
--- a/ui/gfx/gfx.target.darwin-arm64.mk
+++ b/ui/gfx/gfx.target.darwin-arm64.mk
@@ -155,6 +155,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -285,6 +286,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/ui/gfx/gfx.target.darwin-mips.mk b/ui/gfx/gfx.target.darwin-mips.mk
index 28bfee3..aa970d7 100644
--- a/ui/gfx/gfx.target.darwin-mips.mk
+++ b/ui/gfx/gfx.target.darwin-mips.mk
@@ -158,6 +158,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -292,6 +293,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/ui/gfx/gfx.target.darwin-x86.mk b/ui/gfx/gfx.target.darwin-x86.mk
index 0eab2e3..287692d 100644
--- a/ui/gfx/gfx.target.darwin-x86.mk
+++ b/ui/gfx/gfx.target.darwin-x86.mk
@@ -161,6 +161,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -297,6 +298,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/ui/gfx/gfx.target.darwin-x86_64.mk b/ui/gfx/gfx.target.darwin-x86_64.mk
index 1990eba..887e5d8 100644
--- a/ui/gfx/gfx.target.darwin-x86_64.mk
+++ b/ui/gfx/gfx.target.darwin-x86_64.mk
@@ -160,6 +160,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -295,6 +296,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/ui/gfx/gfx.target.linux-arm.mk b/ui/gfx/gfx.target.linux-arm.mk
index 0525987..dd6a8c7 100644
--- a/ui/gfx/gfx.target.linux-arm.mk
+++ b/ui/gfx/gfx.target.linux-arm.mk
@@ -166,6 +166,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -308,6 +309,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/ui/gfx/gfx.target.linux-arm64.mk b/ui/gfx/gfx.target.linux-arm64.mk
index ec424be..d40bcac 100644
--- a/ui/gfx/gfx.target.linux-arm64.mk
+++ b/ui/gfx/gfx.target.linux-arm64.mk
@@ -155,6 +155,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -285,6 +286,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/ui/gfx/gfx.target.linux-mips.mk b/ui/gfx/gfx.target.linux-mips.mk
index 28bfee3..aa970d7 100644
--- a/ui/gfx/gfx.target.linux-mips.mk
+++ b/ui/gfx/gfx.target.linux-mips.mk
@@ -158,6 +158,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -292,6 +293,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/ui/gfx/gfx.target.linux-x86.mk b/ui/gfx/gfx.target.linux-x86.mk
index 0eab2e3..287692d 100644
--- a/ui/gfx/gfx.target.linux-x86.mk
+++ b/ui/gfx/gfx.target.linux-x86.mk
@@ -161,6 +161,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -297,6 +298,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/ui/gfx/gfx.target.linux-x86_64.mk b/ui/gfx/gfx.target.linux-x86_64.mk
index 1990eba..887e5d8 100644
--- a/ui/gfx/gfx.target.linux-x86_64.mk
+++ b/ui/gfx/gfx.target.linux-x86_64.mk
@@ -160,6 +160,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -295,6 +296,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/ui/gfx/ipc/gfx_ipc.target.darwin-arm.mk b/ui/gfx/ipc/gfx_ipc.target.darwin-arm.mk
index ba220d8..c77c6e2 100644
--- a/ui/gfx/ipc/gfx_ipc.target.darwin-arm.mk
+++ b/ui/gfx/ipc/gfx_ipc.target.darwin-arm.mk
@@ -106,6 +106,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -234,6 +235,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/ui/gfx/ipc/gfx_ipc.target.darwin-arm64.mk b/ui/gfx/ipc/gfx_ipc.target.darwin-arm64.mk
index addd9c5..50a7b0a 100644
--- a/ui/gfx/ipc/gfx_ipc.target.darwin-arm64.mk
+++ b/ui/gfx/ipc/gfx_ipc.target.darwin-arm64.mk
@@ -95,6 +95,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -211,6 +212,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/ui/gfx/ipc/gfx_ipc.target.darwin-mips.mk b/ui/gfx/ipc/gfx_ipc.target.darwin-mips.mk
index 5f62e65..c3e5996 100644
--- a/ui/gfx/ipc/gfx_ipc.target.darwin-mips.mk
+++ b/ui/gfx/ipc/gfx_ipc.target.darwin-mips.mk
@@ -98,6 +98,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -218,6 +219,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/ui/gfx/ipc/gfx_ipc.target.darwin-x86.mk b/ui/gfx/ipc/gfx_ipc.target.darwin-x86.mk
index a62c2e2..2eed89c 100644
--- a/ui/gfx/ipc/gfx_ipc.target.darwin-x86.mk
+++ b/ui/gfx/ipc/gfx_ipc.target.darwin-x86.mk
@@ -101,6 +101,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -223,6 +224,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/ui/gfx/ipc/gfx_ipc.target.darwin-x86_64.mk b/ui/gfx/ipc/gfx_ipc.target.darwin-x86_64.mk
index 7c8f251..75169c9 100644
--- a/ui/gfx/ipc/gfx_ipc.target.darwin-x86_64.mk
+++ b/ui/gfx/ipc/gfx_ipc.target.darwin-x86_64.mk
@@ -100,6 +100,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -221,6 +222,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/ui/gfx/ipc/gfx_ipc.target.linux-arm.mk b/ui/gfx/ipc/gfx_ipc.target.linux-arm.mk
index ba220d8..c77c6e2 100644
--- a/ui/gfx/ipc/gfx_ipc.target.linux-arm.mk
+++ b/ui/gfx/ipc/gfx_ipc.target.linux-arm.mk
@@ -106,6 +106,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -234,6 +235,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/ui/gfx/ipc/gfx_ipc.target.linux-arm64.mk b/ui/gfx/ipc/gfx_ipc.target.linux-arm64.mk
index addd9c5..50a7b0a 100644
--- a/ui/gfx/ipc/gfx_ipc.target.linux-arm64.mk
+++ b/ui/gfx/ipc/gfx_ipc.target.linux-arm64.mk
@@ -95,6 +95,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -211,6 +212,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/ui/gfx/ipc/gfx_ipc.target.linux-mips.mk b/ui/gfx/ipc/gfx_ipc.target.linux-mips.mk
index 5f62e65..c3e5996 100644
--- a/ui/gfx/ipc/gfx_ipc.target.linux-mips.mk
+++ b/ui/gfx/ipc/gfx_ipc.target.linux-mips.mk
@@ -98,6 +98,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -218,6 +219,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/ui/gfx/ipc/gfx_ipc.target.linux-x86.mk b/ui/gfx/ipc/gfx_ipc.target.linux-x86.mk
index a62c2e2..2eed89c 100644
--- a/ui/gfx/ipc/gfx_ipc.target.linux-x86.mk
+++ b/ui/gfx/ipc/gfx_ipc.target.linux-x86.mk
@@ -101,6 +101,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -223,6 +224,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/ui/gfx/ipc/gfx_ipc.target.linux-x86_64.mk b/ui/gfx/ipc/gfx_ipc.target.linux-x86_64.mk
index 7c8f251..75169c9 100644
--- a/ui/gfx/ipc/gfx_ipc.target.linux-x86_64.mk
+++ b/ui/gfx/ipc/gfx_ipc.target.linux-x86_64.mk
@@ -100,6 +100,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -221,6 +222,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
diff --git a/ui/gl/gl.target.darwin-arm.mk b/ui/gl/gl.target.darwin-arm.mk
index 70c2b10..23e3f5e 100644
--- a/ui/gl/gl.target.darwin-arm.mk
+++ b/ui/gl/gl.target.darwin-arm.mk
@@ -210,6 +210,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -351,6 +352,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/gl/gl.target.darwin-arm64.mk b/ui/gl/gl.target.darwin-arm64.mk
index 5549024..40cfbcf 100644
--- a/ui/gl/gl.target.darwin-arm64.mk
+++ b/ui/gl/gl.target.darwin-arm64.mk
@@ -199,6 +199,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -328,6 +329,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/gl/gl.target.darwin-mips.mk b/ui/gl/gl.target.darwin-mips.mk
index eb20460..3b90bf3 100644
--- a/ui/gl/gl.target.darwin-mips.mk
+++ b/ui/gl/gl.target.darwin-mips.mk
@@ -202,6 +202,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -335,6 +336,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/gl/gl.target.darwin-x86.mk b/ui/gl/gl.target.darwin-x86.mk
index 099cae3..e66b08f 100644
--- a/ui/gl/gl.target.darwin-x86.mk
+++ b/ui/gl/gl.target.darwin-x86.mk
@@ -205,6 +205,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -340,6 +341,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/gl/gl.target.darwin-x86_64.mk b/ui/gl/gl.target.darwin-x86_64.mk
index adcb988..9b45b24 100644
--- a/ui/gl/gl.target.darwin-x86_64.mk
+++ b/ui/gl/gl.target.darwin-x86_64.mk
@@ -204,6 +204,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -338,6 +339,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/gl/gl.target.linux-arm.mk b/ui/gl/gl.target.linux-arm.mk
index 70c2b10..23e3f5e 100644
--- a/ui/gl/gl.target.linux-arm.mk
+++ b/ui/gl/gl.target.linux-arm.mk
@@ -210,6 +210,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -351,6 +352,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/gl/gl.target.linux-arm64.mk b/ui/gl/gl.target.linux-arm64.mk
index 5549024..40cfbcf 100644
--- a/ui/gl/gl.target.linux-arm64.mk
+++ b/ui/gl/gl.target.linux-arm64.mk
@@ -199,6 +199,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -328,6 +329,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/gl/gl.target.linux-mips.mk b/ui/gl/gl.target.linux-mips.mk
index eb20460..3b90bf3 100644
--- a/ui/gl/gl.target.linux-mips.mk
+++ b/ui/gl/gl.target.linux-mips.mk
@@ -202,6 +202,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -335,6 +336,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/gl/gl.target.linux-x86.mk b/ui/gl/gl.target.linux-x86.mk
index 099cae3..e66b08f 100644
--- a/ui/gl/gl.target.linux-x86.mk
+++ b/ui/gl/gl.target.linux-x86.mk
@@ -205,6 +205,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -340,6 +341,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/gl/gl.target.linux-x86_64.mk b/ui/gl/gl.target.linux-x86_64.mk
index adcb988..9b45b24 100644
--- a/ui/gl/gl.target.linux-x86_64.mk
+++ b/ui/gl/gl.target.linux-x86_64.mk
@@ -204,6 +204,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -338,6 +339,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/login/account_picker/user_pod_row.js b/ui/login/account_picker/user_pod_row.js
index 51d29cf..2dcae46 100644
--- a/ui/login/account_picker/user_pod_row.js
+++ b/ui/login/account_picker/user_pod_row.js
@@ -292,6 +292,14 @@
},
/**
+ * Sets the ARIA label for the icon.
+ * @param {!string} ariaLabel
+ */
+ setAriaLabel: function(ariaLabel) {
+ this.iconElement.setAttribute('aria-label', ariaLabel);
+ },
+
+ /**
* Shows the icon.
*/
show: function() {
@@ -352,9 +360,6 @@
}
this.hideTooltip_(true);
-
- if (this.tooltip_)
- this.iconElement.setAttribute('aria-lablel', this.tooltip_);
},
/**
@@ -496,7 +501,6 @@
return;
$('bubble').hideForElement(this);
this.tooltipAutoshown_ = false;
- this.iconElement.removeAttribute('aria-label');
},
/**
@@ -2246,6 +2250,7 @@
* @param {string} username Username of pod to add button
* @param {!{id: !string,
* hardlockOnClick: boolean,
+ * ariaLabel: string | undefined,
* tooltip: ({text: string, autoshow: boolean} | undefined)}} icon
* The icon parameters.
*/
@@ -2269,6 +2274,12 @@
pod.customIconElement.setInteractive(null);
}
+ var ariaLabel = icon.ariaLabel || (icon.tooltip && icon.tooltip.text);
+ if (ariaLabel)
+ pod.customIconElement.setAriaLabel(ariaLabel);
+ else
+ console.warn('No ARIA label for user pod custom icon.');
+
pod.customIconElement.show();
// This has to be called after |show| in case the tooltip should be shown
diff --git a/ui/native_theme/native_theme.target.darwin-arm.mk b/ui/native_theme/native_theme.target.darwin-arm.mk
index 4de8cb6..8b77bf3 100644
--- a/ui/native_theme/native_theme.target.darwin-arm.mk
+++ b/ui/native_theme/native_theme.target.darwin-arm.mk
@@ -114,6 +114,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -249,6 +250,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/native_theme/native_theme.target.darwin-arm64.mk b/ui/native_theme/native_theme.target.darwin-arm64.mk
index a09bd33..b0f7554 100644
--- a/ui/native_theme/native_theme.target.darwin-arm64.mk
+++ b/ui/native_theme/native_theme.target.darwin-arm64.mk
@@ -103,6 +103,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -226,6 +227,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/native_theme/native_theme.target.darwin-mips.mk b/ui/native_theme/native_theme.target.darwin-mips.mk
index 405e147..b034b86 100644
--- a/ui/native_theme/native_theme.target.darwin-mips.mk
+++ b/ui/native_theme/native_theme.target.darwin-mips.mk
@@ -106,6 +106,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -233,6 +234,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/native_theme/native_theme.target.darwin-x86.mk b/ui/native_theme/native_theme.target.darwin-x86.mk
index 25f36941..f6cc8d3 100644
--- a/ui/native_theme/native_theme.target.darwin-x86.mk
+++ b/ui/native_theme/native_theme.target.darwin-x86.mk
@@ -109,6 +109,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -237,6 +238,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/native_theme/native_theme.target.darwin-x86_64.mk b/ui/native_theme/native_theme.target.darwin-x86_64.mk
index 73f2337..5272d62 100644
--- a/ui/native_theme/native_theme.target.darwin-x86_64.mk
+++ b/ui/native_theme/native_theme.target.darwin-x86_64.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -236,6 +237,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/native_theme/native_theme.target.linux-arm.mk b/ui/native_theme/native_theme.target.linux-arm.mk
index 4de8cb6..8b77bf3 100644
--- a/ui/native_theme/native_theme.target.linux-arm.mk
+++ b/ui/native_theme/native_theme.target.linux-arm.mk
@@ -114,6 +114,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -249,6 +250,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/native_theme/native_theme.target.linux-arm64.mk b/ui/native_theme/native_theme.target.linux-arm64.mk
index a09bd33..b0f7554 100644
--- a/ui/native_theme/native_theme.target.linux-arm64.mk
+++ b/ui/native_theme/native_theme.target.linux-arm64.mk
@@ -103,6 +103,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -226,6 +227,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/native_theme/native_theme.target.linux-mips.mk b/ui/native_theme/native_theme.target.linux-mips.mk
index 405e147..b034b86 100644
--- a/ui/native_theme/native_theme.target.linux-mips.mk
+++ b/ui/native_theme/native_theme.target.linux-mips.mk
@@ -106,6 +106,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -233,6 +234,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/native_theme/native_theme.target.linux-x86.mk b/ui/native_theme/native_theme.target.linux-x86.mk
index 25f36941..f6cc8d3 100644
--- a/ui/native_theme/native_theme.target.linux-x86.mk
+++ b/ui/native_theme/native_theme.target.linux-x86.mk
@@ -109,6 +109,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -237,6 +238,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/native_theme/native_theme.target.linux-x86_64.mk b/ui/native_theme/native_theme.target.linux-x86_64.mk
index 73f2337..5272d62 100644
--- a/ui/native_theme/native_theme.target.linux-x86_64.mk
+++ b/ui/native_theme/native_theme.target.linux-x86_64.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -236,6 +237,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/shell_dialogs/shell_dialogs.target.darwin-arm.mk b/ui/shell_dialogs/shell_dialogs.target.darwin-arm.mk
index 814cf57..661c4cc 100644
--- a/ui/shell_dialogs/shell_dialogs.target.darwin-arm.mk
+++ b/ui/shell_dialogs/shell_dialogs.target.darwin-arm.mk
@@ -116,6 +116,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -251,6 +252,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/shell_dialogs/shell_dialogs.target.darwin-arm64.mk b/ui/shell_dialogs/shell_dialogs.target.darwin-arm64.mk
index c5dede1..103f0fc 100644
--- a/ui/shell_dialogs/shell_dialogs.target.darwin-arm64.mk
+++ b/ui/shell_dialogs/shell_dialogs.target.darwin-arm64.mk
@@ -105,6 +105,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -228,6 +229,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/shell_dialogs/shell_dialogs.target.darwin-mips.mk b/ui/shell_dialogs/shell_dialogs.target.darwin-mips.mk
index c22edd9..019226c 100644
--- a/ui/shell_dialogs/shell_dialogs.target.darwin-mips.mk
+++ b/ui/shell_dialogs/shell_dialogs.target.darwin-mips.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -235,6 +236,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/shell_dialogs/shell_dialogs.target.darwin-x86.mk b/ui/shell_dialogs/shell_dialogs.target.darwin-x86.mk
index caa3443..09ccede 100644
--- a/ui/shell_dialogs/shell_dialogs.target.darwin-x86.mk
+++ b/ui/shell_dialogs/shell_dialogs.target.darwin-x86.mk
@@ -111,6 +111,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -239,6 +240,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/shell_dialogs/shell_dialogs.target.darwin-x86_64.mk b/ui/shell_dialogs/shell_dialogs.target.darwin-x86_64.mk
index b59c29e..b6149ab 100644
--- a/ui/shell_dialogs/shell_dialogs.target.darwin-x86_64.mk
+++ b/ui/shell_dialogs/shell_dialogs.target.darwin-x86_64.mk
@@ -110,6 +110,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -238,6 +239,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/shell_dialogs/shell_dialogs.target.linux-arm.mk b/ui/shell_dialogs/shell_dialogs.target.linux-arm.mk
index 814cf57..661c4cc 100644
--- a/ui/shell_dialogs/shell_dialogs.target.linux-arm.mk
+++ b/ui/shell_dialogs/shell_dialogs.target.linux-arm.mk
@@ -116,6 +116,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -251,6 +252,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/shell_dialogs/shell_dialogs.target.linux-arm64.mk b/ui/shell_dialogs/shell_dialogs.target.linux-arm64.mk
index c5dede1..103f0fc 100644
--- a/ui/shell_dialogs/shell_dialogs.target.linux-arm64.mk
+++ b/ui/shell_dialogs/shell_dialogs.target.linux-arm64.mk
@@ -105,6 +105,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -228,6 +229,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/shell_dialogs/shell_dialogs.target.linux-mips.mk b/ui/shell_dialogs/shell_dialogs.target.linux-mips.mk
index c22edd9..019226c 100644
--- a/ui/shell_dialogs/shell_dialogs.target.linux-mips.mk
+++ b/ui/shell_dialogs/shell_dialogs.target.linux-mips.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -235,6 +236,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/shell_dialogs/shell_dialogs.target.linux-x86.mk b/ui/shell_dialogs/shell_dialogs.target.linux-x86.mk
index caa3443..09ccede 100644
--- a/ui/shell_dialogs/shell_dialogs.target.linux-x86.mk
+++ b/ui/shell_dialogs/shell_dialogs.target.linux-x86.mk
@@ -111,6 +111,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -239,6 +240,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/shell_dialogs/shell_dialogs.target.linux-x86_64.mk b/ui/shell_dialogs/shell_dialogs.target.linux-x86_64.mk
index b59c29e..b6149ab 100644
--- a/ui/shell_dialogs/shell_dialogs.target.linux-x86_64.mk
+++ b/ui/shell_dialogs/shell_dialogs.target.linux-x86_64.mk
@@ -110,6 +110,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -238,6 +239,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/snapshot/snapshot.target.darwin-arm.mk b/ui/snapshot/snapshot.target.darwin-arm.mk
index d4e362d..1d4e50a 100644
--- a/ui/snapshot/snapshot.target.darwin-arm.mk
+++ b/ui/snapshot/snapshot.target.darwin-arm.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -245,6 +246,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/snapshot/snapshot.target.darwin-arm64.mk b/ui/snapshot/snapshot.target.darwin-arm64.mk
index 701608c..cb2a0dc 100644
--- a/ui/snapshot/snapshot.target.darwin-arm64.mk
+++ b/ui/snapshot/snapshot.target.darwin-arm64.mk
@@ -97,6 +97,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -222,6 +223,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/snapshot/snapshot.target.darwin-mips.mk b/ui/snapshot/snapshot.target.darwin-mips.mk
index 77b7512..4b617c0 100644
--- a/ui/snapshot/snapshot.target.darwin-mips.mk
+++ b/ui/snapshot/snapshot.target.darwin-mips.mk
@@ -100,6 +100,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -229,6 +230,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/snapshot/snapshot.target.darwin-x86.mk b/ui/snapshot/snapshot.target.darwin-x86.mk
index 31d6cc2..30420a4 100644
--- a/ui/snapshot/snapshot.target.darwin-x86.mk
+++ b/ui/snapshot/snapshot.target.darwin-x86.mk
@@ -103,6 +103,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -233,6 +234,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/snapshot/snapshot.target.darwin-x86_64.mk b/ui/snapshot/snapshot.target.darwin-x86_64.mk
index d705373..8798b14 100644
--- a/ui/snapshot/snapshot.target.darwin-x86_64.mk
+++ b/ui/snapshot/snapshot.target.darwin-x86_64.mk
@@ -102,6 +102,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -232,6 +233,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/snapshot/snapshot.target.linux-arm.mk b/ui/snapshot/snapshot.target.linux-arm.mk
index d4e362d..1d4e50a 100644
--- a/ui/snapshot/snapshot.target.linux-arm.mk
+++ b/ui/snapshot/snapshot.target.linux-arm.mk
@@ -108,6 +108,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -245,6 +246,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/snapshot/snapshot.target.linux-arm64.mk b/ui/snapshot/snapshot.target.linux-arm64.mk
index 701608c..cb2a0dc 100644
--- a/ui/snapshot/snapshot.target.linux-arm64.mk
+++ b/ui/snapshot/snapshot.target.linux-arm64.mk
@@ -97,6 +97,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -222,6 +223,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/snapshot/snapshot.target.linux-mips.mk b/ui/snapshot/snapshot.target.linux-mips.mk
index 77b7512..4b617c0 100644
--- a/ui/snapshot/snapshot.target.linux-mips.mk
+++ b/ui/snapshot/snapshot.target.linux-mips.mk
@@ -100,6 +100,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -229,6 +230,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/snapshot/snapshot.target.linux-x86.mk b/ui/snapshot/snapshot.target.linux-x86.mk
index 31d6cc2..30420a4 100644
--- a/ui/snapshot/snapshot.target.linux-x86.mk
+++ b/ui/snapshot/snapshot.target.linux-x86.mk
@@ -103,6 +103,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
@@ -233,6 +234,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DUSE_OPENSSL=1' \
diff --git a/ui/snapshot/snapshot.target.linux-x86_64.mk b/ui/snapshot/snapshot.target.linux-x86_64.mk
index d705373..8798b14 100644
--- a/ui/snapshot/snapshot.target.linux-x86_64.mk
+++ b/ui/snapshot/snapshot.target.linux-x86_64.mk
@@ -102,6 +102,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -232,6 +233,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/surface/surface.target.darwin-arm.mk b/ui/surface/surface.target.darwin-arm.mk
index 1f4f476..10de5d0 100644
--- a/ui/surface/surface.target.darwin-arm.mk
+++ b/ui/surface/surface.target.darwin-arm.mk
@@ -109,6 +109,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -248,6 +249,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/surface/surface.target.darwin-arm64.mk b/ui/surface/surface.target.darwin-arm64.mk
index 0e4915d..68ba804 100644
--- a/ui/surface/surface.target.darwin-arm64.mk
+++ b/ui/surface/surface.target.darwin-arm64.mk
@@ -98,6 +98,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -225,6 +226,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/surface/surface.target.darwin-mips.mk b/ui/surface/surface.target.darwin-mips.mk
index 30bb21e..0197966 100644
--- a/ui/surface/surface.target.darwin-mips.mk
+++ b/ui/surface/surface.target.darwin-mips.mk
@@ -101,6 +101,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -232,6 +233,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/surface/surface.target.darwin-x86.mk b/ui/surface/surface.target.darwin-x86.mk
index 6afb3d6..e252b0f 100644
--- a/ui/surface/surface.target.darwin-x86.mk
+++ b/ui/surface/surface.target.darwin-x86.mk
@@ -104,6 +104,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
@@ -236,6 +237,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
diff --git a/ui/surface/surface.target.darwin-x86_64.mk b/ui/surface/surface.target.darwin-x86_64.mk
index 01ce8d4..17b813e 100644
--- a/ui/surface/surface.target.darwin-x86_64.mk
+++ b/ui/surface/surface.target.darwin-x86_64.mk
@@ -103,6 +103,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -235,6 +236,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/surface/surface.target.linux-arm.mk b/ui/surface/surface.target.linux-arm.mk
index 1f4f476..10de5d0 100644
--- a/ui/surface/surface.target.linux-arm.mk
+++ b/ui/surface/surface.target.linux-arm.mk
@@ -109,6 +109,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -248,6 +249,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/surface/surface.target.linux-arm64.mk b/ui/surface/surface.target.linux-arm64.mk
index 0e4915d..68ba804 100644
--- a/ui/surface/surface.target.linux-arm64.mk
+++ b/ui/surface/surface.target.linux-arm64.mk
@@ -98,6 +98,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -225,6 +226,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/surface/surface.target.linux-mips.mk b/ui/surface/surface.target.linux-mips.mk
index 30bb21e..0197966 100644
--- a/ui/surface/surface.target.linux-mips.mk
+++ b/ui/surface/surface.target.linux-mips.mk
@@ -101,6 +101,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -232,6 +233,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/ui/surface/surface.target.linux-x86.mk b/ui/surface/surface.target.linux-x86.mk
index 6afb3d6..e252b0f 100644
--- a/ui/surface/surface.target.linux-x86.mk
+++ b/ui/surface/surface.target.linux-x86.mk
@@ -104,6 +104,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
@@ -236,6 +237,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
diff --git a/ui/surface/surface.target.linux-x86_64.mk b/ui/surface/surface.target.linux-x86_64.mk
index 01ce8d4..17b813e 100644
--- a/ui/surface/surface.target.linux-x86_64.mk
+++ b/ui/surface/surface.target.linux-x86_64.mk
@@ -103,6 +103,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -235,6 +236,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/webkit/common/gpu/webkit_gpu.target.darwin-arm.mk b/webkit/common/gpu/webkit_gpu.target.darwin-arm.mk
index c462abd..6aea96a 100644
--- a/webkit/common/gpu/webkit_gpu.target.darwin-arm.mk
+++ b/webkit/common/gpu/webkit_gpu.target.darwin-arm.mk
@@ -111,6 +111,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -250,6 +251,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/webkit/common/gpu/webkit_gpu.target.darwin-arm64.mk b/webkit/common/gpu/webkit_gpu.target.darwin-arm64.mk
index 4c19042..75d8005 100644
--- a/webkit/common/gpu/webkit_gpu.target.darwin-arm64.mk
+++ b/webkit/common/gpu/webkit_gpu.target.darwin-arm64.mk
@@ -100,6 +100,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -227,6 +228,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/webkit/common/gpu/webkit_gpu.target.darwin-mips.mk b/webkit/common/gpu/webkit_gpu.target.darwin-mips.mk
index 58cd17a..c8fcd60 100644
--- a/webkit/common/gpu/webkit_gpu.target.darwin-mips.mk
+++ b/webkit/common/gpu/webkit_gpu.target.darwin-mips.mk
@@ -103,6 +103,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -234,6 +235,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/webkit/common/gpu/webkit_gpu.target.darwin-x86.mk b/webkit/common/gpu/webkit_gpu.target.darwin-x86.mk
index 187a7aa..9fca4e7 100644
--- a/webkit/common/gpu/webkit_gpu.target.darwin-x86.mk
+++ b/webkit/common/gpu/webkit_gpu.target.darwin-x86.mk
@@ -106,6 +106,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -239,6 +240,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/webkit/common/gpu/webkit_gpu.target.darwin-x86_64.mk b/webkit/common/gpu/webkit_gpu.target.darwin-x86_64.mk
index 461b3e8..aa1441a 100644
--- a/webkit/common/gpu/webkit_gpu.target.darwin-x86_64.mk
+++ b/webkit/common/gpu/webkit_gpu.target.darwin-x86_64.mk
@@ -105,6 +105,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -237,6 +238,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/webkit/common/gpu/webkit_gpu.target.linux-arm.mk b/webkit/common/gpu/webkit_gpu.target.linux-arm.mk
index c462abd..6aea96a 100644
--- a/webkit/common/gpu/webkit_gpu.target.linux-arm.mk
+++ b/webkit/common/gpu/webkit_gpu.target.linux-arm.mk
@@ -111,6 +111,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -250,6 +251,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/webkit/common/gpu/webkit_gpu.target.linux-arm64.mk b/webkit/common/gpu/webkit_gpu.target.linux-arm64.mk
index 4c19042..75d8005 100644
--- a/webkit/common/gpu/webkit_gpu.target.linux-arm64.mk
+++ b/webkit/common/gpu/webkit_gpu.target.linux-arm64.mk
@@ -100,6 +100,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -227,6 +228,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/webkit/common/gpu/webkit_gpu.target.linux-mips.mk b/webkit/common/gpu/webkit_gpu.target.linux-mips.mk
index 58cd17a..c8fcd60 100644
--- a/webkit/common/gpu/webkit_gpu.target.linux-mips.mk
+++ b/webkit/common/gpu/webkit_gpu.target.linux-mips.mk
@@ -103,6 +103,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -234,6 +235,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/webkit/common/gpu/webkit_gpu.target.linux-x86.mk b/webkit/common/gpu/webkit_gpu.target.linux-x86.mk
index 187a7aa..9fca4e7 100644
--- a/webkit/common/gpu/webkit_gpu.target.linux-x86.mk
+++ b/webkit/common/gpu/webkit_gpu.target.linux-x86.mk
@@ -106,6 +106,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -239,6 +240,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
diff --git a/webkit/common/gpu/webkit_gpu.target.linux-x86_64.mk b/webkit/common/gpu/webkit_gpu.target.linux-x86_64.mk
index 461b3e8..aa1441a 100644
--- a/webkit/common/gpu/webkit_gpu.target.linux-x86_64.mk
+++ b/webkit/common/gpu/webkit_gpu.target.linux-x86_64.mk
@@ -105,6 +105,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
@@ -237,6 +238,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
