Skip to content

Commit

Permalink
Merge commit 'c8a17e25111585c0eebb829f8208190ea432c71e' into embedlite
Browse files Browse the repository at this point in the history 
Conflicts:
	services/sync/Makefile.in
  • Loading branch information
@tmeshkova
tmeshkova committed Mar 17, 2014
2 parents 2de493c + c8a17e2 commit 03634b7
Show file tree
Hide file tree
Showing 1,497 changed files with 28,356 additions and 16,497 deletions.
2 changes: 1 addition & 1 deletion CLOBBER
View file
Expand Up @@ -22,4 +22,4 @@
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
# don't change CLOBBER for WebIDL changes any more.

Intermittent Android startup crashes leading to test bustage.
Bug 983185 requires a clobber. This may not affect all platforms.
14 changes: 7 additions & 7 deletions accessible/src/base/DocManager.cpp
View file
Expand Up @@ -15,12 +15,12 @@
#include "Logging.h"
#endif

#include "mozilla/EventListenerManager.h"
#include "mozilla/dom/Event.h" // for nsIDOMEvent::InternalDOMEvent()
#include "nsCURILoader.h"
#include "nsDocShellLoadTypes.h"
#include "nsIChannel.h"
#include "nsIDOMDocument.h"
#include "nsEventListenerManager.h"
#include "nsIDOMWindow.h"
#include "nsIInterfaceRequestorUtils.h"
#include "nsIWebNavigation.h"
Expand Down Expand Up @@ -329,9 +329,9 @@ DocManager::AddListeners(nsIDocument* aDocument,
{
nsPIDOMWindow* window = aDocument->GetWindow();
EventTarget* target = window->GetChromeEventHandler();
nsEventListenerManager* elm = target->GetOrCreateListenerManager();
EventListenerManager* elm = target->GetOrCreateListenerManager();
elm->AddEventListenerByType(this, NS_LITERAL_STRING("pagehide"),
dom::TrustedEventsAtCapture());
TrustedEventsAtCapture());

#ifdef A11Y_LOG
if (logging::IsEnabled(logging::eDocCreate))
Expand All @@ -340,7 +340,7 @@ DocManager::AddListeners(nsIDocument* aDocument,

if (aAddDOMContentLoadedListener) {
elm->AddEventListenerByType(this, NS_LITERAL_STRING("DOMContentLoaded"),
dom::TrustedEventsAtCapture());
TrustedEventsAtCapture());
#ifdef A11Y_LOG
if (logging::IsEnabled(logging::eDocCreate))
logging::Text("added 'DOMContentLoaded' listener");
Expand All @@ -359,12 +359,12 @@ DocManager::RemoveListeners(nsIDocument* aDocument)
if (!target)
return;

nsEventListenerManager* elm = target->GetOrCreateListenerManager();
EventListenerManager* elm = target->GetOrCreateListenerManager();
elm->RemoveEventListenerByType(this, NS_LITERAL_STRING("pagehide"),
dom::TrustedEventsAtCapture());
TrustedEventsAtCapture());

elm->RemoveEventListenerByType(this, NS_LITERAL_STRING("DOMContentLoaded"),
dom::TrustedEventsAtCapture());
TrustedEventsAtCapture());
}

