Merge mozilla-central and mozilla-inbound

accessible/src/msaa/nsAccessibleWrap.cpp

@@ -1589,11 +1589,10 @@ nsAccessibleWrap::FirePlatformEvent(AccEvent* aEvent)
   NotifyWinEvent(winEvent, hWnd, OBJID_CLIENT, childID);
 
   // JAWS announces collapsed combobox navigation based on focus events.
-  if (nsWinUtils::IsWindowEmulationFor(kJAWSModuleHandle)) {
-    if (eventType == nsIAccessibleEvent::EVENT_SELECTION &&
-      accessible->Role() == nsIAccessibleRole::ROLE_COMBOBOX_OPTION) {
-      NotifyWinEvent(EVENT_OBJECT_FOCUS, hWnd, OBJID_CLIENT, childID);
-    }
+  if (eventType == nsIAccessibleEvent::EVENT_SELECTION &&
+      accessible->Role() == nsIAccessibleRole::ROLE_COMBOBOX_OPTION &&
+      nsWinUtils::IsWindowEmulationFor(kJAWSModuleHandle)) {
+    NotifyWinEvent(EVENT_OBJECT_FOCUS, hWnd, OBJID_CLIENT, childID);
   }
   return NS_OK;
 }

browser/config/mozconfigs/linux32/debug

@@ -1,8 +1,8 @@
 ac_add_options --enable-debug
 ac_add_options --enable-trace-malloc
 
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
+CC=/tools/gcc-4.5-0moz2/bin/gcc
+CXX=/tools/gcc-4.5-0moz2/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 

browser/config/mozconfigs/linux32/l10n-mozconfig

@@ -3,5 +3,5 @@ ac_add_options --enable-official-branding
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 
-CC=/tools/gcc-4.3.3/installed/bin/gcc
-CXX=/tools/gcc-4.3.3/installed/bin/g++
+CC=/tools/gcc-4.5-0moz2/bin/gcc
+CXX=/tools/gcc-4.5-0moz2/bin/g++

browser/config/mozconfigs/linux32/nightly

@@ -5,8 +5,8 @@ ac_add_options --enable-codesighs
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
+CC=/tools/gcc-4.5-0moz2/bin/gcc
+CXX=/tools/gcc-4.5-0moz2/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 

browser/config/mozconfigs/linux32/qt

@@ -1,8 +1,8 @@
 ac_add_options --enable-update-packaging
 ac_add_options --enable-codesighs
 
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
+CC=/tools/gcc-4.5-0moz2/bin/gcc
+CXX=/tools/gcc-4.5-0moz2/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 

browser/config/mozconfigs/linux32/release

@@ -2,8 +2,8 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-official-branding
 
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
+CC=/tools/gcc-4.5-0moz2/bin/gcc
+CXX=/tools/gcc-4.5-0moz2/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 

browser/config/mozconfigs/linux32/rpm

@@ -9,8 +9,8 @@ ac_add_options --disable-updater
 ac_add_options --prefix=$PREFIX
 ac_add_options --libdir=$LIBDIR
 
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
+CC=/tools/gcc-4.5-0moz2/bin/gcc
+CXX=/tools/gcc-4.5-0moz2/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 

browser/config/mozconfigs/linux64/debug

@@ -1,8 +1,8 @@
 ac_add_options --enable-debug
 ac_add_options --enable-trace-malloc
 
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
+CC=/tools/gcc-4.5-0moz2/bin/gcc
+CXX=/tools/gcc-4.5-0moz2/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 

browser/config/mozconfigs/linux64/l10n-mozconfig

@@ -3,5 +3,5 @@ ac_add_options --enable-official-branding
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 
-CC=/tools/gcc/bin/gcc
-CXX=/tools/gcc/bin/g++
+CC=/tools/gcc-4.5-0moz2/bin/gcc
+CXX=/tools/gcc-4.5-0moz2/bin/g++

