Commit b24baa9d authored by Ryan VanderMeulen's avatar Ryan VanderMeulen
Browse files

Merge inbound to m-c. a=merge

parents f8d2d47e 6ab0e531

accessible/ipc/DocAccessibleChild.cpp

+3 −3
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ DocAccessibleChild::RecvTextSubstring(const uint64_t& aID, 
bool

DocAccessibleChild::RecvGetTextAfterOffset(const uint64_t& aID,

                                           const int32_t& aOffset,

                                           const AccessibleTextBoundary& aBoundaryType,

                                           const int32_t& aBoundaryType,

                                           nsString* aText,

                                           int32_t* aStartOffset,

                                           int32_t* aEndOffset)
@@ -243,7 +243,7 @@ DocAccessibleChild::RecvGetTextAfterOffset(const uint64_t& aID, 
bool

DocAccessibleChild::RecvGetTextAtOffset(const uint64_t& aID,

                                        const int32_t& aOffset,

                                        const AccessibleTextBoundary& aBoundaryType,

                                        const int32_t& aBoundaryType,

                                        nsString* aText,

                                        int32_t* aStartOffset,

                                        int32_t* aEndOffset)
@@ -261,7 +261,7 @@ DocAccessibleChild::RecvGetTextAtOffset(const uint64_t& aID, 
bool

DocAccessibleChild::RecvGetTextBeforeOffset(const uint64_t& aID,

                                            const int32_t& aOffset,

                                            const AccessibleTextBoundary& aBoundaryType,

                                            const int32_t& aBoundaryType,

                                            nsString* aText,

                                            int32_t* aStartOffset,

                                            int32_t* aEndOffset)

accessible/ipc/DocAccessibleChild.h

+3 −3
Original line number Diff line number Diff line
@@ -70,17 +70,17 @@ public: 


  virtual bool RecvGetTextAfterOffset(const uint64_t& aID,

                                      const int32_t& aOffset,

                                      const AccessibleTextBoundary& aBoundaryType,

                                      const int32_t& aBoundaryType,

                                      nsString* aText, int32_t* aStartOffset,

                                      int32_t* aEndOffset) MOZ_OVERRIDE;

  virtual bool RecvGetTextAtOffset(const uint64_t& aID,

                                   const int32_t& aOffset,

                                   const AccessibleTextBoundary& aBoundaryType,

                                   const int32_t& aBoundaryType,

                                   nsString* aText, int32_t* aStartOffset,

                                   int32_t* aEndOffset) MOZ_OVERRIDE;

  virtual bool RecvGetTextBeforeOffset(const uint64_t& aID,

                                       const int32_t& aOffset,

                                       const AccessibleTextBoundary& aBoundaryType,

                                       const int32_t& aBoundaryType,

                                       nsString* aText, int32_t* aStartOffset,

                                       int32_t* aEndOffset) MOZ_OVERRIDE;

accessible/ipc/PDocAccessible.ipdl

+3 −5
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ 


include protocol PContent;



using AccessibleTextBoundary from "nsIAccessibleText.h";



namespace mozilla {

namespace a11y {
@@ -69,11 +67,11 @@ child: 
  // TextSubstring is getText in IDL.

  prio(high) sync TextSubstring(uint64_t aID, int32_t aStartOffset, int32_t

                                aEndOffset) returns(nsString aText);

  prio(high) sync GetTextAfterOffset(uint64_t aID, int32_t aOffset, AccessibleTextBoundary aBoundaryType)

  prio(high) sync GetTextAfterOffset(uint64_t aID, int32_t aOffset, int32_t aBoundaryType)

    returns(nsString aText, int32_t aStartOffset, int32_t aEndOffset);

  prio(high) sync GetTextAtOffset(uint64_t aID, int32_t aOffset, AccessibleTextBoundary aBoundaryType)

  prio(high) sync GetTextAtOffset(uint64_t aID, int32_t aOffset, int32_t aBoundaryType)

    returns(nsString aText, int32_t aStartOffset, int32_t aEndOffset);

  prio(high) sync GetTextBeforeOffset(uint64_t aID, int32_t aOffset, AccessibleTextBoundary aBoundaryType)

  prio(high) sync GetTextBeforeOffset(uint64_t aID, int32_t aOffset, int32_t aBoundaryType)

    returns(nsString aText, int32_t aStartOffset, int32_t aEndOffset);

};

browser/app/profile/firefox.js

+2 −2
Original line number Diff line number Diff line
@@ -1809,8 +1809,8 @@ pref("experiments.manifest.uri", "https://telemetry-experiment.cdn.mozilla.net/m 
// Whether experiments are supported by the current application profile.

pref("experiments.supported", true);



// Enable the OpenH264 plugin support in the addon manager.

pref("media.gmp-gmpopenh264.provider.enabled", true);

// Enable GMP support in the addon manager.

pref("media.gmp-provider.enabled", true);



pref("browser.apps.URL", "https://marketplace.firefox.com/discovery/");

browser/components/loop/LoopCalls.jsm

+10 −3
Original line number Diff line number Diff line
@@ -69,10 +69,17 @@ CallProgressSocket.prototype = { 
    let uri = Services.io.newURI(this._progressUrl, null, null);



    // Allow _websocket to be set for testing.

    this._websocket = this._websocket ||

      Cc["@mozilla.org/network/protocol;1?name=" + uri.scheme]

    if (!this._websocket) {

      this._websocket = Cc["@mozilla.org/network/protocol;1?name=" + uri.scheme]

                          .createInstance(Ci.nsIWebSocketChannel);



      this._websocket.initLoadInfo(null, // aLoadingNode

                                   Services.scriptSecurityManager.getSystemPrincipal(),

                                   null, // aTriggeringPrincipal

                                   Ci.nsILoadInfo.SEC_NORMAL,

                                   Ci.nsIContentPolicy.TYPE_WEBSOCKET);

    }



    this._websocket.asyncOpen(uri, this._progressUrl, this, null);

  },