-
-
Notifications
You must be signed in to change notification settings - Fork 12.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #36690 from YorikSar/fix-chromium-build
chromium: fix GCC 7 related build issues
- Loading branch information
Showing
6 changed files
with
113 additions
and
315 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
89 changes: 89 additions & 0 deletions
89
...cations/networking/browsers/chromium/patches/PlaybackImageProvider-copy-constructor.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| --- a/cc/raster/playback_image_provider.cc | ||
| +++ b/cc/raster/playback_image_provider.cc | ||
| @@ -20,7 +20,7 @@ | ||
| PlaybackImageProvider::PlaybackImageProvider( | ||
| ImageDecodeCache* cache, | ||
| const gfx::ColorSpace& target_color_space, | ||
| - base::Optional<Settings> settings) | ||
| + base::Optional<Settings>&& settings) | ||
| : cache_(cache), | ||
| target_color_space_(target_color_space), | ||
| settings_(std::move(settings)) { | ||
| @@ -70,7 +70,10 @@ | ||
| } | ||
|
|
||
| PlaybackImageProvider::Settings::Settings() = default; | ||
| -PlaybackImageProvider::Settings::Settings(const Settings& other) = default; | ||
| +PlaybackImageProvider::Settings::Settings(PlaybackImageProvider::Settings&&) = | ||
| + default; | ||
| PlaybackImageProvider::Settings::~Settings() = default; | ||
| +PlaybackImageProvider::Settings& PlaybackImageProvider::Settings::operator=( | ||
| + PlaybackImageProvider::Settings&&) = default; | ||
|
|
||
| } // namespace cc | ||
| --- a/cc/raster/playback_image_provider.h | ||
| +++ b/cc/raster/playback_image_provider.h | ||
| @@ -20,8 +20,10 @@ | ||
| public: | ||
| struct CC_EXPORT Settings { | ||
| Settings(); | ||
| - Settings(const Settings& other); | ||
| + Settings(const Settings&) = delete; | ||
| + Settings(Settings&&); | ||
| ~Settings(); | ||
| + Settings& operator=(Settings&&); | ||
|
|
||
| // The set of image ids to skip during raster. | ||
| PaintImageIdFlatSet images_to_skip; | ||
| @@ -34,7 +36,7 @@ | ||
| // If no settings are provided, all images are skipped during rasterization. | ||
| PlaybackImageProvider(ImageDecodeCache* cache, | ||
| const gfx::ColorSpace& target_color_space, | ||
| - base::Optional<Settings> settings); | ||
| + base::Optional<Settings>&& settings); | ||
| ~PlaybackImageProvider() override; | ||
|
|
||
| PlaybackImageProvider(PlaybackImageProvider&& other); | ||
| --- a/cc/raster/playback_image_provider_unittest.cc | ||
| +++ b/cc/raster/playback_image_provider_unittest.cc | ||
| @@ -84,7 +84,8 @@ TEST(PlaybackImageProviderTest, SkipsSomeImages) { | ||
| settings.emplace(); | ||
| settings->images_to_skip = {skip_image.stable_id()}; | ||
|
|
||
| - PlaybackImageProvider provider(&cache, gfx::ColorSpace(), settings); | ||
| + PlaybackImageProvider provider(&cache, gfx::ColorSpace(), | ||
| + std::move(settings)); | ||
| provider.BeginRaster(); | ||
|
|
||
| SkIRect rect = SkIRect::MakeWH(10, 10); | ||
| @@ -100,7 +101,8 @@ TEST(PlaybackImageProviderTest, RefAndUnrefDecode) { | ||
|
|
||
| base::Optional<PlaybackImageProvider::Settings> settings; | ||
| settings.emplace(); | ||
| - PlaybackImageProvider provider(&cache, gfx::ColorSpace(), settings); | ||
| + PlaybackImageProvider provider(&cache, gfx::ColorSpace(), | ||
| + std::move(settings)); | ||
| provider.BeginRaster(); | ||
|
|
||
| { | ||
| @@ -133,7 +135,8 @@ TEST(PlaybackImageProviderTest, AtRasterImages) { | ||
| settings.emplace(); | ||
| settings->at_raster_images = {draw_image1, draw_image2}; | ||
|
|
||
| - PlaybackImageProvider provider(&cache, gfx::ColorSpace(), settings); | ||
| + PlaybackImageProvider provider(&cache, gfx::ColorSpace(), | ||
| + std::move(settings)); | ||
|
|
||
| EXPECT_EQ(cache.refed_image_count(), 0); | ||
| provider.BeginRaster(); | ||
| @@ -158,7 +161,8 @@ TEST(PlaybackImageProviderTest, SwapsGivenFrames) { | ||
| settings.emplace(); | ||
| settings->image_to_current_frame_index = image_to_frame; | ||
|
|
||
| - PlaybackImageProvider provider(&cache, gfx::ColorSpace(), settings); | ||
| + PlaybackImageProvider provider(&cache, gfx::ColorSpace(), | ||
| + std::move(settings)); | ||
| provider.BeginRaster(); | ||
|
|
||
| SkIRect rect = SkIRect::MakeWH(10, 10); | ||
|
|
98 changes: 0 additions & 98 deletions
98
pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r4.patch
This file was deleted.
Oops, something went wrong.
98 changes: 0 additions & 98 deletions
98
pkgs/applications/networking/browsers/chromium/patches/constexpr-fix.patch
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.