Skip to content

Commit 99b98d6

Browse files
authored
browser(webkit): do not spam stderr with screencast debug logs (#4635)
1 parent 1060fce commit 99b98d6

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

browser_patches/webkit/BUILD_NUMBER

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
1399
2-
Changed: [email protected] Mon Dec 7 10:04:55 PST 2020
1+
1400
2+
Changed: [email protected] Tue Dec 8 09:46:55 PST 2020

browser_patches/webkit/patches/bootstrap.diff

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9818,10 +9818,10 @@ index 0000000000000000000000000000000000000000..0d4a837cbb0bbba71e32ed083a4c4cfe
98189818
+} // namespace WebKit
98199819
diff --git a/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.cpp b/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.cpp
98209820
new file mode 100644
9821-
index 0000000000000000000000000000000000000000..bc0bca0fcd5fe15d6ace9acb6bd21045633dc0de
9821+
index 0000000000000000000000000000000000000000..eca2c4cd9c8d312ad519e312c99f0b0a2435c9eb
98229822
--- /dev/null
98239823
+++ b/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.cpp
9824-
@@ -0,0 +1,394 @@
9824+
@@ -0,0 +1,393 @@
98259825
+/*
98269826
+ * Copyright (c) 2010, The WebM Project authors. All rights reserved.
98279827
+ * Copyright (c) 2013 The Chromium Authors. All rights reserved.
@@ -10048,9 +10048,8 @@ index 0000000000000000000000000000000000000000..bc0bca0fcd5fe15d6ace9acb6bd21045
1004810048
+ fprintf(stderr, "Failed to write compressed frame\n");
1004910049
+ return false;
1005010050
+ }
10051-
+ bool keyframe = (pkt->data.frame.flags & VPX_FRAME_IS_KEY) != 0;
1005210051
+ ++m_frameCount;
10053-
+ fprintf(stderr, " #%03d %spts=%" PRId64 " sz=%zd\n", m_frameCount, keyframe ? "[K] " : "", pkt->data.frame.pts, pkt->data.frame.sz);
10052+
+ // fprintf(stderr, " #%03d %spts=%" PRId64 " sz=%zd\n", m_frameCount, (pkt->data.frame.flags & VPX_FRAME_IS_KEY) != 0 ? "[K] " : "", pkt->data.frame.pts, pkt->data.frame.sz);
1005410053
+ m_pts += pkt->data.frame.duration;
1005510054
+ }
1005610055
+ }
@@ -10066,7 +10065,7 @@ index 0000000000000000000000000000000000000000..bc0bca0fcd5fe15d6ace9acb6bd21045
1006610065
+
1006710066
+ m_writer->finish();
1006810067
+ fclose(m_file);
10069-
+ fprintf(stderr, "ScreencastEncoder::finish %d frames\n", m_frameCount);
10068+
+ // fprintf(stderr, "ScreencastEncoder::finish %d frames\n", m_frameCount);
1007010069
+ }
1007110070
+
1007210071
+ Ref<WorkQueue> m_encoderQueue;
@@ -10132,7 +10131,7 @@ index 0000000000000000000000000000000000000000..bc0bca0fcd5fe15d6ace9acb6bd21045
1013210131
+ }
1013310132
+
1013410133
+ std::unique_ptr<VPXCodec> vpxCodec(new VPXCodec(codec, cfg, file));
10135-
+ fprintf(stderr, "ScreencastEncoder initialized with: %s\n", vpx_codec_iface_name(codec_interface));
10134+
+ // fprintf(stderr, "ScreencastEncoder initialized with: %s\n", vpx_codec_iface_name(codec_interface));
1013610135
+ return adoptRef(new ScreencastEncoder(WTFMove(vpxCodec), size, scale));
1013710136
+}
1013810137
+
@@ -10154,12 +10153,12 @@ index 0000000000000000000000000000000000000000..bc0bca0fcd5fe15d6ace9acb6bd21045
1015410153
+#if USE(CAIRO)
1015510154
+void ScreencastEncoder::encodeFrame(cairo_surface_t* drawingAreaSurface, IntSize size)
1015610155
+{
10157-
+ fprintf(stderr, "ScreencastEncoder::encodeFrame\n");
10156+
+ // fprintf(stderr, "ScreencastEncoder::encodeFrame\n");
1015810157
+ flushLastFrame();
1015910158
+ // Note that in WPE drawing area size is updated asynchronously and may differ from acutal
1016010159
+ // size of the surface.
1016110160
+ if (size.isZero()) {
10162-
+ fprintf(stderr, "Cairo surface size is 0\n");
10161+
+ // fprintf(stderr, "Cairo surface size is 0\n");
1016310162
+ return;
1016410163
+ }
1016510164
+
@@ -10192,7 +10191,7 @@ index 0000000000000000000000000000000000000000..bc0bca0fcd5fe15d6ace9acb6bd21045
1019210191
+#elif PLATFORM(MAC)
1019310192
+void ScreencastEncoder::encodeFrame(RetainPtr<CGImageRef>&& windowImage)
1019410193
+{
10195-
+ fprintf(stderr, "ScreencastEncoder::encodeFrame\n");
10194+
+ // fprintf(stderr, "ScreencastEncoder::encodeFrame\n");
1019610195
+ flushLastFrame();
1019710196
+
1019810197
+ m_lastFrame = makeUnique<VPXFrame>(WTFMove(windowImage), m_scale, m_offsetTop);

0 commit comments

Comments
 (0)