DocAccessible*
Expand Down
4 changes: 2 additions & 2 deletions accessible/src/base/nsCoreUtils.cpp
View file
Expand Up @@ -16,14 +16,14 @@
#include "nsIBoxObject.h"
#include "nsIDOMXULElement.h"
#include "nsIDocShell.h"
#include "nsEventListenerManager.h"
#include "nsIPresShell.h"
#include "nsPresContext.h"
#include "nsIScrollableFrame.h"
#include "nsEventStateManager.h"
#include "nsISelectionPrivate.h"
#include "nsISelectionController.h"
#include "mozilla/dom/TouchEvent.h"
#include "mozilla/EventListenerManager.h"
#include "mozilla/MouseEvents.h"
#include "mozilla/TouchEvents.h"
#include "nsView.h"
Expand All @@ -45,7 +45,7 @@ bool
nsCoreUtils::HasClickListener(nsIContent *aContent)
{
NS_ENSURE_TRUE(aContent, false);
nsEventListenerManager* listenerManager =
EventListenerManager* listenerManager =
aContent->GetExistingListenerManager();

return listenerManager &&
Expand Down
1 change: 0 additions & 1 deletion accessible/src/generic/RootAccessible.cpp
View file
Expand Up @@ -33,7 +33,6 @@
#include "nsIDOMDataContainerEvent.h"
#include "nsIDOMXULMultSelectCntrlEl.h"
#include "nsIDocument.h"
#include "nsEventListenerManager.h"
#include "nsIInterfaceRequestorUtils.h"
#include "nsIServiceManager.h"
#include "nsPIDOMWindow.h"
Expand Down
2 changes: 0 additions & 2 deletions accessible/src/windows/msaa/RootAccessibleWrap.cpp
View file
Expand Up @@ -9,8 +9,6 @@
#include "nsCoreUtils.h"
#include "nsWinUtils.h"

#include "nsEventListenerManager.h"

using namespace mozilla::a11y;

////////////////////////////////////////////////////////////////////////////////
Expand Down
19 changes: 10 additions & 9 deletions accessible/src/xul/XULTreeGridAccessible.cpp
View file
Expand Up @@ -397,6 +397,7 @@ XULTreeGridRowAccessible::RowInvalidated(int32_t aStartColIdx,
if (!treeColumns)
return;

bool nameChanged = false;
for (int32_t colIdx = aStartColIdx; colIdx <= aEndColIdx; ++colIdx) {
nsCOMPtr<nsITreeColumn> column;
treeColumns->GetColumnAt(colIdx, getter_AddRefs(column));
Expand All @@ -405,18 +406,14 @@ XULTreeGridRowAccessible::RowInvalidated(int32_t aStartColIdx,
if (cellAccessible) {
nsRefPtr<XULTreeGridCellAccessible> cellAcc = do_QueryObject(cellAccessible);

cellAcc->CellInvalidated();
nameChanged |= cellAcc->CellInvalidated();
}
}
}

nsAutoString name;
Name(name);

if (name != mCachedName) {
if (nameChanged)
nsEventShell::FireEvent(nsIAccessibleEvent::EVENT_NAME_CHANGE, this);
mCachedName = name;
}

}

////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -763,7 +760,7 @@ XULTreeGridCellAccessible::RelationByType(RelationType aType)
////////////////////////////////////////////////////////////////////////////////
// XULTreeGridCellAccessible: public implementation

void
bool
XULTreeGridCellAccessible::CellInvalidated()
{

Expand All @@ -780,16 +777,20 @@ XULTreeGridCellAccessible::CellInvalidated()
nsEventShell::FireEvent(accEvent);

mCachedTextEquiv = textEquiv;
return true;
}

return;
return false;
}

mTreeView->GetCellText(mRow, mColumn, textEquiv);
if (mCachedTextEquiv != textEquiv) {
nsEventShell::FireEvent(nsIAccessibleEvent::EVENT_NAME_CHANGE, this);
mCachedTextEquiv = textEquiv;
return true;
}

return false;
}

////////////////////////////////////////////////////////////////////////////////
Expand Down
4 changes: 2 additions & 2 deletions accessible/src/xul/XULTreeGridAccessible.h
View file
Expand Up @@ -106,7 +106,6 @@ class XULTreeGridRowAccessible : public XULTreeItemAccessibleBase

// XULTreeItemAccessibleBase
mutable AccessibleHashtable mAccessibleCache;
nsString mCachedName;
};


Expand Down Expand Up @@ -180,8 +179,9 @@ class XULTreeGridCellAccessible : public LeafAccessible,
/**
* Fire name or state change event if the accessible text or value has been
* changed.
* @return true if name has changed
*/
void CellInvalidated();
bool CellInvalidated();

