[go: nahoru, domu]
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ozone/Wayland: Update branch to version 71.0.3545.0 aka ToT #170

Merged
merged 1 commit into from
Sep 14, 2018
Merged

Ozone/Wayland: Update branch to version 71.0.3545.0 aka ToT #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions recipes-browser/chromium/chromium-gn.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ B = "${S}/${OUTPUT_DIR}"
SRC_URI += " \
file://v8-qemu-wrapper.patch \
file://wrapper-extra-flags.patch \
file://zlib-aarch64.patch \
"

# Append instead of assigning; the gtk-icon-cache class inherited above also
Expand All @@ -27,6 +28,7 @@ DEPENDS += " \
glib-2.0 \
gn-native \
gperf-native \
gtk+3 \
otavio marked this conversation as resolved.
Show resolved Hide resolved
jpeg \
libdrm \
libwebp \
Expand Down
28 changes: 10 additions & 18 deletions recipes-browser/chromium/chromium-ozone-wayland-tarball.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
SRC_URI = "https://tmp.igalia.com/chromium-tarballs/chromium-ozone-wayland-dev-${PV}.tar.xz"
S = "${WORKDIR}/chromium-ozone-wayland-dev-${PV}"

SRC_URI[md5sum] = "1015ec7534923178edb61502b4d4ec34"
SRC_URI[sha256sum] = "9b5098ab9989a0d0df975f74ed7e65bd922fac593c74de9887450643047756c6"
SRC_URI[md5sum] = "b3be15f15294772f1110b29524f21b4a"
SRC_URI[sha256sum] = "17cab0c49666f997b587e8d04c8e5464f003178f9817c29f483b5170fb51d7cd"

