merge mozilla-inbound to mozilla-central. r=merge a=merge
authorSebastian Hengst <archaeopteryx@coole-files.de>
Fri, 15 Sep 2017 21:33:32 +0200
changeset 430709 6be5c7d30d2def62a762ac187252eba626b23a92
parent 430708 5b39f8dcc5cd6a38fe99564a9cfc90eedfad1639 (current diff)
parent 430675 ee4c8b6d9a083e24a6f902e9f3b3621561ab9451 (diff)
child 430710 437eae179c71eb3fcb1af49a48b4e315d6a47ab5
child 430769 c99a1520c7a5af8f3769d3a4fce38697ce47cbb2
child 430771 7bd452a934baa2c1f907bb7d5846aba51242afbc
push id7768
push userryanvm@gmail.com
push dateSat, 16 Sep 2017 16:13:49 +0000
treeherdermozilla-beta@3b375d85383a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge, merge
milestone57.0a1
first release with
nightly linux32
6be5c7d30d2d / 57.0a1 / 20170915220136 / files
nightly linux64
6be5c7d30d2d / 57.0a1 / 20170915220136 / files
nightly mac
6be5c7d30d2d / 57.0a1 / 20170915220136 / files
nightly win32
6be5c7d30d2d / 57.0a1 / 20170915220136 / files
nightly win64
6be5c7d30d2d / 57.0a1 / 20170915220136 / 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 mozilla-inbound to mozilla-central. r=merge a=merge MozReview-Commit-ID: FmdeaRYDVqR
--- a/dom/ipc/ContentChild.cpp
+++ b/dom/ipc/ContentChild.cpp
@@ -3624,26 +3624,37 @@ ContentChild::RecvResumeInputEventQueue(
   nsThreadManager::get().ResumeInputEventPrioritization();
   return IPC_OK();
 }
 
 already_AddRefed<nsIEventTarget>
 ContentChild::GetSpecificMessageEventTarget(const Message& aMsg)
 {
   switch(aMsg.type()) {
+    // Javascript
     case PJavaScript::Msg_DropTemporaryStrongReferences__ID:
     case PJavaScript::Msg_DropObject__ID:
+
+    // Navigation
     case PContent::Msg_NotifyVisited__ID:
+
+    // Storage API
     case PContent::Msg_DataStoragePut__ID:
     case PContent::Msg_DataStorageRemove__ID:
     case PContent::Msg_DataStorageClear__ID:
-    case PContent::Msg_PIPCBlobInputStreamConstructor__ID:
+
+    // Blob and BlobURL
     case PContent::Msg_BlobURLRegistration__ID:
     case PContent::Msg_BlobURLUnregistration__ID:
+    case PContent::Msg_InitBlobURLs__ID:
+    case PContent::Msg_PIPCBlobInputStreamConstructor__ID:
+    case PContent::Msg_StoreAndBroadcastBlobURLRegistration__ID:
+
       return do_AddRef(SystemGroup::EventTargetFor(TaskCategory::Other));
+
     default:
       return nullptr;
   }
 }
 
 #ifdef NIGHTLY_BUILD
 void
 ContentChild::OnChannelReceivedMessage(const Message& aMsg)
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoView.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoView.java
@@ -1271,17 +1271,17 @@ public class GeckoView extends LayerView
              */
             public final String issuerCommonName;
             /**
              * Contains the full/proper name of the issuing authority.
              */
             public final String issuerOrganization;
             /**
              * Indicates the security level of the site; possible values are SECURITY_MODE_UNKNOWN,
-             * SECURITY_MODE_IDENTIFIED, and SECURITY_MODE_VERIFIED. SECURITY_MODE_IDENTIFIED 
+             * SECURITY_MODE_IDENTIFIED, and SECURITY_MODE_VERIFIED. SECURITY_MODE_IDENTIFIED
              * indicates domain validation only, while SECURITY_MODE_VERIFIED indicates extended validation.
              */
             public final int securityMode;
             /**
              * Indicates the presence of passive mixed content; possible values are
              * CONTENT_UNKNOWN, CONTENT_BLOCKED, and CONTENT_LOADED.
              */
             public final int mixedModePassive;