Unreviewed, fix libwebrtc build with GCC 9 after the M82 bump.
GCC 9 fails to process the FrameGeneratorCapturerConfig::ImageSlides::Crop
class, throwing an error due to the default member initializer for the
`scroll_duration` member being required before the end of the
encapsulating FrameGeneratorCapturerConfig::ImageSlides class.
This can be avoided by default-initializing the
FrameGeneratorCapturerConfig::ImageSlides::Crop member variable instead
of specific members of that class.
Similar fix will be pushed to the upstream repository.
* Source/webrtc/test/frame_generator_capturer.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@259381 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/ThirdParty/libwebrtc/ChangeLog b/Source/ThirdParty/libwebrtc/ChangeLog
index 4d542c3..4e209f0 100644
--- a/Source/ThirdParty/libwebrtc/ChangeLog
+++ b/Source/ThirdParty/libwebrtc/ChangeLog
@@ -1,3 +1,20 @@
+2020-04-02 Zan Dobersek <zdobersek@igalia.com>
+
+ Unreviewed, fix libwebrtc build with GCC 9 after the M82 bump.
+
+ GCC 9 fails to process the FrameGeneratorCapturerConfig::ImageSlides::Crop
+ class, throwing an error due to the default member initializer for the
+ `scroll_duration` member being required before the end of the
+ encapsulating FrameGeneratorCapturerConfig::ImageSlides class.
+
+ This can be avoided by default-initializing the
+ FrameGeneratorCapturerConfig::ImageSlides::Crop member variable instead
+ of specific members of that class.
+
+ Similar fix will be pushed to the upstream repository.
+
+ * Source/webrtc/test/frame_generator_capturer.h:
+
2020-04-01 youenn fablet <youenn@apple.com> and Victor M. Jaquez <vjaquez@igalia.com>
Bump libwebrtc to M82
diff --git a/Source/ThirdParty/libwebrtc/Source/webrtc/test/frame_generator_capturer.h b/Source/ThirdParty/libwebrtc/Source/webrtc/test/frame_generator_capturer.h
index fd376e2..052c3c3 100644
--- a/Source/ThirdParty/libwebrtc/Source/webrtc/test/frame_generator_capturer.h
+++ b/Source/ThirdParty/libwebrtc/Source/webrtc/test/frame_generator_capturer.h
@@ -66,10 +66,10 @@
int framerate = 30;
TimeDelta change_interval = TimeDelta::Seconds(10);
struct Crop {
- TimeDelta scroll_duration = TimeDelta::Seconds(0);
+ TimeDelta scroll_duration;
absl::optional<int> width;
absl::optional<int> height;
- } crop;
+ } crop = { TimeDelta::Seconds(0), { }, { } };
int width = 1850;
int height = 1110;
std::vector<std::string> paths = {
