Roll chromium_revision c27ef6f9f6..6e14efc13e (568443:568572)
Change log: https://chromium.googlesource.com/chromium/src/+log/c27ef6f9f6..6e14efc13e
Full diff: https://chromium.googlesource.com/chromium/src/+/c27ef6f9f6..6e14efc13e
Roll chromium third_party 1eaf756265..4f48640f18
Change log: https://chromium.googlesource.com/chromium/src/third_party/+log/1eaf756265..4f48640f18
Changed dependencies:
* src/base: https://chromium.googlesource.com/chromium/src/base/+log/c7a45ded14..77a7f95a5d
* src/build: https://chromium.googlesource.com/chromium/src/build/+log/e73af5b5bf..f39ed7d34b
* src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/e0e84b865e..14999df41f
* src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/10ad87fa0c..6ed62d822b
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/c5ef6d834a..f704817cbb
* src/third_party/freetype/src: https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/8f1ed54877..7915fd51f1
* src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/4bf8360e73..fb52aac618
DEPS diff: https://chromium.googlesource.com/chromium/src/+/c27ef6f9f6..6e14efc13e/DEPS
No update to Clang.
TBR=buildbot@webrtc.org,
BUG=None
CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal
NO_AUTOIMPORT_DEPS_CHECK=true
Change-Id: Iece627cfbf699c302ece8641658ccdde8b4fa6f8
Reviewed-on: https://webrtc-review.googlesource.com/84222
Commit-Queue: WebRTC Buildbot <buildbot@webrtc.org>
Reviewed-by: WebRTC Buildbot <buildbot@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23668}diff --git a/DEPS b/DEPS
index 760f6cb..e8108e0 100644
--- a/DEPS
+++ b/DEPS
@@ -10,7 +10,7 @@
'checkout_configuration': 'default',
'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"',
'webrtc_git': 'https://webrtc.googlesource.com',
- 'chromium_revision': 'c27ef6f9f6c635f878e8510c2f71e52ada53a993',
+ 'chromium_revision': '6e14efc13e8c4687b8fc6984c542bed0969a6a04',
'boringssl_git': 'https://boringssl.googlesource.com',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling swarming_client
@@ -27,7 +27,7 @@
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling catapult
# and whatever else without interference from each other.
- 'catapult_revision': 'c5ef6d834a158822a50c67dc117835b28b32be73',
+ 'catapult_revision': 'f704817cbbab2484d0510a0b622fc93b68980cc5',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling libFuzzer
# and whatever else without interference from each other.
@@ -35,7 +35,7 @@
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling freetype
# and whatever else without interference from each other.
- 'freetype_revision': '8f1ed54877ffab4fc2cf2be329446c748a885842',
+ 'freetype_revision': '7915fd51f123d0adbe6a0b9ad19eb941e1733c87',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling HarfBuzz
# and whatever else without interference from each other.
@@ -43,15 +43,15 @@
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Chromium third_party
# and whatever else without interference from each other.
- 'chromium_third_party_revision': '1eaf756265ab8c3e16834ea6efcb7c2e6ded2c92',
+ 'chromium_third_party_revision': '4f48640f186906ac8942bc3726fbc01f4fb49d4e',
}
deps = {
# TODO(kjellander): Move this to be Android-only once the libevent dependency
# in base/third_party/libevent is solved.
'src/base':
- Var('chromium_git') + '/chromium/src/base' + '@' + 'c7a45ded145802fa1ca6560122eb4daf203d8ba5',
+ Var('chromium_git') + '/chromium/src/base' + '@' + '77a7f95a5dfb7eff78861a5854ada4a244cfef3c',
'src/build':
- Var('chromium_git') + '/chromium/src/build' + '@' + 'e73af5b5bf97a9e393bd1b115654ee8d217d4589',
+ Var('chromium_git') + '/chromium/src/build' + '@' + 'f39ed7d34b8f1d21943f4b2898f071cfe618dae8',
'src/buildtools':
Var('chromium_git') + '/chromium/buildtools.git' + '@' + '5941c1b3df96c1db756a2834343533335c394c4a',
# Gradle 4.3-rc4. Used for testing Android Studio project generation for WebRTC.
@@ -61,11 +61,11 @@
'condition': 'checkout_android',
},
'src/ios': {
- 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + 'e0e84b865e610b3fcebde1ddea24b344aff82cf5',
+ 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '14999df41f19f5daef681e0fff0b9046fe9050a3',
'condition': 'checkout_ios',
},
'src/testing':
- Var('chromium_git') + '/chromium/src/testing' + '@' + '10ad87fa0c53ab43c5cce387f220be1c1064d000',
+ Var('chromium_git') + '/chromium/src/testing' + '@' + '6ed62d822b512c9e7b0659dbe6a918ef44e3da60',
# This entry is used for chromium third_party rolling into webrtc third_party only.
'src/third_party_chromium': {
'url': Var('chromium_git') + '/chromium/src/third_party' + '@' + Var('chromium_third_party_revision'),
@@ -185,7 +185,7 @@
'src/third_party/yasm/source/patched-yasm':
Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + 'b98114e18d8b9b84586b10d24353ab8616d4c5fc',
'src/tools':
- Var('chromium_git') + '/chromium/src/tools' + '@' + '4bf8360e732099db3300b4334c96ca0e61333fc2',
+ Var('chromium_git') + '/chromium/src/tools' + '@' + 'fb52aac618263b817c2a8c0eb879c346f8d43526',
'src/tools/swarming_client':
Var('chromium_git') + '/infra/luci/client-py.git' + '@' + Var('swarming_revision'),
diff --git a/third_party/freetype/README.chromium b/third_party/freetype/README.chromium
index eea790b..218a66d 100644
--- a/third_party/freetype/README.chromium
+++ b/third_party/freetype/README.chromium
@@ -1,7 +1,7 @@
Name: FreeType
URL: http://www.freetype.org/
-Version: VER-2-9-1-56
-Revision: 8f1ed54877ffab4fc2cf2be329446c748a885842
+Version: VER-2-9-1-97
+Revision: 7915fd51f123d0adbe6a0b9ad19eb941e1733c87
License: Custom license "inspired by the BSD, Artistic, and IJG (Independent
JPEG Group) licenses"
License File: src/docs/FTL.TXT
diff --git a/third_party/freetype/include/freetype-custom-config/ftconfig.h b/third_party/freetype/include/freetype-custom-config/ftconfig.h
index 09199c1..3b6bbaf 100644
--- a/third_party/freetype/include/freetype-custom-config/ftconfig.h
+++ b/third_party/freetype/include/freetype-custom-config/ftconfig.h
@@ -151,33 +151,33 @@
#endif
- /*************************************************************************/
- /* */
- /* <Section> */
- /* basic_types */
- /* */
- /*************************************************************************/
+ /**************************************************************************
+ *
+ * @section:
+ * basic_types
+ *
+ */
- /*************************************************************************/
- /* */
- /* <Type> */
- /* FT_Int16 */
- /* */
- /* <Description> */
- /* A typedef for a 16bit signed integer type. */
- /* */
+ /**************************************************************************
+ *
+ * @type:
+ * FT_Int16
+ *
+ * @description:
+ * A typedef for a 16bit signed integer type.
+ */
typedef signed short FT_Int16;
- /*************************************************************************/
- /* */
- /* <Type> */
- /* FT_UInt16 */
- /* */
- /* <Description> */
- /* A typedef for a 16bit unsigned integer type. */
- /* */
+ /**************************************************************************
+ *
+ * @type:
+ * FT_UInt16
+ *
+ * @description:
+ * A typedef for a 16bit unsigned integer type.
+ */
typedef unsigned short FT_UInt16;
/* */
@@ -186,50 +186,50 @@
/* this #if 0 ... #endif clause is for documentation purposes */
#if 0
- /*************************************************************************/
- /* */
- /* <Type> */
- /* FT_Int32 */
- /* */
- /* <Description> */
- /* A typedef for a 32bit signed integer type. The size depends on */
- /* the configuration. */
- /* */
+ /**************************************************************************
+ *
+ * @type:
+ * FT_Int32
+ *
+ * @description:
+ * A typedef for a 32bit signed integer type. The size depends on
+ * the configuration.
+ */
typedef signed XXX FT_Int32;
- /*************************************************************************/
- /* */
- /* <Type> */
- /* FT_UInt32 */
- /* */
- /* A typedef for a 32bit unsigned integer type. The size depends on */
- /* the configuration. */
- /* */
+ /**************************************************************************
+ *
+ * @type:
+ * FT_UInt32
+ *
+ * A typedef for a 32bit unsigned integer type. The size depends on
+ * the configuration.
+ */
typedef unsigned XXX FT_UInt32;
- /*************************************************************************/
- /* */
- /* <Type> */
- /* FT_Int64 */
- /* */
- /* A typedef for a 64bit signed integer type. The size depends on */
- /* the configuration. Only defined if there is real 64bit support; */
- /* otherwise, it gets emulated with a structure (if necessary). */
- /* */
+ /**************************************************************************
+ *
+ * @type:
+ * FT_Int64
+ *
+ * A typedef for a 64bit signed integer type. The size depends on
+ * the configuration. Only defined if there is real 64bit support;
+ * otherwise, it gets emulated with a structure (if necessary).
+ */
typedef signed XXX FT_Int64;
- /*************************************************************************/
- /* */
- /* <Type> */
- /* FT_UInt64 */
- /* */
- /* A typedef for a 64bit unsigned integer type. The size depends on */
- /* the configuration. Only defined if there is real 64bit support; */
- /* otherwise, it gets emulated with a structure (if necessary). */
- /* */
+ /**************************************************************************
+ *
+ * @type:
+ * FT_UInt64
+ *
+ * A typedef for a 64bit unsigned integer type. The size depends on
+ * the configuration. Only defined if there is real 64bit support;
+ * otherwise, it gets emulated with a structure (if necessary).
+ */
typedef unsigned XXX FT_UInt64;
/* */
