From dd0eb4d9d89c3b796044c7fac8397c8713c5cdeb Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Fri, 25 May 2018 12:50:35 +0200 Subject: Enable Wayland backend --- mozilla-1461306.patch | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 mozilla-1461306.patch (limited to 'mozilla-1461306.patch') diff --git a/mozilla-1461306.patch b/mozilla-1461306.patch new file mode 100644 index 0000000..84ee6c6 --- /dev/null +++ b/mozilla-1461306.patch @@ -0,0 +1,33 @@ + +# HG changeset patch +# User Martin Stransky +# Date 1526299286 -7200 +# Node ID 6495ae9d01e06109539413c538fd25ed942f6eb8 +# Parent 67553a1262de53d0ec85fdfcf1a2b55631eaca44 +Bug 1461306 - [Wayland] Don't use sizeof() to get mime type array size, r=jhorak + +MozReview-Commit-ID: GE5helkqoUt + +diff --git a/widget/gtk/nsClipboardWayland.cpp b/widget/gtk/nsClipboardWayland.cpp +--- a/widget/gtk/nsClipboardWayland.cpp ++++ b/widget/gtk/nsClipboardWayland.cpp +@@ -723,17 +723,17 @@ const char* + nsRetrievalContextWayland::GetClipboardText(int32_t aWhichClipboard) + { + GdkAtom selection = GetSelectionAtom(aWhichClipboard); + DataOffer* dataOffer = (selection == GDK_SELECTION_PRIMARY) ? + mPrimaryOffer : mClipboardOffer; + if (!dataOffer) + return nullptr; + +- for (unsigned int i = 0; i < sizeof(sTextMimeTypes); i++) { ++ for (unsigned int i = 0; i < TEXT_MIME_TYPES_NUM; i++) { + if (dataOffer->HasTarget(sTextMimeTypes[i])) { + uint32_t unused; + return GetClipboardData(sTextMimeTypes[i], aWhichClipboard, + &unused); + } + } + return nullptr; + } + -- cgit