protected:
// Accessible
Expand Down
26 changes: 24 additions & 2 deletions b2g/app/b2g.js
View file
Expand Up @@ -676,6 +676,19 @@ pref("hal.processPriorityManager.gonk.BACKGROUND.Nice", 18);
// Processes get this niceness when they have low CPU priority.
pref("hal.processPriorityManager.gonk.LowCPUNice", 18);

// By default the compositor thread on gonk runs without real-time priority. RT
// priority can be enabled by setting this pref to a value between 1 and 99.
// Note that audio processing currently runs at RT priority 2 or 3 at most.
//
// If RT priority is disabled, then the compositor nice value is used. The
// code will default to ANDROID_PRIORITY_URGENT_DISPLAY which is -8. Per gfx
// request we are keeping the compositor at nice level 0 until we can complete
// the investigation in bug 982972.
//
// Do not change these values without gfx team review.
pref("hal.gonk.compositor.rt_priority", 0);
pref("hal.gonk.compositor.nice", 0);

// Fire a memory pressure event when the system has less than Xmb of memory
// remaining. You should probably set this just above Y.KillUnderKB for
// the highest priority class Y that you want to make an effort to keep alive.
Expand Down Expand Up @@ -860,6 +873,15 @@ pref("media.webspeech.synth.enabled", true);
pref("dom.mozDownloads.enabled", true);
pref("dom.downloads.max_retention_days", 7);

// External Helper Application Handling
//
// All external helper application handling can require the docshell to be
// active before allowing the external helper app service to handle content.
//
// To prevent SD card DoS attacks via downloads we disable background handling.
//
pref("security.exthelperapp.disable_background_handling", true);

// Inactivity time in milliseconds after which we shut down the OS.File worker.
pref("osfile.reset_worker_delay", 5000);

Expand All @@ -870,9 +892,9 @@ pref("osfile.reset_worker_delay", 5000);
pref("apz.asyncscroll.throttle", 40);
pref("apz.pan_repaint_interval", 16);

// Maximum fling velocity in px/ms. Slower devices may need to reduce this
// Maximum fling velocity in inches/ms. Slower devices may need to reduce this
// to avoid checkerboarding. Note, float value must be set as a string.
pref("apz.max_velocity_pixels_per_ms", "6.0");
pref("apz.max_velocity_inches_per_ms", "0.0375");

