Merge pull request ricardoquesada#32 from pandamicro/v34

Upgrade to SpiderMonkey v34

Author: ricardoquesada

.gitignore

@@ -51,6 +51,7 @@ js/src/build-osx/*
 js/src/build-linux/*
 !js/src/build-android/build.sh
 !js/src/build-ios/build.sh
+!js/src/build-ios/copy-header.sh
 !js/src/build-win32/build.sh
 !js/src/build-osx/build.sh
 !js/src/build-linux/build.sh

Makefile.in

@@ -200,6 +200,7 @@ MAKE_SYM_STORE_ARGS := -c --vcs-info
 DUMP_SYMS_BIN ?= $(DIST)/host/bin/dump_syms
 MAKE_SYM_STORE_PATH := $(DIST)/bin
 endif
+MAKE_SYM_STORE_ARGS += --install-manifest=$(DEPTH)/_build_manifests/install/dist_include,$(DIST)/include
 
 SYM_STORE_SOURCE_DIRS := $(topsrcdir)
 
@@ -257,19 +258,23 @@ update-packaging:
 
 .PHONY: pretty-package
 pretty-package:
-	$(MAKE) package MOZ_PKG_PRETTYNAMES=1
+	unset MOZ_SIGN_CMD && $(MAKE) package MOZ_PKG_PRETTYNAMES=1
 
 .PHONY: pretty-package-tests
 pretty-package-tests:
-	$(MAKE) package-tests MOZ_PKG_PRETTYNAMES=1
+	unset MOZ_SIGN_CMD && $(MAKE) package-tests MOZ_PKG_PRETTYNAMES=1
 
 .PHONY: pretty-l10n-check
 pretty-l10n-check:
-	$(MAKE) l10n-check MOZ_PKG_PRETTYNAMES=1
+	unset MOZ_SIGN_CMD && $(MAKE) l10n-check MOZ_PKG_PRETTYNAMES=1
 
 .PHONY: pretty-update-packaging
 pretty-update-packaging:
-	$(MAKE) -C tools/update-packaging MOZ_PKG_PRETTYNAMES=1
+	unset MOZ_SIGN_CMD && $(MAKE) -C tools/update-packaging MOZ_PKG_PRETTYNAMES=1
+
+.PHONY: pretty-installer
+pretty-installer:
+	unset MOZ_SIGN_CMD && $(MAKE) installer MOZ_PKG_PRETTYNAMES=1
 
 #XXX: this is a hack, since we don't want to clobber for MSVC
 # PGO support, but we can't do this test in client.mk
@@ -313,6 +318,28 @@ endif
 # Interdependencies for parallel export.
 js/xpconnect/src/export: dom/bindings/export xpcom/xpidl/export
 accessible/xpcom/export: xpcom/xpidl/export
+
+# The widget binding generator code is part of the annotationProcessors.
+widget/android/bindings/export: build/annotationProcessors/export
+
 ifdef ENABLE_CLANG_PLUGIN
-js/src/export config/export: build/clang-plugin/export
+js/src/export config/host: build/clang-plugin/export
+endif
+
+# Interdependencies that moz.build world don't know about yet for compilation.
+# Note some others are hardcoded or "guessed" in recursivemake.py and emitter.py
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk3)
+toolkit/library/target: widget/gtk/mozgtk/gtk3/target
+endif
+ifdef MOZ_LDAP_XPCOM
+ldap/target: config/external/nss/target mozglue/build/target
+toolkit/library/target: ldap/target
+endif
+ifndef MOZ_FOLD_LIBS
+ifndef MOZ_NATIVE_SQLITE
+config/external/nss/target: db/sqlite3/src/target
+endif
+endif
+ifeq ($(MOZ_REPLACE_MALLOC_LINKAGE),dummy library)
+mozglue/build/target: memory/replace/dummy/target
 endif

accessible/atk/Makefile.in

@@ -41,3 +41,10 @@ LOCAL_INCLUDES += [
 ]
 
 FINAL_LIBRARY = 'xul'
+
+if CONFIG['MOZ_ENABLE_GTK']:
+    CFLAGS += CONFIG['TK_CFLAGS']
+    CXXFLAGS += CONFIG['TK_CFLAGS']
+
+if CONFIG['MOZ_ENABLE_DBUS']:
+    CXXFLAGS += CONFIG['MOZ_DBUS_CFLAGS']

accessible/atk/moz.build

@@ -122,9 +122,10 @@ static nsRoleMapEntry sWAIRoleMaps[] =
     eOpenCloseAction,
     eNoLiveAttr,
     kGenericAccType,
-    states::COLLAPSED | states::HASPOPUP,
+    states::COLLAPSED | states::HASPOPUP | states::VERTICAL,
     eARIAAutoComplete,
-    eARIAReadonly
+    eARIAReadonly,
+    eARIAOrientation
   },
   { // dialog
     &nsGkAtoms::dialog,
@@ -261,10 +262,11 @@ static nsRoleMapEntry sWAIRoleMaps[] =
     eNoAction,
     eNoLiveAttr,
     eListControl | eSelect,
-    kNoReqStates,
+    states::VERTICAL,
     eARIAMultiSelectable,
     eARIAReadonly,
-    eFocusableUntilDisabled
+    eFocusableUntilDisabled,
+    eARIAOrientation
   },
   { // listitem
     &nsGkAtoms::listitem,
@@ -315,7 +317,8 @@ static nsRoleMapEntry sWAIRoleMaps[] =
                // any action, but menu can be open or close.
     eNoLiveAttr,
     kGenericAccType,
-    kNoReqStates
+    states::VERTICAL,
+    eARIAOrientation
   },
   { // menubar
     &nsGkAtoms::menubar,
@@ -325,7 +328,8 @@ static nsRoleMapEntry sWAIRoleMaps[] =
     eNoAction,
     eNoLiveAttr,
     kGenericAccType,
-    kNoReqStates
+    states::HORIZONTAL,
+    eARIAOrientation
   },
   { // menuitem
     &nsGkAtoms::menuitem,
@@ -422,7 +426,8 @@ static nsRoleMapEntry sWAIRoleMaps[] =
     eNoAction,
     eNoLiveAttr,
     kGenericAccType,
-    kNoReqStates
+    kNoReqStates,
+    eARIAOrientation
   },
   { // region
     &nsGkAtoms::region,
@@ -475,7 +480,7 @@ static nsRoleMapEntry sWAIRoleMaps[] =
     eNoAction,
     eNoLiveAttr,
     kGenericAccType,
-    kNoReqStates,
+    states::VERTICAL,
     eARIAOrientation,
     eARIAReadonly
   },
@@ -487,7 +492,7 @@ static nsRoleMapEntry sWAIRoleMaps[] =
     eNoAction,
     eNoLiveAttr,
     kGenericAccType,
-    kNoReqStates,
+    states::HORIZONTAL,
     eARIAOrientation
   },
   { // slider
@@ -498,7 +503,7 @@ static nsRoleMapEntry sWAIRoleMaps[] =
     eNoAction,
     eNoLiveAttr,
     kGenericAccType,
-    kNoReqStates,
+    states::HORIZONTAL,
     eARIAOrientation,
     eARIAReadonly
   },
@@ -542,7 +547,8 @@ static nsRoleMapEntry sWAIRoleMaps[] =
     eNoAction,
     eNoLiveAttr,
     eSelect,
-    kNoReqStates
+    states::HORIZONTAL,
+    eARIAOrientation
   },
   { // tabpanel
     &nsGkAtoms::tabpanel,
@@ -584,7 +590,8 @@ static nsRoleMapEntry sWAIRoleMaps[] =
     eNoAction,
     eNoLiveAttr,
     kGenericAccType,
-    kNoReqStates
+    states::HORIZONTAL,
+    eARIAOrientation
   },
   { // tooltip
     &nsGkAtoms::tooltip,
@@ -604,10 +611,11 @@ static nsRoleMapEntry sWAIRoleMaps[] =
     eNoAction,
     eNoLiveAttr,
     eSelect,
-    kNoReqStates,
+    states::VERTICAL,
     eARIAReadonly,
     eARIAMultiSelectable,
-    eFocusableUntilDisabled
+    eFocusableUntilDisabled,
+    eARIAOrientation
   },
   { // treegrid
     &nsGkAtoms::treegrid,
@@ -617,10 +625,11 @@ static nsRoleMapEntry sWAIRoleMaps[] =
     eNoAction,
     eNoLiveAttr,
     eSelect | eTable,
-    kNoReqStates,
+    states::VERTICAL,
     eARIAReadonlyOrEditable,
     eARIAMultiSelectable,
-    eFocusableUntilDisabled
+    eFocusableUntilDisabled,
+    eARIAOrientation
   },
   { // treeitem
     &nsGkAtoms::treeitem,

accessible/base/ARIAMap.cpp

@@ -180,6 +180,7 @@ struct nsRoleMapEntry
   mozilla::a11y::aria::EStateRule attributeMap1;
   mozilla::a11y::aria::EStateRule attributeMap2;
   mozilla::a11y::aria::EStateRule attributeMap3;
+  mozilla::a11y::aria::EStateRule attributeMap4;
 };
 
 

accessible/base/ARIAMap.h

@@ -19,39 +19,18 @@ using namespace mozilla::a11y::aria;
  */
 struct EnumTypeData
 {
-  EnumTypeData(nsIAtom* aAttrName,
-               nsIAtom** aValue1, uint64_t aState1,
-               nsIAtom** aValue2, uint64_t aState2,
-               nsIAtom** aValue3 = 0, uint64_t aState3 = 0) :
-    mState1(aState1), mState2(aState2), mState3(aState3), mDefaultState(0),
-    mAttrName(aAttrName), mValue1(aValue1), mValue2(aValue2), mValue3(aValue3),
-    mNullValue(nullptr)
-  { }
-
-  EnumTypeData(nsIAtom* aAttrName, uint64_t aDefaultState,
-               nsIAtom** aValue1, uint64_t aState1) :
-    mState1(aState1), mState2(0), mState3(0), mDefaultState(aDefaultState),
-    mAttrName(aAttrName), mValue1(aValue1), mValue2(nullptr), mValue3(nullptr),
-    mNullValue(nullptr)
-  { }
-
-  // States applied if corresponding enum values are matched.
-  const uint64_t mState1;
-  const uint64_t mState2;
-  const uint64_t mState3;
-
-  // Default state if no one enum value is matched.
-  const uint64_t mDefaultState;
-
   // ARIA attribute name.
   nsIAtom* const mAttrName;
 
   // States if the attribute value is matched to the enum value. Used as
-  // nsIContent::AttrValuesArray.
-  nsIAtom* const* const mValue1;
-  nsIAtom* const* const mValue2;
-  nsIAtom* const* const mValue3;
-  nsIAtom* const* const mNullValue;
+  // nsIContent::AttrValuesArray, last item must be nullptr.
+  nsIAtom* const* const mValues[4];
+
+  // States applied if corresponding enum values are matched.
+  const uint64_t mStates[3];
+
+  // States to clear in case of match.
+  const uint64_t mClearState;
 };
 
 enum ETokenType
