Merge inbound to mozilla-central. a=merge

dothq · Aug 6, 2018 · 9f8ebbd · 9f8ebbd
2 parents de6c35a + aeaf76c
commit 9f8ebbd
Show file tree

Hide file tree

Showing 174 changed files with 746 additions and 208 deletions.
diff --git a/accessible/aom/AccessibleNode.cpp b/accessible/aom/AccessibleNode.cpp
@@ -32,7 +32,8 @@ AccessibleNode::IsAOMEnabled(JSContext* aCx, JSObject* /*unused*/)
   return nsContentUtils::IsSystemCaller(aCx) || sPrefCacheValue;
 }
 
-NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(AccessibleNode, mIntl, mDOMNode, mStates)
+NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(AccessibleNode, mRelationProperties,
+                                      mIntl, mDOMNode, mStates)
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(AccessibleNode)
   NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY

diff --git a/accessible/aom/AccessibleNode.h b/accessible/aom/AccessibleNode.h
@@ -8,6 +8,7 @@
 #define A11Y_AOM_ACCESSIBLENODE_H
 
 #include "nsDataHashtable.h"
+#include "nsRefPtrHashtable.h"
 #include "nsWrapperCache.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
@@ -238,11 +239,7 @@ class AccessibleNode : public nsISupports,
 
   already_AddRefed<AccessibleNode> GetProperty(AOMRelationProperty aProperty)
   {
-    RefPtr<AccessibleNode> data;
-    if (mRelationProperties.Get(static_cast<int>(aProperty), &data)) {
-      return data.forget();
-    }
-    return nullptr;
+    return mRelationProperties.Get(static_cast<int>(aProperty));
   }
 
   void SetProperty(AOMRelationProperty aProperty,
@@ -258,7 +255,7 @@ class AccessibleNode : public nsISupports,
   // The 2k'th bit indicates whether the k'th boolean property is used(1) or not(0)
   // and 2k+1'th bit contains the property's value(1:true, 0:false)
   uint32_t mBooleanProperties;
-  nsDataHashtable<nsUint32HashKey, RefPtr<AccessibleNode> > mRelationProperties;
+  nsRefPtrHashtable<nsUint32HashKey, AccessibleNode> mRelationProperties;
   nsDataHashtable<nsUint32HashKey, nsString> mStringProperties;
 
   RefPtr<a11y::Accessible> mIntl;

diff --git a/accessible/base/moz.build b/accessible/base/moz.build
@@ -114,3 +114,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
     CXXFLAGS += ['-Wno-error=shadow']
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
diff --git a/accessible/generic/moz.build b/accessible/generic/moz.build
@@ -70,3 +70,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
     CXXFLAGS += ['-Wno-error=shadow']
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
diff --git a/accessible/interfaces/ia2/moz.build b/accessible/interfaces/ia2/moz.build
@@ -98,3 +98,6 @@ if CONFIG['CC_TYPE'] == 'clang-cl':
         '-Wno-missing-braces',
         '-Wno-unused-const-variable',
     ]
+
+if CONFIG['MOZ_PGO'] and CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
diff --git a/accessible/interfaces/msaa/moz.build b/accessible/interfaces/msaa/moz.build
@@ -44,3 +44,6 @@ if CONFIG['CC_TYPE'] == 'clang-cl':
         '-Wno-missing-braces',
         '-Wno-unused-const-variable',
     ]
+
+if CONFIG['MOZ_PGO'] and CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
diff --git a/accessible/ipc/moz.build b/accessible/ipc/moz.build
@@ -62,3 +62,6 @@ FINAL_LIBRARY = 'xul'
 
 # Add libFuzzer configuration directives
 include('/tools/fuzzing/libfuzzer-config.mozbuild')
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
diff --git a/accessible/ipc/win/handler/moz.build b/accessible/ipc/win/handler/moz.build
@@ -83,3 +83,5 @@ LIBRARY_DEFINES['_UNICODE'] = True
 LIBRARY_DEFINES['MOZ_NO_MOZALLOC'] = True
 DisableStlWrapping()
 
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
diff --git a/accessible/ipc/win/moz.build b/accessible/ipc/win/moz.build
@@ -55,3 +55,6 @@ if CONFIG['ACCESSIBILITY']:
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
diff --git a/accessible/windows/msaa/moz.build b/accessible/windows/msaa/moz.build
@@ -84,3 +84,6 @@ if CONFIG['CC_TYPE'] == 'clang-cl':
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
diff --git a/accessible/windows/sdn/moz.build b/accessible/windows/sdn/moz.build
@@ -22,3 +22,6 @@ LOCAL_INCLUDES += [
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
diff --git a/accessible/xpcom/moz.build b/accessible/xpcom/moz.build
@@ -64,3 +64,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
     CXXFLAGS += ['-Wno-error=shadow']
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
diff --git a/browser/app/winlauncher/moz.build b/browser/app/winlauncher/moz.build
@@ -25,3 +25,6 @@ TEST_DIRS += [
 ]
 
 DisableStlWrapping()
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
diff --git a/browser/app/winlauncher/test/moz.build b/browser/app/winlauncher/test/moz.build
@@ -15,3 +15,6 @@ LOCAL_INCLUDES += [
 OS_LIBS += [
     'ntdll',
 ]
+
+if CONFIG['CC_TYPE'] == 'clang-cl':
+    AllowCompilerWarnings()  # workaround for bug 1090497
diff --git a/browser/extensions/pdfjs/README.mozilla b/browser/extensions/pdfjs/README.mozilla
@@ -1,5 +1,5 @@
 This is the PDF.js project output, https://github.com/mozilla/pdf.js
 
-Current extension version is: 2.0.719
+Current extension version is: 2.0.750
 
-Taken from upstream commit: 35214245
+Taken from upstream commit: c8ee6331
diff --git a/browser/extensions/pdfjs/content/build/pdf.js b/browser/extensions/pdfjs/content/build/pdf.js
@@ -123,8 +123,8 @@ return /******/ (function(modules) { // webpackBootstrap
 "use strict";
 
 
-var pdfjsVersion = '2.0.719';
-var pdfjsBuild = '35214245';
+var pdfjsVersion = '2.0.750';
+var pdfjsBuild = 'c8ee6331';
 var pdfjsSharedUtil = __w_pdfjs_require__(1);
 var pdfjsDisplayAPI = __w_pdfjs_require__(7);
 var pdfjsDisplayTextLayer = __w_pdfjs_require__(19);
@@ -4223,7 +4223,7 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
   }
   return worker.messageHandler.sendWithPromise('GetDocRequest', {
     docId,
-    apiVersion: '2.0.719',
+    apiVersion: '2.0.750',
     source: {
       data: source.data,
       url: source.url,
@@ -5563,8 +5563,8 @@ var InternalRenderTask = function InternalRenderTaskClosure() {
 }();
 var version, build;
 {
-  exports.version = version = '2.0.719';
-  exports.build = build = '35214245';
+  exports.version = version = '2.0.750';
+  exports.build = build = 'c8ee6331';
 }
 exports.getDocument = getDocument;
 exports.LoopbackPort = LoopbackPort;