Skip to content

Commit 7e28c26

Browse files
authored
browser(firefox): do not complain about SnapshotListener being cleared on Destroy (#3298)
1 parent 9ec0267 commit 7e28c26

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

browser_patches/firefox/BUILD_NUMBER

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
1150
2-
Changed: [email protected] Mon Aug 3 19:37:50 PDT 2020
1+
1151
2+
Changed: [email protected] Tue Aug 4 16:50:29 PDT 2020

browser_patches/firefox/patches/bootstrap.diff

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2088,7 +2088,7 @@ index 7f91de9e67d7ffa02de3eef1d760e5cfd05e7ad6..37b0320f3bde99ef7635c71452a3a4b7
20882088

20892089
} // namespace widget
20902090
diff --git a/widget/headless/HeadlessWidget.cpp b/widget/headless/HeadlessWidget.cpp
2091-
index 7589d8a1a886dab5431e423d20f7d0aa19c2af75..b14925a7b6972c120a59f70fbbe70a1145a5cb4e 100644
2091+
index 7589d8a1a886dab5431e423d20f7d0aa19c2af75..05c79e0d5ee58c45a75b55a65423466be11596fa 100644
20922092
--- a/widget/headless/HeadlessWidget.cpp
20932093
+++ b/widget/headless/HeadlessWidget.cpp
20942094
@@ -104,6 +104,8 @@ void HeadlessWidget::Destroy() {
@@ -2100,13 +2100,14 @@ index 7589d8a1a886dab5431e423d20f7d0aa19c2af75..b14925a7b6972c120a59f70fbbe70a11
21002100
nsBaseWidget::OnDestroy();
21012101

21022102
nsBaseWidget::Destroy();
2103-
@@ -499,5 +501,13 @@ nsresult HeadlessWidget::SynthesizeNativeTouchPoint(
2103+
@@ -499,5 +501,14 @@ nsresult HeadlessWidget::SynthesizeNativeTouchPoint(
21042104
return NS_OK;
21052105
}
21062106

21072107
+void HeadlessWidget::SetSnapshotListener(SnapshotListener&& listener) {
21082108
+ if (!mCompositorWidget) {
2109-
+ fprintf(stderr, "Trying to set SnapshotListener without compositor widget\n");
2109+
+ if (listener)
2110+
+ fprintf(stderr, "Trying to set SnapshotListener without compositor widget\n");
21102111
+ return;
21112112
+ }
21122113
+ mCompositorWidget->SetSnapshotListener(std::move(listener));

0 commit comments

Comments
 (0)