Merge mozilla-central to inbound. a=merge CLOSED TREE

dom/canvas/WebGLContext.cpp

@@ -415,7 +415,7 @@ WebGLContext::SetContextOptions(JSContext* cx, JS::Handle<JS::Value> options,
         nsCString blocklistId;
         if (IsFeatureInBlacklist(gfxInfo, nsIGfxInfo::FEATURE_WEBGL_MSAA, &blocklistId)) {
             GenerateWarning("Disallowing antialiased backbuffers due to blacklisting.");
-            mOptions.antialias = false;
+            newOpts.antialias = false;
         }
     }
 

mobile/android/app/src/main/res/values-v23/themes.xml

@@ -10,11 +10,13 @@
     -->
     <style name="GeckoAppBase" parent="Gecko">
         <!-- Following are defaults from res/values/themes.xml#GeckoAppBase -->
-        <item name="android:buttonStyle">@style/Widget.Button</item>
-        <item name="android:dropDownItemStyle">@style/Widget.DropDownItem</item>
-        <item name="android:editTextStyle">@style/Widget.EditText</item>
-        <item name="android:textViewStyle">@style/Widget.TextView</item>
+        <item name="android:actionButtonStyle">@style/GeckoActionBar.Button</item>
+        <item name="android:listViewStyle">@style/Widget.ListView</item>
+        <item name="android:spinnerDropDownItemStyle">@style/Widget.DropDownItem.Spinner</item>
+        <item name="android:spinnerItemStyle">@style/Widget.TextView.SpinnerItem</item>
+        <item name="menuItemSwitcherLayoutStyle">@style/Widget.MenuItemSwitcherLayout</item>
         <item name="menuItemDefaultStyle">@style/Widget.MenuItemDefault</item>
+        <item name="menuItemSecondaryActionBarStyle">@style/Widget.MenuItemSecondaryActionBar</item>
 
         <!-- Following are used to apply a Photon theme to date/time pickers only on API >=23 -->
         <item name="android:timePickerStyle" >@style/PhotonTimePicker</item>

mobile/android/base/java/org/mozilla/gecko/BrowserApp.java

@@ -1058,6 +1058,7 @@ public class BrowserApp extends GeckoApp
             mPipController.tryEnteringPictureInPictureMode();
         } catch (IllegalStateException exception) {
             Log.e(LOGTAG, "Cannot enter in Picture In Picture mode:\n" + exception.getMessage());
+            setRequestedOrientationForCurrentActivity(ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR);
         }
     }
 

mobile/android/base/java/org/mozilla/gecko/media/PictureInPictureController.java

@@ -43,9 +43,9 @@ public class PictureInPictureController implements BundleEventListener {
      * @throws IllegalStateException if entering Picture In Picture mode was not possible.
      */
     public void tryEnteringPictureInPictureMode() throws IllegalStateException {
-        if (shouldTryPipMode()) {
+        if (shouldTryPipMode() &&
+                pipActivity.enterPictureInPictureMode(getPipParams(isMediaPlaying()))) {
             EventDispatcher.getInstance().registerUiThreadListener(this, "MediaControlService:MediaPlayingStatus");
-            pipActivity.enterPictureInPictureMode(getPipParams(isMediaPlaying()));
             isInPipMode = true;
         }
     }