Landing requested on , by alwu@mozilla.com.
Revisions:
D247025 diff 1029531
←
D247026 diff 1029532
←
D247027 diff 1029533
←
D247368 diff 1029579
While applying revision D247025 to , the following files had conflicts:
(Hint: try rebasing your changes on the latest commits from and re-submitting.)
- dom/ipc/ContentParent.h @ bf3516e81e1f61953ddd73956fb2c28fd81c35ee
diff a/dom/ipc/ContentParent.h b/dom/ipc/ContentParent.h (rejected hunks)
@@ -1620,10 +1621,14 @@
...
diff a/dom/ipc/ContentParent.h b/dom/ipc/ContentParent.h (rejected hunks)
@@ -1620,10 +1621,14 @@
bool mIsSignaledImpendingShutdown = false;
bool mIsNotifiedShutdownSuccess = false;
nsCOMPtr<nsIThread> mClipboardContentAnalysisThread;
+
+#ifdef MOZ_WMF_CDM
+ RefPtr<nsIOriginsListLoadCallback> mOriginsListCallback;
+#endif
};
NS_DEFINE_STATIC_IID_ACCESSOR(ContentParent, NS_CONTENTPARENT_IID)
// Threadsafe handle object allowing off-main-thread code to get some
Raw error output:
Problem while applying patch in revision 247025:
/tmp/tmpsc1k4lnu.diff:83: trailing whitespace.
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
/tmp/tmpsc1k4lnu.diff:84: trailing whitespace.
# vim: set filetype=python:
/tmp/tmpsc1k4lnu.diff:85: trailing whitespace.
# This Source Code Form is subject to the terms of the Mozilla Public
/tmp/tmpsc1k4lnu.diff:86: trailing whitespace.
# License, v. 2.0. If a copy of the MPL was not distributed with this
/tmp/tmpsc1k4lnu.diff:87: trailing whitespace.
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
Checking patch toolkit/components/moz.build...
Checking patch toolkit/components/media/nsIWindowsMediaFoundationCDMOriginsListService.idl...
Checking patch toolkit/components/media/moz.build...
Checking patch toolkit/components/media/components.conf...
Checking patch toolkit/components/media/WindowsMediaFoundationCDMOriginsListService.sys.mjs...
Checking patch dom/ipc/ContentParent.h...
error: while searching for:
bool mIsSignaledImpendingShutdown = false;
bool mIsNotifiedShutdownSuccess = false;
nsCOMPtr<nsIThread> mClipboardContentAnalysisThread;
};
NS_DEFINE_STATIC_IID_ACCESSOR(ContentParent, NS_CONTENTPARENT_IID)
// Threadsafe handle object allowing off-main-thread code to get some
error: patch failed: dom/ipc/ContentParent.h:1620
Checking patch dom/ipc/ContentParent.cpp...
Applied patch toolkit/components/moz.build cleanly.
Applied patch toolkit/components/media/nsIWindowsMediaFoundationCDMOriginsListService.idl cleanly.
Applied patch toolkit/components/media/moz.build cleanly.
Applied patch toolkit/components/media/components.conf cleanly.
Applied patch toolkit/components/media/WindowsMediaFoundationCDMOriginsListService.sys.mjs cleanly.
Applying patch dom/ipc/ContentParent.h with 1 reject...
Hunk #1 applied cleanly.
Rejected hunk #2.
Applied patch dom/ipc/ContentParent.cpp cleanly.