Merge mozilla-central to fx-team on a CLOSED TREE

dothq · Apr 23, 2015 · 77282f2 · 77282f2
2 parents 7f68adc + bab9dbe
commit 77282f2
Show file tree

Hide file tree

Showing 155 changed files with 5,427 additions and 77,446 deletions.
diff --git a/configure.in b/configure.in
@@ -3017,7 +3017,6 @@ then
     esac
     LDFLAGS="${_PTHREAD_LDFLAGS} ${LDFLAGS}"
     AC_SUBST(MOZ_USE_PTHREADS)
-    MOZ_CHECK_HEADERS(pthread.h)
 fi
 
 

diff --git a/dom/bindings/Bindings.conf b/dom/bindings/Bindings.conf
@@ -262,14 +262,6 @@ DOMInterfaces = {
     'concrete': False
 },
 
-'ChromeUtils': {
-    # The codegen is dumb, and doesn't understand that this interface is only a
-    # collection of static methods, so we have this `concrete: False` hack.
-    'concrete': False,
-    'nativeType': 'mozilla::devtools::ChromeUtils',
-    'implicitJSContext': ['readHeapSnapshot', 'saveHeapSnapshot']
-},
-
 'ChromeWindow': {
     'concrete': False,
 },
@@ -501,10 +493,6 @@ DOMInterfaces = {
     'headerFile': 'nsGeolocation.h'
 },
 
-'HeapSnapshot': {
-    'nativeType': 'mozilla::devtools::HeapSnapshot'
-},
-
 'History': {
     'headerFile': 'nsHistory.h',
     'nativeType': 'nsHistory'

diff --git a/dom/webidl/ChromeUtils.webidl b/dom/webidl/ChromeUtils.webidl
diff --git a/dom/webidl/HeapSnapshot.webidl b/dom/webidl/HeapSnapshot.webidl
diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build
@@ -73,7 +73,6 @@ WEBIDL_FILES = [
     'CharacterData.webidl',
     'ChildNode.webidl',
     'ChromeNotifications.webidl',
-    'ChromeUtils.webidl',
     'Client.webidl',
     'Clients.webidl',
     'ClipboardEvent.webidl',
@@ -158,7 +157,6 @@ WEBIDL_FILES = [
     'GetUserMediaRequest.webidl',
     'HDMIInputPort.webidl',
     'Headers.webidl',
-    'HeapSnapshot.webidl',
     'History.webidl',
     'HTMLAllCollection.webidl',
     'HTMLAnchorElement.webidl',
-Original file line number
+Diff line change
@@ Expand Up / @@ -3017,7 +3017,6 @@ then @@
         esac
         LDFLAGS="${_PTHREAD_LDFLAGS} ${LDFLAGS}"
         AC_SUBST(MOZ_USE_PTHREADS)
-        MOZ_CHECK_HEADERS(pthread.h)
     fi
@@ Expand Down @@