Merge inbound to mozilla-central. a=merge
authorshindli <shindli@mozilla.com>
Tue, 25 Dec 2018 23:59:00 +0200
changeset 509024 1ff40219367b
parent 509014 21d8c62ee69e (current diff)
parent 509023 680af67bb1e2 (diff)
child 509025 59cdd33a1ddf
push id10547
push userffxbld-merge
push dateMon, 21 Jan 2019 13:03:58 +0000
treeherdermozilla-beta@24ec1916bffe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone66.0a1
first release with
nightly linux32
1ff40219367b / 66.0a1 / 20181225215930 / files
nightly linux64
1ff40219367b / 66.0a1 / 20181225215930 / files
nightly mac
1ff40219367b / 66.0a1 / 20181225215930 / files
nightly win32
1ff40219367b / 66.0a1 / 20181225215930 / files
nightly win64
1ff40219367b / 66.0a1 / 20181225215930 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge inbound to mozilla-central. a=merge
--- a/accessible/ipc/win/HandlerProvider.cpp
+++ b/accessible/ipc/win/HandlerProvider.cpp
@@ -1,16 +1,14 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#define INITGUID
-
 #include "mozilla/a11y/HandlerProvider.h"
 
 #include "Accessible2_3.h"
 #include "AccessibleDocument.h"
 #include "AccessibleRelation.h"
 #include "AccessibleTable.h"
 #include "AccessibleTable2.h"
 #include "AccessibleTableCell.h"
--- a/accessible/ipc/win/handler/AccessibleHandler.cpp
+++ b/accessible/ipc/win/handler/AccessibleHandler.cpp
@@ -3,18 +3,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #if defined(MOZILLA_INTERNAL_API)
 #error This code is NOT for internal Gecko use!
 #endif  // defined(MOZILLA_INTERNAL_API)
 
-#define INITGUID
-
 #include "AccessibleHandler.h"
 #include "AccessibleHandlerControl.h"
 #include "HandlerChildEnumerator.h"
 #include "HandlerRelation.h"
 
 #include "Factory.h"
 #include "HandlerData.h"
 #include "mozilla/ArrayUtils.h"
--- a/accessible/ipc/win/handler/AccessibleHandler.h
+++ b/accessible/ipc/win/handler/AccessibleHandler.h
@@ -17,17 +17,17 @@
 #define __GENIFACE(base) I##base
 #define INTERFACEFOR(base) __GENIFACE(base)
 #define NEWEST_IA2_INTERFACE INTERFACEFOR(NEWEST_IA2_BASENAME)
 
 #define __GENIID(iface) IID_##iface
 #define IIDFOR(iface) __GENIID(iface)
 #define NEWEST_IA2_IID IIDFOR(NEWEST_IA2_INTERFACE)
 
-#if defined(__midl)
+#if defined(__midl) || defined(__WIDL__)
 
 import NEWEST_IA2_IDL;
 
 #else
 
 #include "HandlerData.h"
 
 #include <windows.h>
--- a/accessible/ipc/win/handler/HandlerData.idl
+++ b/accessible/ipc/win/handler/HandlerData.idl
@@ -3,17 +3,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla-config.h"
 #include "AccessibleHandler.h"
 
 import "ocidl.idl";
-import "ServProv.idl";
+import "servprov.idl";
 
 import "Accessible2_3.idl";
 import "AccessibleHypertext2.idl";
 import "AccessibleHyperlink.idl";
 import "AccessibleTable.idl";
 import "AccessibleTable2.idl";
 import "AccessibleTableCell.idl";
 