// Tweak default displayport values to reduce the risk of running out of
// memory when zooming in
Expand Down
28 changes: 0 additions & 28 deletions b2g/app/ua-update.json.in
View file
Expand Up @@ -5,8 +5,6 @@
{
// bug 826335, globo.com
"globo.com": "\\(Mobile#(Android; Mobile",
// bug 826342, mercadolivre.com.br
"mercadolivre.com.br": "\\(Mobile#(Android; Mobile",
// bug 826344, abril.com.br
"abril.com.br": "\\(Mobile#(Android; Mobile",
// bug 826347, msn.com
Expand All @@ -25,10 +23,6 @@
"bb.com.br": "\\(Mobile#(Android; Mobile",
// bug 826712, orkut.com
"orkut.com": "Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.133 Mobile Safari/535.19",
// bug 826715, noticias.uol.com.br
"noticias.uol.com.br": "\\(Mobile#(Android; Mobile",
// bug 826845, techtudo.com.br
"techtudo.com.br": "\\(Mobile#(Android; Mobile",
// bug 826958, ebay.com
"ebay.com": "\\(Mobile#(Android; Mobile",
// bug 827622, bing.com
Expand All @@ -37,16 +31,12 @@
"magazineluiza.com.br": "\\(Mobile#(Android; Mobile",
// bug 827628, groupon.com.br
"groupon.com.br": "\\(Mobile#(Android; Mobile",
// bug 827630, vagalume.com.br
"vagalume.com.br": "\\(Mobile#(Android; Mobile",
// bug 827632, tecmundo.com.br
"tecmundo.com.br": "\\(Mobile#(Android; Mobile",
// bug 827633, hao123.com
"hao123.com": "\\(Mobile#(Android; Mobile",
// bug 827573, webmotors.com.br
"webmotors.com.br": "\\(Mobile#(Android; Mobile",
// bug 827661, mercadolibre.com.co
"mercadolibre.com.co": "\\(Mobile#(Android; Mobile",
// bug 827670, elpais.com.co
"elpais.com.co": "Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.133 Mobile Safari/535.19",
// bug 827674, avianca.com
Expand All @@ -57,10 +47,6 @@
"gazeta.pl": "\\(Mobile#(Android; Mobile",
// bug 828360, sport.pl
"sport.pl": "\\(Mobile#(Android; Mobile",
// bug 828364, nk.pl
"nk.pl": "\\(Mobile#(Android; Mobile",
// bug 828369, money.pl
"money.pl": "\\(Mobile#(Android; Mobile",
// bug 828371, ingbank.pl
"ingbank.pl": "\\(Mobile#(Android; Mobile",
// bug 828378, wyborcza.pl
Expand All @@ -73,16 +59,12 @@
"infojobs.net": "\\(Mobile#(Android; Mobile",
// bug 828399, antena3.com
"antena3.com": "\\(Mobile#(Android; Mobile",
// bug 828406, orange.es
"orange.es": "\\(Mobile#(Android; Mobile",
// bug 828416, loteriasyapuestas.es
"loteriasyapuestas.es": "\\(Mobile#(Android; Mobile",
// bug 828418, bbva.es
"bbva.es": "\\(Mobile#(Android; Mobile",
// bug 828422, publico.es
"publico.es": "\\(Mobile#(Android; Mobile",
// bug 828425, mercadolibre.com.ve
"mercadolibre.com.ve": "\\(Mobile#(Android; Mobile",
// bug 828439, movistar.com.ve
"movistar.com.ve": "\\(Mobile#(Android; Mobile",
// bug 843126, es.playstation.com
Expand All @@ -97,14 +79,10 @@
"games.com": "\\(Mobile#(Android; Mobile",
// bug 843160, ehow.com
"ehow.com": "\\(Mobile#(Android; Mobile",
// bug 843186, chevrolet.com
"chevrolet.com": "\\(Mobile#(Android; Mobile",
// bug 866577, 3g.qq.com
"3g.qq.com": "\\(Mobile#(Android; Mobile",
// bug 878228, blikk.hu
"blikk.hu": "\\(Mobile#(Android; Mobile",
// bug 878230, citromail.hu
"citromail.hu": "\\(Mobile#(Android; Mobile",
// bug 878232, hazipatika.com
"hazipatika.com": "\\(Mobile#(Android; Mobile",
// bug 878238, koponyeg.hu
Expand All @@ -131,18 +109,12 @@
"kurir-info.rs": "\\(Mobile#(Android; Mobile",
// bug 878273, livescore.com
"livescore.com": "\\(Mobile#(Android; Mobile",
// bug 878275, mondo.rs
"mondo.rs": "\\(Mobile#(Android; Mobile",
// bug 878277, naslovi.net
"naslovi.net": "\\(Mobile#(Android; Mobile",
// bug 878630, ask.com
"ask.com": "\\(Mobile#(Android; Mobile",
// bug 878632, banorte.com
"banorte.com": "\\(Mobile#(Android; Mobile",
// bug 878637, eluniversal.com.mx
"eluniversal.com.mx": "\\(Mobile#(Android; Mobile",
// bug 878642, mercadolibre.com.mx
"mercadolibre.com.mx": "\\(Mobile#(Android; Mobile",
// bug 878649, univision.com
"univision.com": "\\(Mobile#(Android; Mobile",
// bug 878653, redstarbelgrade.info
Expand Down

0 comments on commit 03634b7

Please sign in to comment.