Browse Source

More fixes for Winodws gitlab checkin

Frank-Rainer Grahl 4 months ago
parent
commit
1d29b33474

+ 3 - 2
mozilla-release/patches/1559975-25-70a1.patch

@@ -2,7 +2,7 @@
 # User Edwin Gao <egao@mozilla.com>
 # Date 1563299166 0
 # Node ID e2924a3e899dfdb0c161c30bb357962d83228958
-# Parent  60be65b2afb1ba0386f6e9e2231c45ba4fe7f5ae
+# Parent  dfc09441e26f18998dba49593c8f13773a9e57ee
 Bug 1559975 - fix python2 linter errors for testing/runtimes r=ahal
 
 Differential Revision: https://phabricator.services.mozilla.com/D37615
@@ -10,7 +10,8 @@ Differential Revision: https://phabricator.services.mozilla.com/D37615
 diff --git a/testing/runtimes/writeruntimes.py b/testing/runtimes/writeruntimes.py
 --- a/testing/runtimes/writeruntimes.py
 +++ b/testing/runtimes/writeruntimes.py
-@@ -1,8 +1,11 @@
+@@ -1,9 +1,12 @@
+ #!/usr/bin/env python
 +
 +from __future__ import absolute_import, print_function
 +

+ 4 - 4
mozilla-release/patches/1607919-1-74a1.patch

@@ -2,7 +2,7 @@
 # User Nika Layzell <nika@thelayzells.com>
 # Date 1578588738 0
 # Node ID 200910c289b366e8795256c3e3fb8f7804351edc
-# Parent  ab328223896e81eb05b0dadb66a603fea3cc5602
+# Parent  0bdbafd53f40ca7bc8a135cd6f1ea0396e67e679
 Bug 1607919 - Part 1: Add specific descriptions to some sync IPC, r=mccr8
 
 Differential Revision: https://phabricator.services.mozilla.com/D59211
@@ -1173,15 +1173,15 @@ diff --git a/ipc/ipdl/sync-messages.ini b/ipc/ipdl/sync-messages.ini
  description =
  [PContent::KeywordToURI]
  description =
-@@ -1007,8 +1012,13 @@ description =
- [PHandlerService::ExistsForProtocol]
- description = bug 1382323
+@@ -1009,8 +1014,13 @@ description = bug 1382323
  [PHandlerService::Exists]
  description =
  [PHandlerService::GetTypeFromExtension]
  description =
  [PLayerTransaction::ShutdownSync]
  description = bug 1363126
+ [PClientSource::WorkerSyncPing]
+ description = Synchronous ping allowing worker thread to confirm actor is created. Necessary to avoid racing with ClientHandle actors on main thread.
 +
 +#############################################################
 +#          AVOID ADDING NEW MESSAGES TO THIS FILE           #

+ 4 - 3
mozilla-release/patches/1607919-2-74a1.patch

@@ -2,7 +2,7 @@
 # User Nika Layzell <nika@thelayzells.com>
 # Date 1578588745 0
 # Node ID 93f5619b1457b8fab1dbcb1c9708d285e18df7b5
-# Parent  1992cab4be00f808327a973ad2d8f518e6a7092b
+# Parent  2577a55663839f6e33fa01c32a650968c7f0c9ca
 Bug 1607919 - Part 2: Add generic descriptions for remaining sync IPC, r=mccr8
 
 Differential Revision: https://phabricator.services.mozilla.com/D59212
@@ -316,7 +316,7 @@ diff --git a/ipc/ipdl/sync-messages.ini b/ipc/ipdl/sync-messages.ini
  description = test only
  [PWebRenderBridge::GetAnimationTransform]
  description = test only
-@@ -993,32 +993,32 @@ description = test only
+@@ -993,33 +993,33 @@ description = test only
  description = test only
  [PWebRenderBridge::SetAsyncZoom]
  description = test only
@@ -352,8 +352,9 @@ diff --git a/ipc/ipdl/sync-messages.ini b/ipc/ipdl/sync-messages.ini
 +description = legacy sync IPC - please add detailed description
  [PLayerTransaction::ShutdownSync]
  description = bug 1363126
+ [PClientSource::WorkerSyncPing]
+ description = Synchronous ping allowing worker thread to confirm actor is created. Necessary to avoid racing with ClientHandle actors on main thread.
  
  #############################################################
  #          AVOID ADDING NEW MESSAGES TO THIS FILE           #
  #                see comment at top of file                 #
- #############################################################