browser/config/mozconfigs/linux64/nightly

@@ -5,8 +5,8 @@ ac_add_options --enable-codesighs
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
+CC=/tools/gcc-4.5-0moz2/bin/gcc
+CXX=/tools/gcc-4.5-0moz2/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 

browser/config/mozconfigs/linux64/release

@@ -2,8 +2,8 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-official-branding
 
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
+CC=/tools/gcc-4.5-0moz2/bin/gcc
+CXX=/tools/gcc-4.5-0moz2/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 

browser/config/mozconfigs/linux64/rpm

@@ -9,8 +9,8 @@ ac_add_options --disable-updater
 ac_add_options --prefix=$PREFIX
 ac_add_options --libdir=$LIBDIR
 
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
+CC=/tools/gcc-4.5-0moz2/bin/gcc
+CXX=/tools/gcc-4.5-0moz2/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 

js/src/gc/Barrier.h

@@ -335,7 +335,7 @@ class HeapValue
     bool toBoolean() const { return value.toBoolean(); }
     double toNumber() const { return value.toNumber(); }
 
-    unsigned gcKind() const { return value.gcKind(); }
+    JSGCTraceKind gcKind() const { return value.gcKind(); }
 
     inline void boxNonDoubleFrom(JSValueType type, uint64 *out);
 

mobile/xul/chrome/content/browser.js

@@ -2683,6 +2683,7 @@ var ActivityObserver = {
   _inBackground : false,
   _notActive : false,
   _isDisplayOff : false,
+  _timeoutID: 0,
   observe: function ao_observe(aSubject, aTopic, aData) {
     if (aTopic == "application-background") {
       this._inBackground = true;
@@ -2698,11 +2699,13 @@ var ActivityObserver = {
       this._isDisplayOff = true;
     }
     let activeTabState = !this._inBackground && !this._notActive && !this._isDisplayOff;
+    if (this._timeoutID)
+      clearTimeout(this._timeoutID);
     if (Browser.selectedTab.active != activeTabState) {
       // On Maemo all backgrounded applications getting portrait orientation
       // so if browser had landscape mode then we need timeout in order
       // to finish last rotate/paint operation and have nice lookine browser in TS
-      setTimeout(function() { Browser.selectedTab.active = activeTabState; }, activeTabState ? 0 : kSetInactiveStateTimeout);
+      this._timeoutID = setTimeout(function() { Browser.selectedTab.active = activeTabState; }, activeTabState ? 0 : kSetInactiveStateTimeout);
     }
   }
 };

mobile/xul/config/mozconfigs/linux-desktop/nightly

@@ -4,8 +4,8 @@ ac_add_options --enable-application=mobile
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
+CC=/tools/gcc-4.5-0moz2/bin/gcc
+CXX=/tools/gcc-4.5-0moz2/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 

xulrunner/config/mozconfigs/linux32/xulrunner

@@ -4,8 +4,8 @@ export JAVA_HOME=/tools/jdk
 ac_add_options --enable-application=xulrunner
 ac_add_options --disable-tests
 
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
+CC=/tools/gcc-4.5-0moz2/bin/gcc
+CXX=/tools/gcc-4.5-0moz2/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 

xulrunner/config/mozconfigs/linux32/xulrunner-qt

@@ -4,8 +4,8 @@ export JAVA_HOME=/tools/jdk
 ac_add_options --enable-application=xulrunner
 ac_add_options --disable-tests
 
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
+CC=/tools/gcc-4.5-0moz2/bin/gcc
+CXX=/tools/gcc-4.5-0moz2/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 

xulrunner/config/mozconfigs/linux64/xulrunner

@@ -4,8 +4,8 @@ export JAVA_HOME=/tools/jdk
 ac_add_options --enable-application=xulrunner
 ac_add_options --disable-tests
 
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
+CC=/tools/gcc-4.5-0moz2/bin/gcc
+CXX=/tools/gcc-4.5-0moz2/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat