Commit 7941dfa3 authored by Ryan VanderMeulen's avatar Ryan VanderMeulen
Browse files

Merge m-c to b2g-inbound. a=merge

parents bee80913 4f09769d

accessible/mac/mozAccessible.mm

+18 −11
Original line number Diff line number Diff line
@@ -355,10 +355,12 @@ ConvertToNSArray(nsTArray<ProxyAccessible*>& aArray) 
{

  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;



  AccessibleWrap* accWrap = [self getGeckoAccessible];

  if (accWrap) {

    Accessible* acc = accWrap->GetChildAt(i);

    return acc ? GetNativeFromGeckoAccessible(acc) : nil;

  if (AccessibleWrap* accWrap = [self getGeckoAccessible]) {

    Accessible* child = accWrap->GetChildAt(i);

    return child ? GetNativeFromGeckoAccessible(child) : nil;

  } else if (ProxyAccessible* proxy = [self getProxyAccessible]) {

    ProxyAccessible* child = proxy->ChildAt(i);

    return child ? GetNativeFromProxy(child) : nil;

  }



  return nil;
@@ -849,12 +851,14 @@ ConvertToNSArray(nsTArray<ProxyAccessible*>& aArray) 
{

  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;



  AccessibleWrap* accWrap = [self getGeckoAccessible];

  if (!accWrap)

  nsIntRect rect;

  if (AccessibleWrap* accWrap = [self getGeckoAccessible])

    rect = accWrap->Bounds();

  else if (ProxyAccessible* proxy = [self getProxyAccessible])

    rect = proxy->Bounds();

  else

    return nil;



  nsIntRect rect = accWrap->Bounds();



  NSScreen* mainView = [[NSScreen screens] objectAtIndex:0];

  CGFloat scaleFactor = nsCocoaUtils::GetBackingScaleFactor(mainView);

  NSPoint p = NSMakePoint(static_cast<CGFloat>(rect.x) / scaleFactor,
@@ -869,11 +873,14 @@ ConvertToNSArray(nsTArray<ProxyAccessible*>& aArray) 
{

  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;



  AccessibleWrap* accWrap = [self getGeckoAccessible];

  if (!accWrap)

  nsIntRect rect;

  if (AccessibleWrap* accWrap = [self getGeckoAccessible])

    rect = accWrap->Bounds();

  else if (ProxyAccessible* proxy = [self getProxyAccessible])

    rect = proxy->Bounds();

  else

    return nil;



  nsIntRect rect = accWrap->Bounds();

  CGFloat scaleFactor =

    nsCocoaUtils::GetBackingScaleFactor([[NSScreen screens] objectAtIndex:0]);

  return [NSValue valueWithSize:NSMakeSize(static_cast<CGFloat>(rect.width) / scaleFactor,

b2g/app/b2g.js

+0 −3
Original line number Diff line number Diff line
@@ -1118,9 +1118,6 @@ pref("services.mobileid.server.uri", "https://msisdn.services.mozilla.com"); 
pref("dom.mapped_arraybuffer.enabled", true);

#endif



// BroadcastChannel API

pref("dom.broadcastChannel.enabled", true);



// SystemUpdate API

pref("dom.system_update.enabled", true);

b2g/config/mozconfigs/linux32_gecko/debug

+1 −1
Original line number Diff line number Diff line
@@ -35,6 +35,6 @@ export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP 
GAIADIR=$topsrcdir/gaia



# Include Firefox OS fonts.

MOZTTDIR=$topsrcdir/moztt

MOZTTDIR=$topsrcdir/moz-tt



. "$topsrcdir/b2g/config/mozconfigs/common.override"

b2g/config/mozconfigs/linux32_gecko/nightly

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP 
GAIADIR=$topsrcdir/gaia



# Include Firefox OS fonts.

MOZTTDIR=$topsrcdir/moztt

MOZTTDIR=$topsrcdir/moz-tt



# Build simulator xpi and phone tweaks for b2g-desktop

FXOS_SIMULATOR=1

b2g/config/mozconfigs/linux64_gecko/debug

+1 −1
Original line number Diff line number Diff line
@@ -35,6 +35,6 @@ export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP 
GAIADIR=$topsrcdir/gaia



# Include Firefox OS fonts.

MOZTTDIR=$topsrcdir/moztt

MOZTTDIR=$topsrcdir/moz-tt



. "$topsrcdir/b2g/config/mozconfigs/common.override"