@@ -180,16 +180,18 @@ interface IGeckoBackChannel : IUnknown
   [propget] HRESULT AllChildren(
     [out, size_is(,*aNChildren)] AccChildData** aChildren,
     [out] ULONG* aNChildren);
 }
 
 [uuid(1e545f07-f108-4912-9471-546827a80983)]
 library AccessibleHandlerTypeLib
 {
+  importlib("stdole2.tlb");
+
   /**
    * This definition is required in order for the handler implementation to
    * support IDispatch (aka Automation). This is used by interpreted language
    * FFIs to discover which interfaces may be controlled via IDispatch.
    * (In particular, the python FFI used by NVDA needs this).
    *
    * In reality, the only a11y interface that is Automation compliant is
    * IAccessible; our remaining interfaces are not.
--- a/accessible/windows/msaa/NtUndoc.h
+++ b/accessible/windows/msaa/NtUndoc.h
@@ -39,21 +39,23 @@ struct SYSTEM_HANDLE_TABLE_ENTRY_INFO_EX
 };
 
 struct SYSTEM_HANDLE_INFORMATION_EX {
   ULONG_PTR mHandleCount;
   ULONG_PTR mReserved;
   SYSTEM_HANDLE_TABLE_ENTRY_INFO_EX mHandles[1];
 };
 
+#ifndef __MINGW32__
 enum UndocObjectInformationClass { ObjectNameInformation = 1 };
 
 struct OBJECT_NAME_INFORMATION {
   UNICODE_STRING mName;
 };
+#endif
 
 // The following declarations are documented on MSDN but are not included in
 // public user-mode headers.
 
 enum DirectoryObjectAccessFlags {
   DIRECTORY_QUERY = 0x0001,
   DIRECTORY_TRAVERSE = 0x0002,
   DIRECTORY_CREATE_OBJECT = 0x0004,
--- a/browser/components/preferences/in-content/tests/siteData/browser.ini
+++ b/browser/components/preferences/in-content/tests/siteData/browser.ini
@@ -4,12 +4,12 @@ support-files =
   site_data_test.html
   service_worker_test.html
   service_worker_test.js
   offline/offline.html
   offline/manifest.appcache
 
 [browser_clearSiteData.js]
 [browser_siteData.js]
-skip-if = (os == 'linux' && debug) || verify # Bug 1439332 and bug 1436395
+skip-if = (os == 'linux') || (os == 'mac' && !debug) || verify # Bug 1439332, Bug 1436395, Bug 1415037
 [browser_siteData2.js]
 [browser_siteData3.js]
 [browser_siteData_multi_select.js]
--- a/dom/indexedDB/test/mochitest.ini
+++ b/dom/indexedDB/test/mochitest.ini
@@ -251,16 +251,17 @@ skip-if = verify
 [test_setVersion_exclusion.html]
 [test_setVersion_throw.html]
 [test_storage_manager_estimate.html]
 scheme=https
 [test_success_events_after_abort.html]
 [test_table_locks.html]
 [test_table_rollback.html]
 [test_third_party.html]
+skip-if = (os == 'android' && debug) # Bug 1311590
 [test_traffic_jam.html]
 [test_transaction_abort.html]
 [test_transaction_abort_hang.html]
 [test_transaction_duplicate_store_names.html]
 [test_transaction_error.html]
 [test_transaction_lifetimes.html]
 [test_transaction_lifetimes_nested.html]
 [test_transaction_ordering.html]
--- a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-position-svg-001e.html.ini
+++ b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-position-svg-001e.html.ini
@@ -1,2 +1,4 @@
 [object-position-svg-001e.html]
+  disabled:
+    if webrender: bug 1515492
   expected: FAIL
--- a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-position-svg-002e.html.ini
+++ b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-position-svg-002e.html.ini
@@ -1,2 +1,4 @@
 [object-position-svg-002e.html]
+  disabled:
+    if webrender: bug 1491264
   expected: FAIL
--- a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-position-svg-002o.html.ini
+++ b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-position-svg-002o.html.ini
@@ -1,2 +1,4 @@
 [object-position-svg-002o.html]
+  disabled:
+    if webrender: bug 1491163
   expected: FAIL
--- a/testing/web-platform/meta/fetch/range/sw.https.window.js.ini
+++ b/testing/web-platform/meta/fetch/range/sw.https.window.js.ini
@@ -1,9 +1,12 @@
 [sw.https.window.html]
+  disabled:
+    if asan and (os == "linux") and (bits == 64): https://bugzilla.mozilla.org/show_bug.cgi?id=1509373
+
   [Ranged response not allowed following no-cors ranged request]
     expected: FAIL
 
   [Non-opaque ranged response executed]
     expected: FAIL
 
   [Range headers correctly preserved]
     expected: FAIL