--- a/CLOBBER+++ b/CLOBBER@@ -17,9 +17,9 @@ # # Modifying this file will now automatically clobber the buildbot machines \o/ # # Are you updating CLOBBER because you think it's needed for your WebIDL # changes to stick? As of bug 928195, this shouldn't be necessary! Please # don't change CLOBBER for WebIDL changes any more.-Merge day clobber\ No newline at end of file+Bug 1343682 - backing out a previous version didn't stop the failures from it, so it appears to need a clobber both out and in

--- a/README.txt+++ b/README.txt@@ -1,27 +1,27 @@ An explanation of the Mozilla Source Code Directory Structure and links to project pages with documentation can be found at: https://developer.mozilla.org/en/Mozilla_Source_Code_Directory_Structure For information on how to build Mozilla from the source code, see:- http://developer.mozilla.org/en/docs/Build_Documentation+ https://developer.mozilla.org/en/docs/Build_Documentation To have your bug fix / feature added to Mozilla, you should create a patch and submit it to Bugzilla (https://bugzilla.mozilla.org). Instructions are at:- http://developer.mozilla.org/en/docs/Creating_a_patch- http://developer.mozilla.org/en/docs/Getting_your_patch_in_the_tree+ https://developer.mozilla.org/en/docs/Creating_a_patch+ https://developer.mozilla.org/en/docs/Getting_your_patch_in_the_tree If you have a question about developing Mozilla, and can't find the solution-on http://developer.mozilla.org, you can try asking your question in a+on https://developer.mozilla.org, you can try asking your question in a mozilla.* Usenet group, or on IRC at irc.mozilla.org. [The Mozilla news groups are accessible on Google Groups, or news.mozilla.org with a NNTP reader.] You can download nightly development builds from the Mozilla FTP server. Keep in mind that nightly builds, which are used by Mozilla developers for testing, may be buggy. Firefox nightlies, for example, can be found at: https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/ - or -- http://nightly.mozilla.org/+ https://nightly.mozilla.org/

--- a/accessible/base/NotificationController.cpp+++ b/accessible/base/NotificationController.cpp@@ -324,30 +324,37 @@ NotificationController::CoalesceMutation AccReorderEvent* reorder = downcast_accEvent(mMutationMap.GetEvent(parent, EventMap::ReorderEvent)); // We want to make sure that a reorder event comes after any show or // hide events targeted at the children of its target. We keep the // invariant that event generation goes up as you are farther in the // queue, so we want to use the spot of the event with the higher // generation number, and keep that generation number. if (reorder && reorder->EventGeneration() < event->EventGeneration()) {- // There really should be a show or hide event before the first- // reorder event.- if (reorder->PrevEvent()) {- reorder->PrevEvent()->SetNextEvent(reorder->NextEvent());- } else {- mFirstMutationEvent = reorder->NextEvent();+ reorder->SetEventGeneration(event->EventGeneration());++ // It may be true that reorder was before event, and we coalesced+ // away all the show / hide events between them. In that case+ // event is already immediately after reorder in the queue and we+ // do not need to rearrange the list of events.+ if (event != reorder->NextEvent()) {+ // There really should be a show or hide event before the first+ // reorder event.+ if (reorder->PrevEvent()) {+ reorder->PrevEvent()->SetNextEvent(reorder->NextEvent());+ } else {+ mFirstMutationEvent = reorder->NextEvent();+ }++ reorder->NextEvent()->SetPrevEvent(reorder->PrevEvent());+ event->PrevEvent()->SetNextEvent(reorder);+ reorder->SetPrevEvent(event->PrevEvent());+ event->SetPrevEvent(reorder);+ reorder->SetNextEvent(event); }-- reorder->NextEvent()->SetPrevEvent(reorder->PrevEvent());- event->PrevEvent()->SetNextEvent(reorder);- reorder->SetPrevEvent(event->PrevEvent());- event->SetPrevEvent(reorder);- reorder->SetNextEvent(event);- reorder->SetEventGeneration(event->EventGeneration()); } DropMutationEvent(event); break; } acc = parent; } } else if (eventType == nsIAccessibleEvent::EVENT_SHOW) {@@ -743,18 +750,21 @@ NotificationController::WillRefresh(mozi outerDocAcc->RemoveChild(childDoc); } // Failed to bind the child document, destroy it. childDoc->Shutdown(); } }- mHangingChildDocuments.Clear();+ MOZ_ASSERT(mDocument, "Illicit document shutdown");+ if (!mDocument) {+ return;+ } // If the document is ready and all its subdocuments are completely loaded // then process the document load. if (mDocument->HasLoadState(DocAccessible::eReady) && !mDocument->HasLoadState(DocAccessible::eCompletelyLoaded) && hangingDocCnt == 0) { uint32_t childDocCnt = mDocument->ChildDocumentCount(), childDocIdx = 0; for (; childDocIdx < childDocCnt; childDocIdx++) {