LIC_FILES_CHKSUM = "\
file://${S}/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \
Expand All @@ -20,7 +20,6 @@ LIC_FILES_CHKSUM = "\
file://${S}/buildtools/third_party/libc++abi/trunk/LICENSE.TXT;md5=8ae94dd6195890583eee15a988b6ea79 \
file://${S}/chrome/installer/mac/third_party/bsdiff/LICENSE;md5=0dbe7a50f028269750631fcbded3846a \
file://${S}/chrome/installer/mac/third_party/xz/LICENSE;md5=8bbde65ae0523dc878ed1ac1252d2d14 \
file://${S}/chrome/third_party/chromevox/LICENSE;md5=45739090b454125d851ac7bb1bbd23a2 \
file://${S}/chrome/third_party/mozilla_security_manager/LICENSE;md5=0c259b853bbf067b361100ce560adce7 \
file://${S}/chromeos/third_party/android_bionic_libc/NOTICE;md5=323acddf0a0970d8ad7a7af3ba745f67 \
file://${S}/courgette/third_party/bsdiff/LICENCE;md5=7c2ad392281bc3d9b04a31102ee7abdd \
Expand All @@ -34,7 +33,7 @@ LIC_FILES_CHKSUM = "\
file://${S}/native_client/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \
file://${S}/native_client_sdk/src/libraries/third_party/newlib-extras/README;md5=e944d73ca3817b7ca8656eafb9497fed \
file://${S}/net/third_party/nss/LICENSE;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \
file://${S}/third_party/SPIRV-Tools/LICENSE;md5=ce523927d7bcd789d6c3af579d03ad73 \
file://${S}/third_party/SPIRV-Tools/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/WebKit/LICENSE_FOR_ABOUT_CREDITS;md5=11e90d553b211de885f245900c4ccf89 \
file://${S}/third_party/accessibility-audit/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/afl/src/docs/COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57 \
Expand All @@ -44,11 +43,10 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/android_media/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/android_opengl/LICENSE;md5=d10e92761a860d4113a7a525c78daf13 \
file://${S}/third_party/android_swipe_refresh/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/angle/LICENSE;md5=10305d79487367a5e938772c27246ac1 \
file://${S}/third_party/angle/LICENSE;md5=7abdb66a6948f39c2f469140db5184e2 \
file://${S}/third_party/apple_apsl/LICENSE;md5=c8c14a9f985552dba8d3edbd76660088 \
file://${S}/third_party/apple_sample_code/LICENSE;md5=d4c6eafcba87d49fffb4620359f7fe01 \
file://${S}/third_party/ashmem/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/boringssl/src/LICENSE;md5=7707289753aa39daf59ecd93d0164faf \
file://${S}/third_party/boringssl/src/LICENSE;md5=9b082148f9953258347788edb83e401b \
file://${S}/third_party/brotli/LICENSE;md5=941ee9cd1609382f946352712a319b4b \
file://${S}/third_party/bspatch/LICENSE;md5=3e837ede9697ce4c789c3ca32aabe003 \
file://${S}/third_party/cacheinvalidation/src/google/cacheinvalidation/COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57 \
Expand All @@ -59,29 +57,27 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/custom_tabs_client/LICENSE;md5=34400b68072d710fecd0a2940a0d1658 \
file://${S}/third_party/d3/src/LICENSE;md5=5e44e63b7491ec4b18f73d1b38334a04 \
file://${S}/third_party/decklink/LICENSE;md5=85b197f7b7b1ef270b01a1b6377be50e \
file://${S}/third_party/deqp/LICENSE;md5=67d07a07ec29a50a3ded12b2ba952257 \
file://${S}/third_party/dom_distiller_js/LICENSE;md5=1399a5b89c7ed8167d261770432511e8 \
file://${S}/third_party/errorprone/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/expat/files/COPYING;md5=5b8620d98e49772d95fc1d291c26aa79 \
file://${S}/third_party/ffmpeg/CREDITS.chromium;md5=cf41b19a4171fd9fb94480fcbf1f99f2 \
file://${S}/third_party/ffmpeg/CREDITS.chromium;md5=ccd691316e9b2fd436cd55b6347bb6c8 \
file://${S}/third_party/fips181/COPYING;md5=da26b18c1a03a3cae0abccae554029c6 \
file://${S}/third_party/flac/COPYING.Xiph;md5=a2c4b71c0198682376d483eb5bcc9197 \
file://${S}/third_party/flatbuffers/LICENSE;md5=a873c5645c184d51e0f9b34e1d7cf559 \
file://${S}/third_party/flot/LICENSE.txt;md5=fe1ea2158d814e4fc7227c8c6ccd7ab3 \
file://${S}/third_party/fontconfig/src/COPYING;md5=7a0449e9bc5370402a94c00204beca3d \
file://${S}/third_party/freetype/src/docs/FTL.TXT;md5=13b25413274c9b3b09b63e4028216ff4 \
file://${S}/third_party/freetype/src/docs/FTL.TXT;md5=9f37b4e6afa3fef9dba8932b16bd3f97 \
file://${S}/third_party/gestures/LICENSE;md5=8a978a7211275297a3d816117be58ebf \
file://${S}/third_party/gif_player/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
file://${S}/third_party/glslang/LICENSE;md5=ce523927d7bcd789d6c3af579d03ad73 \
file://${S}/third_party/google_input_tools/LICENSE;md5=ff0b0f0202337c9d4ae2d869797049d3 \
file://${S}/third_party/google_toolbox_for_mac/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/gvr-android-sdk/LICENSE;md5=50b9d1f02b2ee0d8a568ccf4d35216e2 \
file://${S}/third_party/haha/LICENSE;md5=7a4d962049fded4f1b47d1e4027ace42 \
file://${S}/third_party/harfbuzz-ng/COPYING;md5=e021dd6dda6ff1e6b1044002fc662b9b \
file://${S}/third_party/hunspell/COPYING.MPL;md5=bfe1f75d606912a4111c90743d6c7325 \
file://${S}/third_party/iaccessible2/LICENSE;md5=43bbd0bfb581347ec10def720000a645 \
file://${S}/third_party/iccjpeg/LICENSE;md5=26834d132689a03abf860f4572705494 \
file://${S}/third_party/icu/LICENSE;md5=675f2d069434d8a1e4e6b0dcf4379226 \
file://${S}/third_party/icu/LICENSE;md5=63752c57bd0b365c9af9f427ef79c819 \
file://${S}/third_party/inspector_protocol/LICENSE;md5=db90dcb101891a7285d25f2fbceca752 \
file://${S}/third_party/isimpledom/LICENSE;md5=822502c0e010ccdbb6a3e681dd47888e \
file://${S}/third_party/jsoncpp/LICENSE;md5=c56ee55c03a55f8105b969d8270632ce \
Expand Down Expand Up @@ -115,25 +111,22 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/logilab/logilab/common/LICENSE.txt;md5=751419260aa954499f7abaabaa882bbe \
file://${S}/third_party/lzma_sdk/LICENSE;md5=a8d1f5a28cfd35e6dfea09b82672fae7 \
file://${S}/third_party/mach_override/LICENSE;md5=0e9870caf60d27bfaff637979bfafc44 \
file://${S}/third_party/mesa/LICENSE;md5=89b61de67f7dc5e1c536aa23192b1468 \
file://${S}/third_party/minigbm/LICENSE;md5=fcd558ab2fd7f53408826e80eb0c11eb \
file://${S}/third_party/modp_b64/LICENSE;md5=eb7e2e0af1d4971360553aedadee8d86 \
file://${S}/third_party/molokocacao/LICENSE;md5=2be992b97984f595666a17061e112658 \
file://${S}/third_party/mozilla/LICENSE;md5=822502c0e010ccdbb6a3e681dd47888e \
file://${S}/third_party/mt19937ar/LICENSE;md5=0ba2340297d7bf84647affdcbe3f90b9 \
file://${S}/third_party/openh264/src/LICENSE;md5=bb6d3771da6a07d33fd50d4d9aa73bcf \
file://${S}/third_party/openmax_dl/LICENSE;md5=3c999c621badfd6937bcfef14f4528ce \
file://${S}/third_party/opus/src/COPYING;md5=e304cdf74c2a1b0a33a5084c128a23a3 \
file://${S}/third_party/ots/LICENSE;md5=e06eff2aa65b917034a81599bea73dc4 \
file://${S}/third_party/pdfium/LICENSE;md5=defd64fe3646eb60a5d01fcbcc8b6b7c \
file://${S}/third_party/ply/LICENSE;md5=f298aa3b0cfe0b0ea96acabf944529c0 \
file://${S}/third_party/polymer/LICENSE.polymer;md5=324f45ce459ffd97e41d175a4e95a4be \
file://${S}/third_party/protobuf/LICENSE;md5=35953c752efc9299b184f91bef540095 \
file://${S}/third_party/protobuf/LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \
file://${S}/third_party/pylint/pylint/LICENSE.txt;md5=4325afd396febcb659c36b49533135d4 \
file://${S}/third_party/qcms/src/COPYING;md5=65636fa951328d3be95f6047ec3936ce \
file://${S}/third_party/re2/LICENSE;md5=3b5c31eb512bdf3cb11ffd5713963760 \
file://${S}/third_party/sfntly/COPYING.txt;md5=2326ae5ca22e299a528433bebb02131f \
file://${S}/third_party/shaderc/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
file://${S}/third_party/simplejson/LICENSE.txt;md5=8a9f8dcfcd28c34daa443e5b1d29813b \
file://${S}/third_party/skia/LICENSE;md5=d25bb58a1be2e1af9b58d31565a206dc \
file://${S}/third_party/smhasher/LICENSE;md5=0d948322ab524e2b74f55eb8ef57c74a \
Expand All @@ -147,7 +140,6 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/usb_ids/LICENSE;md5=8f694e3758e3e57a5223bfa2bf29d452 \
file://${S}/third_party/usrsctp/LICENSE;md5=d8ad24c2ddd0e7bc1b0a6e4c7c80443e \
file://${S}/third_party/v4l-utils/COPYING.libv4l;md5=d749e86a105281d7a44c2328acebc4b0 \
file://${S}/third_party/vulkan/LICENSE;md5=16f18dd21657bdb148361746fdcc49a0 \
file://${S}/third_party/wayland-protocols/src/COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \
file://${S}/third_party/wayland/src/COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \
file://${S}/third_party/wds/src/COPYING;md5=cb8aedd3bced19bd8026d96a8b6876d7 \
Expand All @@ -160,7 +152,7 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/yasm/source/patched-yasm/COPYING;md5=a12d8903508fb6bfd49d8d82c6170dd9 \
file://${S}/third_party/zlib/LICENSE;md5=f09575dbfb09420642318b413159496f \
file://${S}/url/third_party/mozilla/LICENSE.txt;md5=437ced1e9b232651b0912a9594da43b2 \
file://${S}/v8/LICENSE;md5=71f2c485344c921f659ea9f7d895ea22 \
file://${S}/v8/LICENSE;md5=bda6d3b7be87052ff181da3ed9fd5501 \
file://${S}/v8/LICENSE.fdlibm;md5=b17367d6c97e638599071d99a3049dfe \
file://${S}/v8/LICENSE.strongtalk;md5=956a43818dd13f2e93088fc2c93589d2 \
"
72 changes: 72 additions & 0 deletions ...um/chromium-ozone-wayland/0001-Fix-GCC-build-remove-constexpr-for-non-resolved-comp.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
Upstream-Status: Submitted [https://crrev.com/c/1213248]

- Waiting approval.

This patch fixes such errors as:
../../content/browser/appcache/appcache_manifest_parser.cc:78:26: error:
call to non-constexpr function 'base::BasicStringPiece<STRING_TYPE>
base::BasicStringPiece<STRING_TYPE>::substr(base::BasicStringPiece<STRING_TYPE>::size_type,
base::BasicStringPiece<STRING_TYPE>::size_type) const [with STRING_TYPE
= std::__cxx11::basic_string<char>;
base::BasicStringPiece<STRING_TYPE>::size_type = unsigned int]'
return data.substr(skip);
^

Signed-off-by: Maksim Sisov <msisov@igalia.com>
---
From d781b42fea804b5c0b9440dfb671a1274f8f9585 Mon Sep 17 00:00:00 2001
From: Maksim Sisov <msisov@igalia.com>
Date: Fri, 7 Sep 2018 19:48:45 +0300
Subject: [PATCH] Fix GCC build: remove constexpr for non-resolved compile time
methods

This fixes: error: call to non-constexpr function

Change-Id: I9ae23d03535db80ad42c1f5040933334874d6a2a
---
content/browser/appcache/appcache_manifest_parser.cc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/content/browser/appcache/appcache_manifest_parser.cc b/content/browser/appcache/appcache_manifest_parser.cc
index 2b8cd3e6f4e8..d07cabf28fb8 100644
--- a/content/browser/appcache/appcache_manifest_parser.cc
+++ b/content/browser/appcache/appcache_manifest_parser.cc
@@ -71,7 +71,7 @@ constexpr bool IsTokenSeparator(char character) {
}

// Removes the characters at the beginning of the string up to a newline.
-constexpr base::StringPiece TrimToFirstNewLine(base::StringPiece data) {
+base::StringPiece TrimToFirstNewLine(base::StringPiece data) {
size_t skip = 0;
while (skip < data.length() && !IsNewLine(data[skip]))
++skip;
@@ -79,7 +79,7 @@ constexpr base::StringPiece TrimToFirstNewLine(base::StringPiece data) {
}

// Removes whitespace characters at the beginning of the string.
-constexpr base::StringPiece TrimStartingWhiteSpace(base::StringPiece data) {
+base::StringPiece TrimStartingWhiteSpace(base::StringPiece data) {
size_t skip = 0;
while (skip < data.length() && IsWhiteSpace(data[skip]))
++skip;
@@ -87,7 +87,7 @@ constexpr base::StringPiece TrimStartingWhiteSpace(base::StringPiece data) {
}

// Removes whitespace characters at the end of the string.
-constexpr base::StringPiece TrimTrailingWhiteSpace(base::StringPiece data) {
+base::StringPiece TrimTrailingWhiteSpace(base::StringPiece data) {
size_t length = data.size();

while (length != 0) {
@@ -104,7 +104,7 @@ constexpr base::StringPiece TrimTrailingWhiteSpace(base::StringPiece data) {
//
// Returns the first line, which is guaranteed not to include a newline, and the
// rest of the string, which may be empty.
-constexpr std::pair<base::StringPiece, base::StringPiece> SplitOnNewLine(
+std::pair<base::StringPiece, base::StringPiece> SplitOnNewLine(
base::StringPiece data) {
size_t split = 0;
while (split < data.length() && !IsNewLine(data[split]))
--
2.11.0

38 changes: 38 additions & 0 deletions ...hromium/chromium-ozone-wayland/0001-Fix-a-GCC-error-about-undeclared-std-unique_ptr.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
Upstream-Status: Backport

- Backported from the ToT: https://crrev.com/c/1213247

Signed-off-by: Maksim Sisov <msisov@igalia.com>
---
From cfea1af190b5bd6027a888503a1c7ea45d72ee00 Mon Sep 17 00:00:00 2001
From: Maksim Sisov <msisov@igalia.com>
Date: Mon, 10 Sep 2018 06:45:24 +0000
Subject: [PATCH] Fix a GCC error about undeclared std::unique_ptr

The memory header was missing from this header. Adding it here.

Change-Id: Ic52dc3a194fabb50dd6758e6b1af693358b408cc
Reviewed-on: https://chromium-review.googlesource.com/1213247
Commit-Queue: Maksim Sisov <msisov@igalia.com>
Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org>
Cr-Commit-Position: refs/heads/master@{#589838}
---
ui/aura/screen_ozone.h | 2 ++
1 file changed, 2 insertions(+)

diff --git a/ui/aura/screen_ozone.h b/ui/aura/screen_ozone.h
index 132ea5917026..7c26999f515c 100644
--- a/ui/aura/screen_ozone.h
+++ b/ui/aura/screen_ozone.h
@@ -5,6 +5,8 @@
#ifndef UI_AURA_SCREEN_OZONE_H_
#define UI_AURA_SCREEN_OZONE_H_

+#include <memory>
+
#include "base/macros.h"
#include "ui/aura/aura_export.h"
#include "ui/display/screen.h"
--
2.11.0

66 changes: 66 additions & 0 deletions ...um/chromium-ozone-wayland/0001-OmniboxTextView-fix-gcc-error-for-structure-initiali.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
Upstream-Status: Backport

- Backported from the ToT: https://crrev.com/c/1213181

Fixes builds errors such as:

error: no match for 'operator=' (operand types are
'{anonymous}::ApplyTextStyleForType(SuggestionAnswer::TextStyle,
OmniboxResultView*, gfx::RenderText*, const
gfx::Range&)::TextStyleNewAnswers' and '<brace-enclosed initializer
list>')
style = {part_color, .weight = gfx::Font::Weight::BOLD};
^
../../chrome/browser/ui/views/omnibox/omnibox_text_view.cc:148:10: note:
candidate: constexpr
{anonymous}::ApplyTextStyleForType(SuggestionAnswer::TextStyle,
OmniboxResultView*, gfx::RenderText*, const
gfx::Range&)::TextStyleNewAnswers&
{anonymous}::ApplyTextStyleForType(SuggestionAnswer::TextStyle,
OmniboxResultView*, gfx::RenderText*, const
gfx::Range&)::TextStyleNewAnswers::operator=(const
{anonymous}::ApplyTextStyleForType(SuggestionAnswer::TextStyle,
OmniboxResultView*, gfx::RenderText*, const
gfx::Range&)::TextStyleNewAnswers&)
struct TextStyleNewAnswers {
^~~~~~~~~~~~~~~~~~~

Signed-off-by: Maksim Sisov <msisov@igalia.com>
---
From e7a7861f4b0560c618f473a8127bfcd2bae07f2b Mon Sep 17 00:00:00 2001
From: Maksim Sisov <msisov@igalia.com>
Date: Fri, 7 Sep 2018 18:57:42 +0000
Subject: [PATCH] OmniboxTextView: fix gcc error for structure initialization

It looks like there is bug in GCC 6, which cannot go through
structure initialization normally.

Thus, instead of a default initialization of one of the members,
explicitly initialize it to a default value.

Change-Id: Ia55cc6658e6b6b2f8a80c2582dd28f001c9e648c
Reviewed-on: https://chromium-review.googlesource.com/1213181
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Maksim Sisov <msisov@igalia.com>
Cr-Commit-Position: refs/heads/master@{#589614}
---
chrome/browser/ui/views/omnibox/omnibox_text_view.cc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/chrome/browser/ui/views/omnibox/omnibox_text_view.cc b/chrome/browser/ui/views/omnibox/omnibox_text_view.cc
index f0a8083dc930..9021284f166d 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_text_view.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_text_view.cc
@@ -175,7 +175,8 @@ void ApplyTextStyleForType(SuggestionAnswer::TextStyle text_style,
style = {part_color, .baseline = gfx::SUPERIOR};
break;
case SuggestionAnswer::TextStyle::BOLD:
- style = {part_color, .weight = gfx::Font::Weight::BOLD};
+ style = {part_color, .baseline = gfx::NORMAL_BASELINE,
+ .weight = gfx::Font::Weight::BOLD};
break;
case SuggestionAnswer::TextStyle::NORMAL:
case SuggestionAnswer::TextStyle::NORMAL_DIM:
--
2.11.0

65 changes: 65 additions & 0 deletions ...um/chromium-ozone-wayland/0001-ScrollPaintPropertyNode-Rename-SnapContainerData-to-.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
Upstream-Status: Submitted [https://crrev.com/c/1213180]

- Submitted to upstream, waiting approval

This patch fixes such errors as:

../../third_party/blink/renderer/platform/scroll/scroll_snap_data.h:22:48:
error: changes meaning of 'SnapContainerData' from 'using
SnapContainerData = class cc::SnapContainerData' [-fpermissive]
using SnapContainerData = cc::SnapContainerData;

Signed-off-by: Maksim Sisov <msisov@igalia.com>
---
From 5b1c4cfa6b7f934280ac5a7b1a2d38aa6ecc05e1 Mon Sep 17 00:00:00 2001
From: Maksim Sisov <msisov@igalia.com>
Date: Fri, 7 Sep 2018 19:55:59 +0300
Subject: [PATCH] ScrollPaintPropertyNode: Rename SnapContainerData() to
GetSnapContainerData()

GCC is stricter than clang when it comes to class members' names and how
they can change the meaning of a previously existing symbol with the same
name.

Here is a short error message:

error: changes meaning of 'SnapContainerData' from 'using SnapContainerData =
class cc::SnapContainerData' [-fpermissive] using SnapContainerData =
cc::SnapContainerData;

Cq-Include-Trybots: luci.chromium.try:linux_layout_tests_slimming_paint_v2;master.tryserver.blink:linux_trusty_blink_rel
Change-Id: I0de5460f17b13484253e1ff0538b111c9a3b0d13
---
.../renderer/platform/graphics/compositing/property_tree_manager.cc | 2 +-
.../blink/renderer/platform/graphics/paint/scroll_paint_property_node.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc b/third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc
index 2ac29aa32ae7..dda9f0a6b124 100644
--- a/third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc
+++ b/third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc
@@ -299,7 +299,7 @@ void PropertyTreeManager::CreateCompositorScrollNode(
scroll_node->OverscrollBehaviorX()),
static_cast<cc::OverscrollBehavior::OverscrollBehaviorType>(
scroll_node->OverscrollBehaviorY()));
- compositor_node.snap_container_data = scroll_node->SnapContainerData();
+ compositor_node.snap_container_data = scroll_node->GetSnapContainerData();

auto compositor_element_id = scroll_node->GetCompositorElementId();
if (compositor_element_id) {
diff --git a/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h b/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h
index 2bd206ee9600..2d222bcea8e5 100644
--- a/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h
+++ b/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h
@@ -99,7 +99,7 @@ class PLATFORM_EXPORT ScrollPaintPropertyNode
return state_.overscroll_behavior.y;
}

- base::Optional<SnapContainerData> SnapContainerData() const {
+ base::Optional<SnapContainerData> GetSnapContainerData() const {
return state_.snap_container_data;
}

--
2.11.0

Loading