@@ -108,22 +87,29 @@ aria::MapToState(EStateRule aRule, dom::Element* aElement, uint64_t* aState)
   switch (aRule) {
     case eARIAAutoComplete:
     {
-      static const EnumTypeData data(
+      static const EnumTypeData data = {
         nsGkAtoms::aria_autocomplete,
-        &nsGkAtoms::inlinevalue, states::SUPPORTS_AUTOCOMPLETION,
-        &nsGkAtoms::list, states::HASPOPUP | states::SUPPORTS_AUTOCOMPLETION,
-        &nsGkAtoms::both, states::HASPOPUP | states::SUPPORTS_AUTOCOMPLETION);
+        { &nsGkAtoms::inlinevalue,
+          &nsGkAtoms::list,
+          &nsGkAtoms::both, nullptr },
+        { states::SUPPORTS_AUTOCOMPLETION,
+          states::HASPOPUP | states::SUPPORTS_AUTOCOMPLETION,
+          states::HASPOPUP | states::SUPPORTS_AUTOCOMPLETION }, 0
+      };
 
       MapEnumType(aElement, aState, data);
       return true;
     }
 
     case eARIABusy:
     {
-      static const EnumTypeData data(
+      static const EnumTypeData data = {
         nsGkAtoms::aria_busy,
-        &nsGkAtoms::_true, states::BUSY,
-        &nsGkAtoms::error, states::INVALID);
+        { &nsGkAtoms::_true,
+          &nsGkAtoms::error, nullptr },
+        { states::BUSY,
+          states::INVALID }, 0
+      };
 
       MapEnumType(aElement, aState, data);
       return true;
@@ -221,23 +207,16 @@ aria::MapToState(EStateRule aRule, dom::Element* aElement, uint64_t* aState)
 
     case eARIAOrientation:
     {
-      if (aElement->AttrValueIs(kNameSpaceID_None, nsGkAtoms::aria_orientation,
-                                NS_LITERAL_STRING("horizontal"), eCaseMatters)) {
-        *aState &= ~states::VERTICAL;
-        *aState |= states::HORIZONTAL;
-      } else if (aElement->AttrValueIs(kNameSpaceID_None,
-                                       nsGkAtoms::aria_orientation,
-                                       NS_LITERAL_STRING("vertical"),
-                                       eCaseMatters)) {
-        *aState &= ~states::HORIZONTAL;
-        *aState |= states::VERTICAL;
-      } else {
-        NS_ASSERTION(!(*aState & (states::HORIZONTAL | states::VERTICAL)),
-                     "orientation state on role with default aria-orientation!");
-        *aState |= GetRoleMap(aElement)->Is(nsGkAtoms::scrollbar) ?
-          states::VERTICAL : states::HORIZONTAL;
-      }
+      static const EnumTypeData data = {
+        nsGkAtoms::aria_orientation,
+        { &nsGkAtoms::horizontal,
+          &nsGkAtoms::vertical, nullptr },
+        { states::HORIZONTAL,
+          states::VERTICAL },
+        states::HORIZONTAL | states::VERTICAL
+      };
 
+      MapEnumType(aElement, aState, data);
       return true;
     }
 
@@ -347,19 +326,17 @@ static void
 MapEnumType(dom::Element* aElement, uint64_t* aState, const EnumTypeData& aData)
 {
   switch (aElement->FindAttrValueIn(kNameSpaceID_None, aData.mAttrName,
-                                    &aData.mValue1, eCaseMatters)) {
+                                    aData.mValues, eCaseMatters)) {
     case 0:
-      *aState |= aData.mState1;
+      *aState = (*aState & ~aData.mClearState) | aData.mStates[0];
       return;
     case 1:
-      *aState |= aData.mState2;
+      *aState = (*aState & ~aData.mClearState) | aData.mStates[1];
       return;
     case 2:
-      *aState |= aData.mState3;
+      *aState = (*aState & ~aData.mClearState) | aData.mStates[2];
       return;
   }
-
-  *aState |= aData.mDefaultState;
 }
 
 static void

accessible/base/ARIAStateMap.cpp

@@ -71,7 +71,7 @@ class AccCollector
  * Collect embedded objects. Provide quick access to accessible by index and
  * vice versa.
  */
-class EmbeddedObjCollector : public AccCollector
+class EmbeddedObjCollector MOZ_FINAL : public AccCollector
 {
 public:
   virtual ~EmbeddedObjCollector() { }