--- a/accessible/base/TextAttrs.cpp+++ b/accessible/base/TextAttrs.cpp@@ -13,20 +13,16 @@ #include "gfxFont.h" #include "nsFontMetrics.h" #include "nsLayoutUtils.h" #include "nsContainerFrame.h" #include "HyperTextAccessible.h" #include "mozilla/AppUnits.h" #include "mozilla/gfx/2D.h"-#if defined(MOZ_WIDGET_GTK)-#include "gfxPlatformGtk.h" // xxx - for UseFcFontList-#endif- using namespace mozilla; using namespace mozilla::a11y; //////////////////////////////////////////////////////////////////////////////// // TextAttrsMgr //////////////////////////////////////////////////////////////////////////////// void@@ -647,38 +643,24 @@ TextAttrsMgr::FontWeightTextAttr:: // When there doesn't exist a bold font in the family and so the rendering of // a non-bold font face is changed so that the user sees what looks like a // bold font, i.e. synthetic bolding is used. IsSyntheticBold method is only // needed on Mac, but it is "safe" to use on all platforms. (For non-Mac // platforms it always return false.) if (font->IsSyntheticBold()) return 700;- bool useFontEntryWeight = true;-- // Under Linux, when gfxPangoFontGroup code is used,- // font->GetStyle()->weight will give the absolute weight requested of the- // font face. The gfxPangoFontGroup code uses the gfxFontEntry constructor- // which doesn't initialize the weight field.-#if defined(MOZ_WIDGET_GTK)- useFontEntryWeight = gfxPlatformGtk::UseFcFontList();-#endif-- if (useFontEntryWeight) {- // On Windows, font->GetStyle()->weight will give the same weight as- // fontEntry->Weight(), the weight of the first font in the font group,- // which may not be the weight of the font face used to render the- // characters. On Mac, font->GetStyle()->weight will just give the same- // number as getComputedStyle(). fontEntry->Weight() will give the weight- // of the font face used.- gfxFontEntry *fontEntry = font->GetFontEntry();- return fontEntry->Weight();- } else {- return font->GetStyle()->weight;- }+ // On Windows, font->GetStyle()->weight will give the same weight as+ // fontEntry->Weight(), the weight of the first font in the font group,+ // which may not be the weight of the font face used to render the+ // characters. On Mac, font->GetStyle()->weight will just give the same+ // number as getComputedStyle(). fontEntry->Weight() will give the weight+ // of the font face used.+ gfxFontEntry *fontEntry = font->GetFontEntry();+ return fontEntry->Weight(); } //////////////////////////////////////////////////////////////////////////////// // AutoGeneratedTextAttr //////////////////////////////////////////////////////////////////////////////// TextAttrsMgr::AutoGeneratedTextAttr:: AutoGeneratedTextAttr(HyperTextAccessible* aHyperTextAcc, Accessible* aAccessible) :

--- a/accessible/interfaces/msaa/AccessibleMarshal.rc+++ b/accessible/interfaces/msaa/AccessibleMarshal.rc@@ -1,5 +1,5 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */-1 typelib ISimpleDOMNode.tlb+1 typelib ISimpleDOM.tlb

--- a/b2g/components/SignInToWebsite.jsm+++ b/b2g/components/SignInToWebsite.jsm@@ -89,22 +89,18 @@ XPCOMUtils.defineLazyModuleGetter(this, XPCOMUtils.defineLazyModuleGetter(this, "SystemAppProxy", "resource://gre/modules/SystemAppProxy.jsm"); // The default persona uri; can be overwritten with toolkit.identity.uri pref. // Do this if you want to repoint to a different service for testing. // There's no point in setting up an observer to monitor the pref, as b2g prefs // can only be overwritten when the profie is recreated. So just get the value // on start-up.-var kPersonaUri = "https://firefoxos.persona.org";-try {- kPersonaUri = Services.prefs.getCharPref("toolkit.identity.uri");-} catch(noSuchPref) {- // stick with the default value-}+var kPersonaUri = Services.prefs.getCharPref("toolkit.identity.uri",+ "https://firefoxos.persona.org"); // JS shim that contains the callback functions that // live within the identity UI provisioning frame. const kIdentityShimFile = "chrome://b2g/content/identity.js"; // Type of MozChromeEvents to handle id dialogs. const kOpenIdentityDialog = "id-dialog-open"; const kDoneIdentityDialog = "id-dialog-done";

--- a/b2g/locales/Makefile.in+++ b/b2g/locales/Makefile.in@@ -11,19 +11,17 @@ SUBMAKEFILES += \ $(NULL) # This makefile uses variable overrides from the libs-% target to # build non-default locales to non-default dist/ locations. Be aware! PWD := $(CURDIR) # These are defaulted to be compatible with the files the wget-en-US target-# pulls. You may override them if you provide your own files. You _must_-# override them when MOZ_PKG_PRETTYNAMES is defined - the defaults will not-# work in that case.+# pulls. You may override them if you provide your own files. ZIP_IN ?= $(ABS_DIST)/$(PACKAGE) WIN32_INSTALLER_IN ?= $(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe RETRIEVE_WINDOWS_INSTALLER = 1 MOZ_LANGPACK_EID=langpack-$(AB_CD)@b2g.mozilla.org L10N_PREF_JS_EXPORTS = $(call MERGE_FILE,b2g-l10n.js) L10N_PREF_JS_EXPORTS_PATH = $(FINAL_TARGET)/$(PREF_DIR)