Merge mozilla-central to Places.
authorShawn Wilsher <me@shawnwilsher.com>
Wed, 27 Oct 2010 12:28:31 -0700
changeset 59317 165b1dfdd63911d1e34946ccd75d86427b846aaf
parent 59316 b836e83fe06134853c6120c9380bde0fd696ba15 (current diff)
parent 56619 5cc1a77ffbad7e78fbab9fa3996311690befe45e (diff)
child 59318 b3e9f47ca21fcec72bd825cb9e86035b47b5f2c3
push idunknown
push userunknown
push dateunknown
milestone2.0b8pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge mozilla-central to Places.
browser/components/search/test/browser_415700.js
browser/locales/en-US/chrome/browser/history/history.dtd
configure.in
content/canvas/src/DocumentRendererNativeIDChild.cpp
content/canvas/src/DocumentRendererNativeIDParent.cpp
content/canvas/src/DocumentRendererShmemChild.cpp
content/canvas/src/DocumentRendererShmemParent.cpp
dom/ipc/PDocumentRendererNativeID.ipdl
dom/ipc/PDocumentRendererShmem.ipdl
js/src/methodjit/BytecodeAnalyzer.cpp
js/src/methodjit/BytecodeAnalyzer.h
js/src/tests/js1_8_1/trace/browser.js
js/src/tests/js1_8_1/trace/jstests.list
js/src/tests/js1_8_1/trace/math-trace-tests.js
js/src/tests/js1_8_1/trace/regress-451673.js
js/src/tests/js1_8_1/trace/regress-451974-01.js
js/src/tests/js1_8_1/trace/regress-451974-02.js
js/src/tests/js1_8_1/trace/regress-452498-01.js
js/src/tests/js1_8_1/trace/regress-458838.js
js/src/tests/js1_8_1/trace/regress-462459-01.js
js/src/tests/js1_8_1/trace/regress-462459-02.js
js/src/tests/js1_8_1/trace/regress-462459-03.js
js/src/tests/js1_8_1/trace/regress-462459-04.js
js/src/tests/js1_8_1/trace/regress-462459-05.js
js/src/tests/js1_8_1/trace/regress-462459-06.js
js/src/tests/js1_8_1/trace/regress-462459-07.js
js/src/tests/js1_8_1/trace/regress-462459-08.js
js/src/tests/js1_8_1/trace/regress-462459-09.js
js/src/tests/js1_8_1/trace/regress-462459-10.js
js/src/tests/js1_8_1/trace/regress-462459-11.js
js/src/tests/js1_8_1/trace/regress-462459-12.js
js/src/tests/js1_8_1/trace/regress-469927.js
js/src/tests/js1_8_1/trace/regress-470739.js
js/src/tests/js1_8_1/trace/regress-471635.js
js/src/tests/js1_8_1/trace/regress-489682.js
js/src/tests/js1_8_1/trace/shell.js
js/src/tests/js1_8_1/trace/testDeepBailFromNonNative.js
js/src/trace-test/README
js/src/trace-test/lib/andTestHelper.js
js/src/trace-test/lib/array-compare.js
js/src/trace-test/lib/mandelbrot-results.js
js/src/trace-test/lib/orTestHelper.js
js/src/trace-test/lib/prolog.js
js/src/trace-test/lib/range.js
js/src/trace-test/progressbar.py
js/src/trace-test/tests/arguments/args-createontrace.js
js/src/trace-test/tests/arguments/args-mochi-2.js
js/src/trace-test/tests/arguments/args-mochi-2a.js
js/src/trace-test/tests/arguments/args-mochi.js
js/src/trace-test/tests/arguments/args-mutate-length-1.js
js/src/trace-test/tests/arguments/args-mutate-length-2.js
js/src/trace-test/tests/arguments/args-range-2.js
js/src/trace-test/tests/arguments/args-range-const.js
js/src/trace-test/tests/arguments/args-range.js
js/src/trace-test/tests/arguments/args-redefine-length-1.js
js/src/trace-test/tests/arguments/args-redefine-length-2.js
js/src/trace-test/tests/arguments/args-sum.js
js/src/trace-test/tests/arguments/args-vargc.js
js/src/trace-test/tests/arguments/args1.js
js/src/trace-test/tests/arguments/args10.js
js/src/trace-test/tests/arguments/args11.js
js/src/trace-test/tests/arguments/args2.js
js/src/trace-test/tests/arguments/args2a.js
js/src/trace-test/tests/arguments/args2b.js
js/src/trace-test/tests/arguments/args2c.js
js/src/trace-test/tests/arguments/args2d.js
js/src/trace-test/tests/arguments/args3.js
js/src/trace-test/tests/arguments/args4.js
js/src/trace-test/tests/arguments/args5.js
js/src/trace-test/tests/arguments/args6.js
js/src/trace-test/tests/arguments/args6a.js
js/src/trace-test/tests/arguments/args7.js
js/src/trace-test/tests/arguments/args8.js
js/src/trace-test/tests/arguments/args9.js
js/src/trace-test/tests/arguments/argsub.js
js/src/trace-test/tests/arguments/argsx-1.js
js/src/trace-test/tests/arguments/argsx-2.js
js/src/trace-test/tests/arguments/argsx-3.js
js/src/trace-test/tests/arguments/argsx-3a.js
js/src/trace-test/tests/arguments/argsx-4.js
js/src/trace-test/tests/arguments/bug503772.js
js/src/trace-test/tests/arguments/bug508178.js
js/src/trace-test/tests/arguments/bug554670-1.js
js/src/trace-test/tests/arguments/bug554670-2.js
js/src/trace-test/tests/arguments/nonstrict-args.js
js/src/trace-test/tests/arguments/nonstrict-assign-element-get-parameter.js
js/src/trace-test/tests/arguments/nonstrict-assign-parameter-get-element.js
js/src/trace-test/tests/arguments/nonstrict-assign.js
js/src/trace-test/tests/arguments/nonstrict-later-assign.js
js/src/trace-test/tests/arguments/nonstrict-noargs.js
js/src/trace-test/tests/arguments/strict-args.js
js/src/trace-test/tests/arguments/strict-assign-after.js
js/src/trace-test/tests/arguments/strict-assign-arguments-element.js
js/src/trace-test/tests/arguments/strict-assign-outer-param-psych.js
js/src/trace-test/tests/arguments/strict-assign-outer-param.js
js/src/trace-test/tests/arguments/strict-assign-parameter-get-element.js
js/src/trace-test/tests/arguments/strict-assign.js
js/src/trace-test/tests/arguments/strict-eval-mutation.js
js/src/trace-test/tests/arguments/strict-eval.js
js/src/trace-test/tests/arguments/strict-maybe-assign-outer.js
js/src/trace-test/tests/arguments/strict-maybe-nested-eval.js
js/src/trace-test/tests/arguments/strict-nested-assign-shadow-function-call.js
js/src/trace-test/tests/arguments/strict-nested-assign-shadow-function-name.js
js/src/trace-test/tests/arguments/strict-nested-assign-shadow-function.js
js/src/trace-test/tests/arguments/strict-nested-assign-shadowed-catch-call.js
js/src/trace-test/tests/arguments/strict-nested-assign-shadowed-catch.js
js/src/trace-test/tests/arguments/strict-nested-assign-shadowed-var.js
js/src/trace-test/tests/arguments/strict-nested-eval.js
js/src/trace-test/tests/arguments/strict-nested-shadow-eval.js
js/src/trace-test/tests/arguments/strict-nested-shadow-maybe-eval.js
js/src/trace-test/tests/arguments/strict-noargs.js
js/src/trace-test/tests/arguments/testDelArg1.js
js/src/trace-test/tests/arguments/testDelArg2.js
js/src/trace-test/tests/basic/FPQuadCmp.js
js/src/trace-test/tests/basic/argumentsPassedToBuiltin.js
js/src/trace-test/tests/basic/arith.js
js/src/trace-test/tests/basic/arityMismatchExtraArg.js
js/src/trace-test/tests/basic/arityMismatchMissingArg.js
js/src/trace-test/tests/basic/bigLoadStoreDisp.js
js/src/trace-test/tests/basic/bitwiseAnd.js
js/src/trace-test/tests/basic/bitwiseGlobal.js
js/src/trace-test/tests/basic/bug464403.js
js/src/trace-test/tests/basic/bug465902.js
js/src/trace-test/tests/basic/bug489098.js
js/src/trace-test/tests/basic/bug504587-1.js
js/src/trace-test/tests/basic/bug507180.js
js/src/trace-test/tests/basic/bug509639.js
js/src/trace-test/tests/basic/bug509982.js
js/src/trace-test/tests/basic/bug510434.js
js/src/trace-test/tests/basic/bug510437-2.js
js/src/trace-test/tests/basic/bug510437.js
js/src/trace-test/tests/basic/bug510642.js
js/src/trace-test/tests/basic/bug510655.js
js/src/trace-test/tests/basic/bug511214.js
js/src/trace-test/tests/basic/bug511241.js
js/src/trace-test/tests/basic/bug513038.js
js/src/trace-test/tests/basic/bug516009.js
js/src/trace-test/tests/basic/bug517721.js
js/src/trace-test/tests/basic/bug519129.js
js/src/trace-test/tests/basic/bug520498.js
js/src/trace-test/tests/basic/bug522136.js
js/src/trace-test/tests/basic/bug522817.js
js/src/trace-test/tests/basic/bug524826-2.js
js/src/trace-test/tests/basic/bug524826.js
js/src/trace-test/tests/basic/bug525028.js
js/src/trace-test/tests/basic/bug527288.js
js/src/trace-test/tests/basic/bug528116.js
js/src/trace-test/tests/basic/bug528644.js
js/src/trace-test/tests/basic/bug529130.js
js/src/trace-test/tests/basic/bug532568-2.js
js/src/trace-test/tests/basic/bug532568.js
js/src/trace-test/tests/basic/bug532823.js
js/src/trace-test/tests/basic/bug535474.js
js/src/trace-test/tests/basic/bug535760.js
js/src/trace-test/tests/basic/bug535930.js
js/src/trace-test/tests/basic/bug536445.js
js/src/trace-test/tests/basic/bug536748.js
js/src/trace-test/tests/basic/bug539379.js
js/src/trace-test/tests/basic/bug539553-2.js
js/src/trace-test/tests/basic/bug539553-3.js
js/src/trace-test/tests/basic/bug539553.js
js/src/trace-test/tests/basic/bug541191-1.js
js/src/trace-test/tests/basic/bug541191-2.js
js/src/trace-test/tests/basic/bug541191-3.js
js/src/trace-test/tests/basic/bug541191-4.js
js/src/trace-test/tests/basic/bug541191-5.js
js/src/trace-test/tests/basic/bug547911-1.js
js/src/trace-test/tests/basic/bug547911-2.js
js/src/trace-test/tests/basic/bug551705.js
js/src/trace-test/tests/basic/bug552196.js
js/src/trace-test/tests/basic/bug557168-1.js
js/src/trace-test/tests/basic/bug557168-2.js
js/src/trace-test/tests/basic/bug557168-3.js
js/src/trace-test/tests/basic/bug557168.js
js/src/trace-test/tests/basic/bug557841.js
js/src/trace-test/tests/basic/bug558530.js
js/src/trace-test/tests/basic/bug558814.js
js/src/trace-test/tests/basic/bug560234.js
js/src/trace-test/tests/basic/bug560234b.js
js/src/trace-test/tests/basic/bug561279.js
js/src/trace-test/tests/basic/bug566637.js
js/src/trace-test/tests/basic/bug569651.js
js/src/trace-test/tests/basic/bug569843.js
js/src/trace-test/tests/basic/bug569849.js
js/src/trace-test/tests/basic/bug570663-1.js
js/src/trace-test/tests/basic/bug570663-2.js
js/src/trace-test/tests/basic/bug572229.js
js/src/trace-test/tests/basic/bug574280.js
js/src/trace-test/tests/basic/bug576823-regexp.js
js/src/trace-test/tests/basic/bug578041.js
js/src/trace-test/tests/basic/bug579740.js
js/src/trace-test/tests/basic/bug582479.js
js/src/trace-test/tests/basic/bug583615.js
js/src/trace-test/tests/basic/bug583757.js
js/src/trace-test/tests/basic/bug584499-1.js
js/src/trace-test/tests/basic/bug584499-2.js
js/src/trace-test/tests/basic/bug584565.js
js/src/trace-test/tests/basic/bug586499-regexp.js
js/src/trace-test/tests/basic/bug586917.js
js/src/trace-test/tests/basic/bug587346-regexp-01.js
js/src/trace-test/tests/basic/bug587366.js
js/src/trace-test/tests/basic/bug589318.js
js/src/trace-test/tests/basic/bug590006.js
js/src/trace-test/tests/basic/bug592927.js
js/src/trace-test/tests/basic/bug593663-regexp.js
js/src/trace-test/tests/basic/bug594108.js
js/src/trace-test/tests/basic/bug594205.js
js/src/trace-test/tests/basic/bug595963-1.js
js/src/trace-test/tests/basic/bug595963-2.js
js/src/trace-test/tests/basic/bug596502-version.js
js/src/trace-test/tests/basic/bug601395.js
js/src/trace-test/tests/basic/bug601398.js
js/src/trace-test/tests/basic/bug601401.js
js/src/trace-test/tests/basic/bug601402.js
js/src/trace-test/tests/basic/bug601428.js
js/src/trace-test/tests/basic/bug602088.js
js/src/trace-test/tests/basic/call.js
js/src/trace-test/tests/basic/call2.js
js/src/trace-test/tests/basic/createMandelSet.js
js/src/trace-test/tests/basic/deep2.js
js/src/trace-test/tests/basic/deepForInLoop.js
js/src/trace-test/tests/basic/delete-array-elements.js
js/src/trace-test/tests/basic/delete-indexed-names.js
js/src/trace-test/tests/basic/delete-named-names.js
js/src/trace-test/tests/basic/delete-non-config.js
js/src/trace-test/tests/basic/dependentStrings.js
js/src/trace-test/tests/basic/doMath.js
js/src/trace-test/tests/basic/equalInt.js
js/src/trace-test/tests/basic/fannkuch.js
js/src/trace-test/tests/basic/firstSlotConflict.js
js/src/trace-test/tests/basic/forVarInWith.js
js/src/trace-test/tests/basic/function-bind.js
js/src/trace-test/tests/basic/getelem.js
js/src/trace-test/tests/basic/getprop.js
js/src/trace-test/tests/basic/globalGet.js
js/src/trace-test/tests/basic/globalOptimize-1.js
js/src/trace-test/tests/basic/globalSet.js
js/src/trace-test/tests/basic/ifInsideLoop.js
js/src/trace-test/tests/basic/inArrayTest.js
js/src/trace-test/tests/basic/inObjectTest.js
js/src/trace-test/tests/basic/innerLoopIntOuterDouble.js
js/src/trace-test/tests/basic/inner_double_outer_int.js
js/src/trace-test/tests/basic/jitstatsArchFlags.js
js/src/trace-test/tests/basic/joinTest.js
js/src/trace-test/tests/basic/matchInLoop.js
js/src/trace-test/tests/basic/math-trace-tests.js
js/src/trace-test/tests/basic/merge_type_maps.js
js/src/trace-test/tests/basic/missingArgTest.js
js/src/trace-test/tests/basic/missingArgTest2.js
js/src/trace-test/tests/basic/mod.js
js/src/trace-test/tests/basic/name-inactive-del.js
js/src/trace-test/tests/basic/name-inactive-eval-del.js
js/src/trace-test/tests/basic/name-inactive-inferflags.js
js/src/trace-test/tests/basic/name-inactive.js
js/src/trace-test/tests/basic/name.js
js/src/trace-test/tests/basic/nestedExit2.js
js/src/trace-test/tests/basic/nestedExitLoop.js
js/src/trace-test/tests/basic/newArrayTest.js
js/src/trace-test/tests/basic/newTest.js
js/src/trace-test/tests/basic/nonEmptyStack1.js
js/src/trace-test/tests/basic/nonEmptyStack2.js
js/src/trace-test/tests/basic/orNaNTest1.js
js/src/trace-test/tests/basic/orNaNTest2.js
js/src/trace-test/tests/basic/outerline.js
js/src/trace-test/tests/basic/parseIntTests.js
js/src/trace-test/tests/basic/parsingNumbers.js
js/src/trace-test/tests/basic/perf-smoketest.js
js/src/trace-test/tests/basic/putargsNoReturn.js
js/src/trace-test/tests/basic/putargsReturn.js
js/src/trace-test/tests/basic/regexpLastIndex.js
js/src/trace-test/tests/basic/setArgumentsLength.js
js/src/trace-test/tests/basic/setArgumentsLength2.js
js/src/trace-test/tests/basic/setCall.js
js/src/trace-test/tests/basic/setCallEvalMiddle.js
js/src/trace-test/tests/basic/setCallEvalMiddle2.js
js/src/trace-test/tests/basic/setCallGlobal.js
js/src/trace-test/tests/basic/setelem.js
js/src/trace-test/tests/basic/setprop.js
js/src/trace-test/tests/basic/shapelessCalleeTest.js
js/src/trace-test/tests/basic/strictParseIntOctal.js
js/src/trace-test/tests/basic/stringConvert.js
js/src/trace-test/tests/basic/stringSplitIntoArrayTest.js
js/src/trace-test/tests/basic/stringSplitTest.js
js/src/trace-test/tests/basic/strings.js
js/src/trace-test/tests/basic/test586387.js
js/src/trace-test/tests/basic/testAbortedImacroDecompilation.js
js/src/trace-test/tests/basic/testAccessCanonicalArgInGetElem.js
js/src/trace-test/tests/basic/testAddAnyInconvertibleObject.js
js/src/trace-test/tests/basic/testAddInconvertibleObjectAny.js
js/src/trace-test/tests/basic/testAddInconvertibleObjectInconvertibleObject.js
js/src/trace-test/tests/basic/testAddNull.js
js/src/trace-test/tests/basic/testAddUndefined.js
js/src/trace-test/tests/basic/testApply.js
js/src/trace-test/tests/basic/testApplyCall.js
js/src/trace-test/tests/basic/testApplyUnbox.js
js/src/trace-test/tests/basic/testArrayComp1.js
js/src/trace-test/tests/basic/testArrayComp2.js
js/src/trace-test/tests/basic/testArrayDensityChange.js
js/src/trace-test/tests/basic/testArrayNaNIndex.js
js/src/trace-test/tests/basic/testArrayNamedProp.js
js/src/trace-test/tests/basic/testArrayPushPop.js
js/src/trace-test/tests/basic/testAssignmentThatIgnoresSetterRetval.js
js/src/trace-test/tests/basic/testAtomize.js
js/src/trace-test/tests/basic/testBitOrAnyInconvertibleObject.js
js/src/trace-test/tests/basic/testBitOrInconvertibleObjectAny.js
js/src/trace-test/tests/basic/testBitOrInconvertibleObjectInconvertibleObject.js
js/src/trace-test/tests/basic/testBitwise.js
js/src/trace-test/tests/basic/testBoolToString.js
js/src/trace-test/tests/basic/testBoxDoubleWithDoubleSizedInt.js
js/src/trace-test/tests/basic/testBranchCse.js
js/src/trace-test/tests/basic/testBranchingLoop.js
js/src/trace-test/tests/basic/testBranchingUnstableLoop.js
js/src/trace-test/tests/basic/testBranchingUnstableLoopCounter.js
js/src/trace-test/tests/basic/testBranchingUnstableObject.js
js/src/trace-test/tests/basic/testBrandedVsGeneric.js
js/src/trace-test/tests/basic/testBreak.js
js/src/trace-test/tests/basic/testBug458838.js
js/src/trace-test/tests/basic/testBug462388.js
js/src/trace-test/tests/basic/testBug462407.js
js/src/trace-test/tests/basic/testBug463490.js
js/src/trace-test/tests/basic/testBug465261.js
js/src/trace-test/tests/basic/testBug465272.js
js/src/trace-test/tests/basic/testBug465483.js
js/src/trace-test/tests/basic/testBug465688.js
js/src/trace-test/tests/basic/testBug466128.js
js/src/trace-test/tests/basic/testBug466262.js
js/src/trace-test/tests/basic/testBug474769.js
js/src/trace-test/tests/basic/testBug501690.js
js/src/trace-test/tests/basic/testBug502914.js
js/src/trace-test/tests/basic/testBug504520.js
js/src/trace-test/tests/basic/testBug504520Harder.js
js/src/trace-test/tests/basic/testBug507425.js
js/src/trace-test/tests/basic/testBug520503-1.js
js/src/trace-test/tests/basic/testBug520503-2.js
js/src/trace-test/tests/basic/testBug520503-3.js
js/src/trace-test/tests/basic/testBug529147.js
js/src/trace-test/tests/basic/testBug547791.js
js/src/trace-test/tests/basic/testBug550210.js
js/src/trace-test/tests/basic/testBug552248.js
js/src/trace-test/tests/basic/testBug554043.js
js/src/trace-test/tests/basic/testBug555484.js
js/src/trace-test/tests/basic/testBug558446.js
js/src/trace-test/tests/basic/testBug560098.js
js/src/trace-test/tests/basic/testBug566556.js
js/src/trace-test/tests/basic/testBug578044.js
js/src/trace-test/tests/basic/testBug579602.js
js/src/trace-test/tests/basic/testBug579646.js
js/src/trace-test/tests/basic/testBug579647.js
js/src/trace-test/tests/basic/testBug582766.js
js/src/trace-test/tests/basic/testBug584650.js
js/src/trace-test/tests/basic/testBug595916.js
js/src/trace-test/tests/basic/testBug597736.js
js/src/trace-test/tests/basic/testBug604210.js
js/src/trace-test/tests/basic/testCallElem.js
js/src/trace-test/tests/basic/testCallNull.js
js/src/trace-test/tests/basic/testCallPick.js
js/src/trace-test/tests/basic/testCallProtoMethod.js
js/src/trace-test/tests/basic/testCaseAbort.js
js/src/trace-test/tests/basic/testCaseTypeMismatchBadness.js
js/src/trace-test/tests/basic/testChangingObjectWithLength.js
js/src/trace-test/tests/basic/testClosingRecursion.js
js/src/trace-test/tests/basic/testClosureIncrSideExit.js
js/src/trace-test/tests/basic/testClosures.js
js/src/trace-test/tests/basic/testComparisons.js
js/src/trace-test/tests/basic/testConcatNWithSideEffects.js
js/src/trace-test/tests/basic/testConstIf.js
js/src/trace-test/tests/basic/testConstSwitch.js
js/src/trace-test/tests/basic/testConstSwitch2.js
js/src/trace-test/tests/basic/testConstantBooleanExpr.js
js/src/trace-test/tests/basic/testConstructorBail.js
js/src/trace-test/tests/basic/testContinue.js
js/src/trace-test/tests/basic/testContinueWithLabel.js
js/src/trace-test/tests/basic/testContinueWithLabel2.js
js/src/trace-test/tests/basic/testContinueWithLabel3.js
js/src/trace-test/tests/basic/testContinueWithLabel4.js
js/src/trace-test/tests/basic/testConvertibleObjectEqUndefined.js
js/src/trace-test/tests/basic/testCustomIterator.js
js/src/trace-test/tests/basic/testDateNow.js
js/src/trace-test/tests/basic/testDecElem1.js
js/src/trace-test/tests/basic/testDecElem2.js
js/src/trace-test/tests/basic/testDecayingInnerLoop.js
js/src/trace-test/tests/basic/testDeepBail1.js
js/src/trace-test/tests/basic/testDeepBailFromHasInstance.js
js/src/trace-test/tests/basic/testDeepBailWhileRecording.js
js/src/trace-test/tests/basic/testDeepPropertyShadowing.js
js/src/trace-test/tests/basic/testDefinePropertyAcrossCompartment.js
js/src/trace-test/tests/basic/testDenseArrayProp.js
js/src/trace-test/tests/basic/testDestructuring.js
js/src/trace-test/tests/basic/testDifferingArgc.js
js/src/trace-test/tests/basic/testDivOverflow.js
js/src/trace-test/tests/basic/testDivision.js
js/src/trace-test/tests/basic/testDivisionFloat.js
js/src/trace-test/tests/basic/testDivisionWithNegative1.js
js/src/trace-test/tests/basic/testDoubleComparison.js
js/src/trace-test/tests/basic/testDoubleToStr.js
js/src/trace-test/tests/basic/testDoubleZeroInSwitch1.js
js/src/trace-test/tests/basic/testDoubleZeroInSwitch2.js
js/src/trace-test/tests/basic/testElemDec1.js
js/src/trace-test/tests/basic/testElemDec2.js
js/src/trace-test/tests/basic/testElemInc1.js
js/src/trace-test/tests/basic/testElemInc2.js
js/src/trace-test/tests/basic/testEliminatedGuardWithinAnchor.js
js/src/trace-test/tests/basic/testEqFalseEmptyString.js
js/src/trace-test/tests/basic/testErrorReportIn_getPrototypeOf.js
js/src/trace-test/tests/basic/testEvalCalledFromWatchOverSetter.js
js/src/trace-test/tests/basic/testEvalInFunctionCallee.js
js/src/trace-test/tests/basic/testExistingPropToJoinedMethodAttempt.js
js/src/trace-test/tests/basic/testFewerGlobalsInInnerTree.js
js/src/trace-test/tests/basic/testFloatArrayIndex.js
js/src/trace-test/tests/basic/testForEach.js
js/src/trace-test/tests/basic/testForInLoopChangeIteratorType.js
js/src/trace-test/tests/basic/testFunctionIdentityChange.js
js/src/trace-test/tests/basic/testGCWhileRecording.js
js/src/trace-test/tests/basic/testGeneratorDeepBail.js
js/src/trace-test/tests/basic/testGetCallObj.js
js/src/trace-test/tests/basic/testGetThis.js
js/src/trace-test/tests/basic/testGlobalAsProto.js
js/src/trace-test/tests/basic/testGlobalMultitrees1.js
js/src/trace-test/tests/basic/testGlobalOptimize-2.js
js/src/trace-test/tests/basic/testGlobalOptimize-3.js
js/src/trace-test/tests/basic/testGlobalOptimize-4.js
js/src/trace-test/tests/basic/testGlobalOptimize-5.js
js/src/trace-test/tests/basic/testGlobalOptimize-6.js
js/src/trace-test/tests/basic/testGlobalProtoAccess.js
js/src/trace-test/tests/basic/testGlobalShapeChangeAfterDeepBail.js
js/src/trace-test/tests/basic/testGroupAssignment.js
js/src/trace-test/tests/basic/testGrowDenseArray.js
js/src/trace-test/tests/basic/testGuardCalleeSneakAttack.js
js/src/trace-test/tests/basic/testGuardCalleeSneakAttack2.js
js/src/trace-test/tests/basic/testHOTLOOPCorrectness.js
js/src/trace-test/tests/basic/testHOTLOOPSize.js
js/src/trace-test/tests/basic/testHeavy.js
js/src/trace-test/tests/basic/testHeavy2.js
js/src/trace-test/tests/basic/testHoleInDenseArray.js
js/src/trace-test/tests/basic/testHolePushing.js
js/src/trace-test/tests/basic/testINITELEM.js
js/src/trace-test/tests/basic/testIn.js
js/src/trace-test/tests/basic/testIncDec.js
js/src/trace-test/tests/basic/testIncElem1.js
js/src/trace-test/tests/basic/testIncElem2.js
js/src/trace-test/tests/basic/testInitMethod.js
js/src/trace-test/tests/basic/testInitelemWithFloatIndex.js
js/src/trace-test/tests/basic/testInitelemWithSetter.js
js/src/trace-test/tests/basic/testInnerMissingArgs.js
js/src/trace-test/tests/basic/testInnerSwitchBreak.js
js/src/trace-test/tests/basic/testInt32ToId.js
js/src/trace-test/tests/basic/testIntFloor.js
js/src/trace-test/tests/basic/testIntOverflow.js
js/src/trace-test/tests/basic/testIntUnderflow.js
js/src/trace-test/tests/basic/testInterpreterReentery8.js
js/src/trace-test/tests/basic/testInterpreterReentry.js
js/src/trace-test/tests/basic/testInterpreterReentry2.js
js/src/trace-test/tests/basic/testInterpreterReentry3.js
js/src/trace-test/tests/basic/testInterpreterReentry4.js
js/src/trace-test/tests/basic/testInterpreterReentry5.js
js/src/trace-test/tests/basic/testInterpreterReentry6.js
js/src/trace-test/tests/basic/testInterpreterReentry7.js
js/src/trace-test/tests/basic/testInvalidCharCodeAt.js
js/src/trace-test/tests/basic/testInvertNullAfterNegateNull.js
js/src/trace-test/tests/basic/testIteratorReification.js
js/src/trace-test/tests/basic/testLambdaCtor.js
js/src/trace-test/tests/basic/testLambdaInitedVar.js
js/src/trace-test/tests/basic/testLengthInString.js
js/src/trace-test/tests/basic/testLengthOnNonNativeProto.js
js/src/trace-test/tests/basic/testLetWithUnstableGlobal.js
js/src/trace-test/tests/basic/testLirBufOOM.js
js/src/trace-test/tests/basic/testLogicalNotNaN.js
js/src/trace-test/tests/basic/testLongNumToString.js
js/src/trace-test/tests/basic/testLoopWithUndefined1.js
js/src/trace-test/tests/basic/testLoopWithUndefined2.js
js/src/trace-test/tests/basic/testLoopingAccumulator.js
js/src/trace-test/tests/basic/testMatchAsCondition.js
js/src/trace-test/tests/basic/testMatchStringObject.js
js/src/trace-test/tests/basic/testMethodInc.js
js/src/trace-test/tests/basic/testMethodInit.js
js/src/trace-test/tests/basic/testMethodInitDeref.js
js/src/trace-test/tests/basic/testMethodInitSafety.js
js/src/trace-test/tests/basic/testMethodInitUneval.js
js/src/trace-test/tests/basic/testMethodOverride.js
js/src/trace-test/tests/basic/testMethodSet.js
js/src/trace-test/tests/basic/testMissingMethod.js
js/src/trace-test/tests/basic/testMissingMethod2.js
js/src/trace-test/tests/basic/testModuloWithNegative1.js
js/src/trace-test/tests/basic/testModuloWithNegative2.js
js/src/trace-test/tests/basic/testMoreArgcThanNargs.js
js/src/trace-test/tests/basic/testMoreClosures.js
js/src/trace-test/tests/basic/testMulOverflow.js
js/src/trace-test/tests/basic/testMultipleArgumentsObjects.js
js/src/trace-test/tests/basic/testNEWINIT.js
js/src/trace-test/tests/basic/testNEWINIT_DOUBLE.js
js/src/trace-test/tests/basic/testNativeArgsRooting.js
js/src/trace-test/tests/basic/testNativeLog.js
js/src/trace-test/tests/basic/testNativeMax.js
js/src/trace-test/tests/basic/testNativeSetter.js
js/src/trace-test/tests/basic/testNegZero1.js
js/src/trace-test/tests/basic/testNegativeArrayLength.js
js/src/trace-test/tests/basic/testNegativeGETELEMIndex.js
js/src/trace-test/tests/basic/testNestedClosures.js
js/src/trace-test/tests/basic/testNestedDeepBail.js
js/src/trace-test/tests/basic/testNestedEscapingLambdas.js
js/src/trace-test/tests/basic/testNestedExitStackOuter.js
js/src/trace-test/tests/basic/testNestedForIn.js
js/src/trace-test/tests/basic/testNewArrayCount.js
js/src/trace-test/tests/basic/testNewArrayCount2.js
js/src/trace-test/tests/basic/testNewDate.js
js/src/trace-test/tests/basic/testNewObject.js
js/src/trace-test/tests/basic/testNewString.js
js/src/trace-test/tests/basic/testNewWithNonNativeProto.js
js/src/trace-test/tests/basic/testNonStubGetter.js
js/src/trace-test/tests/basic/testNot.js
js/src/trace-test/tests/basic/testNullCallee.js
js/src/trace-test/tests/basic/testNullRelCmp.js
js/src/trace-test/tests/basic/testNullToString.js
js/src/trace-test/tests/basic/testNumToString.js
js/src/trace-test/tests/basic/testNumberToString.js
js/src/trace-test/tests/basic/testObjectConstructorReturningObject.js
js/src/trace-test/tests/basic/testObjectLength.js
js/src/trace-test/tests/basic/testObjectOrderedCmp.js
js/src/trace-test/tests/basic/testObjectOrderedCmp2.js
js/src/trace-test/tests/basic/testObjectToNumber.js
js/src/trace-test/tests/basic/testObjectToString.js
js/src/trace-test/tests/basic/testObjectVsPrototype.js
js/src/trace-test/tests/basic/testOwnPropertyWithInOperator.js
js/src/trace-test/tests/basic/testPartialFlatClosure.js
js/src/trace-test/tests/basic/testPrimitiveConstructorPrototype.js
js/src/trace-test/tests/basic/testPropagatedFunArgs.js
js/src/trace-test/tests/basic/testProxyConstructors.js
js/src/trace-test/tests/basic/testProxyDefinePropertyWithMissingSetter.js
js/src/trace-test/tests/basic/testPutOnEmptyArgsObject.js
js/src/trace-test/tests/basic/testRUNLOOPCorrectness.js
js/src/trace-test/tests/basic/testReallyDeepNestedExit.js
js/src/trace-test/tests/basic/testRebranding.js
js/src/trace-test/tests/basic/testRebranding2.js
js/src/trace-test/tests/basic/testReconstructImacroPCStack.js
js/src/trace-test/tests/basic/testRegExpLiteral.js
js/src/trace-test/tests/basic/testRegExpTest.js
js/src/trace-test/tests/basic/testRegexpGet.js
js/src/trace-test/tests/basic/testReplace2.js
js/src/trace-test/tests/basic/testResumeOp.js
js/src/trace-test/tests/basic/testReverseArgTypes.js
js/src/trace-test/tests/basic/testScriptGetter_JSOP_CALLPROP-2.js
js/src/trace-test/tests/basic/testScriptGetter_JSOP_CALLPROP.js
js/src/trace-test/tests/basic/testScriptGetter_JSOP_GETARGPROP.js
js/src/trace-test/tests/basic/testScriptGetter_JSOP_GETLOCALPROP.js
js/src/trace-test/tests/basic/testScriptGetter_JSOP_GETPROP.js
js/src/trace-test/tests/basic/testScriptGetter_JSOP_GETTHISPROP.js
js/src/trace-test/tests/basic/testSetGetterOnlyProperty.js
js/src/trace-test/tests/basic/testSetMethod.js
js/src/trace-test/tests/basic/testSetPropNeitherMissNorHit.js
js/src/trace-test/tests/basic/testSetPropertyFail.js
js/src/trace-test/tests/basic/testSetProtoRegeneratesObjectShape.js
js/src/trace-test/tests/basic/testSetelemWithFloatIndex.js
js/src/trace-test/tests/basic/testSettingWatchPointOnReadOnlyProp.js
js/src/trace-test/tests/basic/testShiftLeft.js
js/src/trace-test/tests/basic/testShiftRightArithmetic.js
js/src/trace-test/tests/basic/testShiftRightLogical.js
js/src/trace-test/tests/basic/testSideExitInConstructor.js
js/src/trace-test/tests/basic/testSlowArrayLength.js
js/src/trace-test/tests/basic/testSlowArrayPop.js
js/src/trace-test/tests/basic/testSlowArrayPopMultiFrame.js
js/src/trace-test/tests/basic/testSlowArrayPopNestedTrees.js
js/src/trace-test/tests/basic/testSlowNativeBail.js
js/src/trace-test/tests/basic/testSlowNativeCtor.js
js/src/trace-test/tests/basic/testSlowNativeWithNullThis.js
js/src/trace-test/tests/basic/testStackQuotaExhausted.js
js/src/trace-test/tests/basic/testStaticsInRegExp.js
js/src/trace-test/tests/basic/testStrict.js
js/src/trace-test/tests/basic/testString.js
js/src/trace-test/tests/basic/testStringConstructorWithExtraArg.js
js/src/trace-test/tests/basic/testStringLengthNoTinyId.js
js/src/trace-test/tests/basic/testStringObjectLength.js
js/src/trace-test/tests/basic/testStringResolve.js
js/src/trace-test/tests/basic/testStringToInt32.js
js/src/trace-test/tests/basic/testStringToNumber.js
js/src/trace-test/tests/basic/testStringify.js
js/src/trace-test/tests/basic/testSubstring.js
js/src/trace-test/tests/basic/testSuppressDeletedProperty.js
js/src/trace-test/tests/basic/testSwitch.js
js/src/trace-test/tests/basic/testSwitchString.js
js/src/trace-test/tests/basic/testSwitchUndefined.js
js/src/trace-test/tests/basic/testTableSwitch1.js
js/src/trace-test/tests/basic/testTableSwitch2.js
js/src/trace-test/tests/basic/testThinForEach.js
js/src/trace-test/tests/basic/testThinLoopDemote.js
js/src/trace-test/tests/basic/testThrowingObjectEqUndefined.js
js/src/trace-test/tests/basic/testToStringBeforeValueOf.js
js/src/trace-test/tests/basic/testToUpperToLower.js
js/src/trace-test/tests/basic/testTrueShiftTrue.js
js/src/trace-test/tests/basic/testTypeUnstableForIn.js
js/src/trace-test/tests/basic/testTypedArrayPunning.js
js/src/trace-test/tests/basic/testTypedArrays.js
js/src/trace-test/tests/basic/testTypeofHole.js
js/src/trace-test/tests/basic/testUnaryImacros.js
js/src/trace-test/tests/basic/testUndefinedBooleanCmp.js
js/src/trace-test/tests/basic/testUndefinedCmp.js
js/src/trace-test/tests/basic/testUndefinedPropertyAccess.js
js/src/trace-test/tests/basic/testUndemotableBinaryOp.js
js/src/trace-test/tests/basic/testUndemoteLateGlobalSlots.js
js/src/trace-test/tests/basic/testWeirdDateParse.js
js/src/trace-test/tests/basic/testWhileObjectOrNull.js
js/src/trace-test/tests/basic/testWithAndShadowing.js
js/src/trace-test/tests/basic/testXMLPropertyNames.js
js/src/trace-test/tests/basic/test_JSOP_ARGCNT.js
js/src/trace-test/tests/basic/test_JSOP_ARGSUB.js
js/src/trace-test/tests/basic/testif.js
js/src/trace-test/tests/basic/testincops.js
js/src/trace-test/tests/basic/trees.js
js/src/trace-test/tests/basic/truthies.js
js/src/trace-test/tests/basic/typeofTest.js
js/src/trace-test/tests/basic/unboxint.js
js/src/trace-test/tests/basic/wrap-primitive-this.js
js/src/trace-test/tests/basic/xprop.js
js/src/trace-test/tests/closures/bug496922.js
js/src/trace-test/tests/closures/bug496987.js
js/src/trace-test/tests/closures/bug497015-1.js
js/src/trace-test/tests/closures/bug497015-2.js
js/src/trace-test/tests/closures/bug540131-2.js
js/src/trace-test/tests/closures/bug540131-3.js
js/src/trace-test/tests/closures/bug540131.js
js/src/trace-test/tests/closures/bug540133.js
js/src/trace-test/tests/closures/bug540136.js
js/src/trace-test/tests/closures/bug540242.js
js/src/trace-test/tests/closures/bug540243.js
js/src/trace-test/tests/closures/bug540348.js
js/src/trace-test/tests/closures/bug540528.js
js/src/trace-test/tests/closures/bug541239.js
js/src/trace-test/tests/closures/bug543565.js
js/src/trace-test/tests/closures/closure-pluseq.js
js/src/trace-test/tests/closures/closure-pluseq2.js
js/src/trace-test/tests/closures/closure-plusplus.js
js/src/trace-test/tests/closures/closure-tests.js
js/src/trace-test/tests/closures/flat-closure-1.js
js/src/trace-test/tests/closures/flat-closure-2.js
js/src/trace-test/tests/closures/flat-closure-3.js
js/src/trace-test/tests/closures/flat-closure-4.js
js/src/trace-test/tests/closures/flat-closure-5.js
js/src/trace-test/tests/closures/flat-closure-6.js
js/src/trace-test/tests/closures/flat-closure-7.js
js/src/trace-test/tests/closures/flat-closure-8.js
js/src/trace-test/tests/closures/incr-exit-2.js
js/src/trace-test/tests/closures/incr-exit-3.js
js/src/trace-test/tests/closures/incr-exit.js
js/src/trace-test/tests/closures/lambda-inner-heavy.js
js/src/trace-test/tests/closures/lambda-light-returned.js
js/src/trace-test/tests/closures/lambda-light.js
js/src/trace-test/tests/closures/lambda.js
js/src/trace-test/tests/closures/lambdafc.js
js/src/trace-test/tests/closures/name-both-hvy.js
js/src/trace-test/tests/closures/name-inactive-missing.js
js/src/trace-test/tests/closures/name.js
js/src/trace-test/tests/closures/name2.js
js/src/trace-test/tests/closures/name2a.js
js/src/trace-test/tests/closures/name2b.js
js/src/trace-test/tests/closures/name3.js
js/src/trace-test/tests/closures/name4.js
js/src/trace-test/tests/closures/namedLambda.js
js/src/trace-test/tests/closures/nameinc-loop-2.js
js/src/trace-test/tests/closures/nameinc-loop-3.js
js/src/trace-test/tests/closures/nameinc-loop-missing-2.js
js/src/trace-test/tests/closures/nameinc-loop-missing.js
js/src/trace-test/tests/closures/nameinc-loop.js
js/src/trace-test/tests/closures/nameinc.js
js/src/trace-test/tests/closures/set-outer-trace-1.js
js/src/trace-test/tests/closures/set-outer-trace-2.js
js/src/trace-test/tests/closures/set-outer-trace-3.js
js/src/trace-test/tests/closures/set-outer-trace-4.js
js/src/trace-test/tests/closures/set-outer-trace.js
js/src/trace-test/tests/closures/setname-1.js
js/src/trace-test/tests/closures/setname-closure-2.js
js/src/trace-test/tests/closures/setname-closure.js
js/src/trace-test/tests/closures/setname-inner-heavy.js
js/src/trace-test/tests/closures/setname-loop-2.js
js/src/trace-test/tests/closures/setname-loop.js
js/src/trace-test/tests/closures/setname-no-pop.js
js/src/trace-test/tests/closures/t001.js
js/src/trace-test/tests/closures/t002.js
js/src/trace-test/tests/closures/t003.js
js/src/trace-test/tests/closures/t004.js
js/src/trace-test/tests/closures/t005.js
js/src/trace-test/tests/closures/t006.js
js/src/trace-test/tests/closures/t007.js
js/src/trace-test/tests/closures/t008.js
js/src/trace-test/tests/closures/t009.js
js/src/trace-test/tests/closures/t010.js
js/src/trace-test/tests/closures/t011.js
js/src/trace-test/tests/closures/t012.js
js/src/trace-test/tests/closures/t013.js
js/src/trace-test/tests/closures/t014.js
js/src/trace-test/tests/closures/t015.js
js/src/trace-test/tests/closures/t016.js
js/src/trace-test/tests/closures/t017.js
js/src/trace-test/tests/closures/t018.js
js/src/trace-test/tests/closures/t019.js
js/src/trace-test/tests/closures/t020.js
js/src/trace-test/tests/closures/t021.js
js/src/trace-test/tests/closures/t022.js
js/src/trace-test/tests/closures/t023.js
js/src/trace-test/tests/closures/t024.js
js/src/trace-test/tests/closures/t025.js
js/src/trace-test/tests/closures/t026.js
js/src/trace-test/tests/closures/t027.js
js/src/trace-test/tests/closures/t028.js
js/src/trace-test/tests/closures/t029.js
js/src/trace-test/tests/closures/t030.js
js/src/trace-test/tests/closures/t031.js
js/src/trace-test/tests/closures/t032.js
js/src/trace-test/tests/closures/t033.js
js/src/trace-test/tests/closures/t034.js
js/src/trace-test/tests/closures/t035.js
js/src/trace-test/tests/closures/t036.js
js/src/trace-test/tests/closures/t037.js
js/src/trace-test/tests/closures/test-inner-imports.js
js/src/trace-test/tests/closures/upvar-nest.js
js/src/trace-test/tests/jaeger/bug549393-1.js
js/src/trace-test/tests/jaeger/bug549393-2.js
js/src/trace-test/tests/jaeger/bug549396.js
js/src/trace-test/tests/jaeger/bug549398.js
js/src/trace-test/tests/jaeger/bug549521.js
js/src/trace-test/tests/jaeger/bug549602.js
js/src/trace-test/tests/jaeger/bug549603.js
js/src/trace-test/tests/jaeger/bug550490.js
js/src/trace-test/tests/jaeger/bug550665.js
js/src/trace-test/tests/jaeger/bug551603.js
js/src/trace-test/tests/jaeger/bug552644.js
js/src/trace-test/tests/jaeger/bug553781-2.js
js/src/trace-test/tests/jaeger/bug553781.js
js/src/trace-test/tests/jaeger/bug553784.js
js/src/trace-test/tests/jaeger/bug554580-1.js
js/src/trace-test/tests/jaeger/bug554580-2.js
js/src/trace-test/tests/jaeger/bug554580-3.js
js/src/trace-test/tests/jaeger/bug554580-4.js
js/src/trace-test/tests/jaeger/bug554580-5.js
js/src/trace-test/tests/jaeger/bug554651.js
js/src/trace-test/tests/jaeger/bug554675-1.js
js/src/trace-test/tests/jaeger/bug554675-2.js
js/src/trace-test/tests/jaeger/bug554675-3.js
js/src/trace-test/tests/jaeger/bug555152.js
js/src/trace-test/tests/jaeger/bug555155.js
js/src/trace-test/tests/jaeger/bug555206.js
js/src/trace-test/tests/jaeger/bug555543.js
js/src/trace-test/tests/jaeger/bug555922.js
js/src/trace-test/tests/jaeger/bug556525.js
js/src/trace-test/tests/jaeger/bug557063.js
js/src/trace-test/tests/jaeger/bug557068.js
js/src/trace-test/tests/jaeger/bug557070.js
js/src/trace-test/tests/jaeger/bug557075.js
js/src/trace-test/tests/jaeger/bug560221.js
js/src/trace-test/tests/jaeger/bug563000/eif-call-newvar.js
js/src/trace-test/tests/jaeger/bug563000/eif-call-typechange.js
js/src/trace-test/tests/jaeger/bug563000/eif-call.js
js/src/trace-test/tests/jaeger/bug563000/eif-getter-newvar.js
js/src/trace-test/tests/jaeger/bug563000/eif-getter-typechange.js
js/src/trace-test/tests/jaeger/bug563000/eif-getter.js
js/src/trace-test/tests/jaeger/bug563000/eif-trap-newvar.js
js/src/trace-test/tests/jaeger/bug563000/eif-trap-typechange.js
js/src/trace-test/tests/jaeger/bug563000/eif-trap.js
js/src/trace-test/tests/jaeger/bug563000/simple-trap-1.js
js/src/trace-test/tests/jaeger/bug563000/simple-trap-2.js
js/src/trace-test/tests/jaeger/bug563000/simple-untrap.js
js/src/trace-test/tests/jaeger/bug563000/test-debugger-1.js
js/src/trace-test/tests/jaeger/bug563000/test-debugger-2.js
js/src/trace-test/tests/jaeger/bug563000/test-throwhook-1.js
js/src/trace-test/tests/jaeger/bug563000/test-throwhook-2.js
js/src/trace-test/tests/jaeger/bug563000/trap-force-return-1.js
js/src/trace-test/tests/jaeger/bug563000/trap-force-return-2.js
js/src/trace-test/tests/jaeger/bug563000/trap-own-callsite.js
js/src/trace-test/tests/jaeger/bug563000/trap-parent-from-trap.js
js/src/trace-test/tests/jaeger/bug563000/trap-parent.js
js/src/trace-test/tests/jaeger/bug563000/trap-self-as-parent.js
js/src/trace-test/tests/jaeger/bug563000/trap-self-from-trap.js
js/src/trace-test/tests/jaeger/bug563000/trap-self.js
js/src/trace-test/tests/jaeger/bug563000/untrap-own-trapsite.js
js/src/trace-test/tests/jaeger/bug563000/untrap-self.js
js/src/trace-test/tests/jaeger/bug565198.js
js/src/trace-test/tests/jaeger/bug565202.js
js/src/trace-test/tests/jaeger/bug566022.js
js/src/trace-test/tests/jaeger/bug573433.js
js/src/trace-test/tests/jaeger/bug576398.js
js/src/trace-test/tests/jaeger/bug577580.js
js/src/trace-test/tests/jaeger/bug577646.js
js/src/trace-test/tests/jaeger/bug577705.js
js/src/trace-test/tests/jaeger/bug577996.js
js/src/trace-test/tests/jaeger/bug580703.js
js/src/trace-test/tests/jaeger/bug580712.js
js/src/trace-test/tests/jaeger/bug580883.js
js/src/trace-test/tests/jaeger/bug580884-2.js
js/src/trace-test/tests/jaeger/bug580884-3.js
js/src/trace-test/tests/jaeger/bug580884.js
js/src/trace-test/tests/jaeger/bug580931-2.js
js/src/trace-test/tests/jaeger/bug581871.js
js/src/trace-test/tests/jaeger/bug581936.js
js/src/trace-test/tests/jaeger/bug582185.js
js/src/trace-test/tests/jaeger/bug582286.js
js/src/trace-test/tests/jaeger/bug582392.js
js/src/trace-test/tests/jaeger/bug582880.js
js/src/trace-test/tests/jaeger/bug582882.js
js/src/trace-test/tests/jaeger/bug582884.js
js/src/trace-test/tests/jaeger/bug582894.js
js/src/trace-test/tests/jaeger/bug582897.js
js/src/trace-test/tests/jaeger/bug582898.js
js/src/trace-test/tests/jaeger/bug582900.js
js/src/trace-test/tests/jaeger/bug583158.js
js/src/trace-test/tests/jaeger/bug583160.js
js/src/trace-test/tests/jaeger/bug583672.js
js/src/trace-test/tests/jaeger/bug583684.js
js/src/trace-test/tests/jaeger/bug583688.js
js/src/trace-test/tests/jaeger/bug583689.js
js/src/trace-test/tests/jaeger/bug584644-2.js
js/src/trace-test/tests/jaeger/bug584646.js
js/src/trace-test/tests/jaeger/bug584647.js
js/src/trace-test/tests/jaeger/bug585310.js
js/src/trace-test/tests/jaeger/bug585341.js
js/src/trace-test/tests/jaeger/bug585391.js
js/src/trace-test/tests/jaeger/bug585408-2.js
js/src/trace-test/tests/jaeger/bug585408-3.js
js/src/trace-test/tests/jaeger/bug585408.js
js/src/trace-test/tests/jaeger/bug585540.js
js/src/trace-test/tests/jaeger/bug587431.js
js/src/trace-test/tests/jaeger/bug588338.js
js/src/trace-test/tests/jaeger/bug588362-1.js
js/src/trace-test/tests/jaeger/bug588362-2.js
js/src/trace-test/tests/jaeger/bug588362-3.js
js/src/trace-test/tests/jaeger/bug588363-1.js
js/src/trace-test/tests/jaeger/bug588363-2.js
js/src/trace-test/tests/jaeger/bug589108.js
js/src/trace-test/tests/jaeger/bug589115.js
js/src/trace-test/tests/jaeger/bug589461.js
js/src/trace-test/tests/jaeger/bug590083.js
js/src/trace-test/tests/jaeger/bug591602.js
js/src/trace-test/tests/jaeger/bug591606.js
js/src/trace-test/tests/jaeger/bug592973-1.js
js/src/trace-test/tests/jaeger/bug592973-2.js
js/src/trace-test/tests/jaeger/bug592973-3.js
js/src/trace-test/tests/jaeger/bug593554.js
js/src/trace-test/tests/jaeger/bug595917.js
js/src/trace-test/tests/jaeger/bug595921.js
js/src/trace-test/tests/jaeger/bug597378.js
js/src/trace-test/tests/jaeger/bug597871.js
js/src/trace-test/tests/jaeger/bug598696.js
js/src/trace-test/tests/jaeger/bug599488.js
js/src/trace-test/tests/jaeger/bug600139.js
js/src/trace-test/tests/jaeger/bug600419.js
js/src/trace-test/tests/jaeger/bug600424.js
js/src/trace-test/tests/jaeger/bug601982.js
js/src/trace-test/tests/jaeger/bug604427.js
js/src/trace-test/tests/jaeger/compare-wrong-1.js
js/src/trace-test/tests/jaeger/crash-on-compare.js
js/src/trace-test/tests/jaeger/deepBailAfterRunTracer.js
js/src/trace-test/tests/jaeger/fused-eq-ifeq.js
js/src/trace-test/tests/jaeger/getelem-sanity-1.js
js/src/trace-test/tests/jaeger/getelem-sanity-2.js
js/src/trace-test/tests/jaeger/getelem-sanity-3.js
js/src/trace-test/tests/jaeger/getelem-sanity-4.js
js/src/trace-test/tests/jaeger/getelem-sanity-5.js
js/src/trace-test/tests/jaeger/getelem-sanity-6.js
js/src/trace-test/tests/jaeger/getelem-sanity-7.js
js/src/trace-test/tests/jaeger/getelem-sanity-int-1.js
js/src/trace-test/tests/jaeger/getelem-sanity-int-2.js
js/src/trace-test/tests/jaeger/getelem-sanity-int-3.js
js/src/trace-test/tests/jaeger/globalOptimize-1.js
js/src/trace-test/tests/jaeger/instanceOfWithKnownTypes.js
js/src/trace-test/tests/jaeger/modWithConstLhs.js
js/src/trace-test/tests/jaeger/mulNegZero.js
js/src/trace-test/tests/jaeger/negation.js
js/src/trace-test/tests/jaeger/regalloc-1.js
js/src/trace-test/tests/jaeger/rsh-sanity-1.js
js/src/trace-test/tests/jaeger/scriptedICs-1.js
js/src/trace-test/tests/jaeger/strictModeSetUndefinedVar.js
js/src/trace-test/tests/jaeger/subCommutativity.js
js/src/trace-test/tests/jaeger/testAddStringObject.js
js/src/trace-test/tests/jaeger/testBug550743.js
js/src/trace-test/tests/jaeger/unsignedShiftZero.js
js/src/trace-test/tests/jaeger/xor-sanity.js
js/src/trace-test/tests/pic/bug558099.js
js/src/trace-test/tests/pic/bug558616.js
js/src/trace-test/tests/pic/bug582899.js
js/src/trace-test/tests/pic/bug584642.js
js/src/trace-test/tests/pic/bug595706.js
js/src/trace-test/tests/pic/call_self.js
js/src/trace-test/tests/pic/densearray.js
js/src/trace-test/tests/pic/fuzz1.js
js/src/trace-test/tests/pic/fuzz2.js
js/src/trace-test/tests/pic/fuzz3.js
js/src/trace-test/tests/pic/grandproto.js
js/src/trace-test/tests/pic/length_array.js
js/src/trace-test/tests/pic/length_mix.js
js/src/trace-test/tests/pic/length_object.js
js/src/trace-test/tests/pic/length_string.js
js/src/trace-test/tests/pic/proto1.js
js/src/trace-test/tests/pic/proto3.js
js/src/trace-test/tests/pic/proto_self.js
js/src/trace-test/tests/pic/self1.js
js/src/trace-test/tests/pic/self2.js
js/src/trace-test/tests/pic/self3.js
js/src/trace-test/tests/pic/self8.js
js/src/trace-test/tests/pic/set-assign.js
js/src/trace-test/tests/pic/set1.js
js/src/trace-test/tests/pic/set2.js
js/src/trace-test/tests/pic/shape_regen.js
js/src/trace-test/tests/pic/thisprop.js
js/src/trace-test/tests/sunspider/check-3d-cube.js
js/src/trace-test/tests/sunspider/check-3d-morph.js
js/src/trace-test/tests/sunspider/check-3d-raytrace.js
js/src/trace-test/tests/sunspider/check-access-binary-trees.js
js/src/trace-test/tests/sunspider/check-access-fannkuch.js
js/src/trace-test/tests/sunspider/check-access-nbody.js
js/src/trace-test/tests/sunspider/check-access-nsieve.js
js/src/trace-test/tests/sunspider/check-bitops-3bit-bits-in-byte.js
js/src/trace-test/tests/sunspider/check-bitops-bits-in-byte.js
js/src/trace-test/tests/sunspider/check-bitops-bitwise-and.js
js/src/trace-test/tests/sunspider/check-bitops-nsieve-bits.js
js/src/trace-test/tests/sunspider/check-controlflow-recursive.js
js/src/trace-test/tests/sunspider/check-crypto-aes.js
js/src/trace-test/tests/sunspider/check-crypto-md5.js
js/src/trace-test/tests/sunspider/check-crypto-sha1.js
js/src/trace-test/tests/sunspider/check-date-format-tofte.js
js/src/trace-test/tests/sunspider/check-date-format-xparb.js
js/src/trace-test/tests/sunspider/check-math-cordic.js
js/src/trace-test/tests/sunspider/check-math-partial-sums.js
js/src/trace-test/tests/sunspider/check-math-spectral-norm.js
js/src/trace-test/tests/sunspider/check-mont.js
js/src/trace-test/tests/sunspider/check-regexp-dna.js
js/src/trace-test/tests/sunspider/check-string-fasta.js
js/src/trace-test/tests/sunspider/check-string-tagcloud.js
js/src/trace-test/tests/sunspider/check-string-unpack-code.js
js/src/trace-test/tests/v8-v5/check-crypto.js
js/src/trace-test/tests/v8-v5/check-deltablue.js
js/src/trace-test/tests/v8-v5/check-earley-boyer.js
js/src/trace-test/tests/v8-v5/check-raytrace.js
js/src/trace-test/tests/v8-v5/check-regexp.js
js/src/trace-test/tests/v8-v5/check-richards.js
js/src/trace-test/tests/v8-v5/check-splay.js
js/src/trace-test/trace_test.py
media/libsydneyaudio/bug526411_latency.patch
services/sync/tests/unit/head_appinfo.js
testing/mochitest/static/bug100533_iframe.html
testing/mochitest/static/bug100533_load.html
testing/mochitest/static/bug277724_iframe1.html
testing/mochitest/static/bug277724_iframe2.xhtml
testing/mochitest/static/bug340800_iframe.txt
testing/mochitest/static/bug344830_testembed.svg
testing/mochitest/static/nnc_lockup.gif
testing/mozmill/jsbridge-2.4.0/MANIFEST.in
testing/mozmill/jsbridge-2.4.0/PKG-INFO
testing/mozmill/jsbridge-2.4.0/jsbridge/__init__.py
testing/mozmill/jsbridge-2.4.0/jsbridge/extension/chrome.manifest
testing/mozmill/jsbridge-2.4.0/jsbridge/extension/chrome/content/overlay.js
testing/mozmill/jsbridge-2.4.0/jsbridge/extension/chrome/content/overlay.xul
testing/mozmill/jsbridge-2.4.0/jsbridge/extension/components/cmdarg.js
testing/mozmill/jsbridge-2.4.0/jsbridge/extension/install.rdf
testing/mozmill/jsbridge-2.4.0/jsbridge/extension/resource/modules/events.js
testing/mozmill/jsbridge-2.4.0/jsbridge/extension/resource/modules/init.js
testing/mozmill/jsbridge-2.4.0/jsbridge/extension/resource/modules/json2.js
testing/mozmill/jsbridge-2.4.0/jsbridge/extension/resource/modules/server.js
testing/mozmill/jsbridge-2.4.0/jsbridge/jsobjects.py
testing/mozmill/jsbridge-2.4.0/jsbridge/network.py
testing/mozmill/jsbridge-2.4.0/setup.cfg
testing/mozmill/jsbridge-2.4.0/setup.py
testing/mozmill/mozmill-1.5.0/MANIFEST.in
testing/mozmill/mozmill-1.5.0/PKG-INFO
testing/mozmill/mozmill-1.5.0/docs/Makefile
testing/mozmill/mozmill-1.5.0/docs/_build/doctrees/environment.pickle
testing/mozmill/mozmill-1.5.0/docs/_build/doctrees/index.doctree
testing/mozmill/mozmill-1.5.0/docs/_build/html/_sources/index.txt
testing/mozmill/mozmill-1.5.0/docs/_build/html/_static/contents.png
testing/mozmill/mozmill-1.5.0/docs/_build/html/_static/default.css
testing/mozmill/mozmill-1.5.0/docs/_build/html/_static/doctools.js
testing/mozmill/mozmill-1.5.0/docs/_build/html/_static/file.png
testing/mozmill/mozmill-1.5.0/docs/_build/html/_static/jquery.js
testing/mozmill/mozmill-1.5.0/docs/_build/html/_static/minus.png
testing/mozmill/mozmill-1.5.0/docs/_build/html/_static/navigation.png
testing/mozmill/mozmill-1.5.0/docs/_build/html/_static/plus.png
testing/mozmill/mozmill-1.5.0/docs/_build/html/_static/pygments.css
testing/mozmill/mozmill-1.5.0/docs/_build/html/_static/rightsidebar.css
testing/mozmill/mozmill-1.5.0/docs/_build/html/_static/searchtools.js
testing/mozmill/mozmill-1.5.0/docs/_build/html/_static/sphinxdoc.css
testing/mozmill/mozmill-1.5.0/docs/_build/html/_static/stickysidebar.css
testing/mozmill/mozmill-1.5.0/docs/_build/html/_static/traditional.css
testing/mozmill/mozmill-1.5.0/docs/_build/html/genindex.html
testing/mozmill/mozmill-1.5.0/docs/_build/html/index.html
testing/mozmill/mozmill-1.5.0/docs/_build/html/modindex.html
testing/mozmill/mozmill-1.5.0/docs/_build/html/objects.inv
testing/mozmill/mozmill-1.5.0/docs/_build/html/search.html
testing/mozmill/mozmill-1.5.0/docs/_build/html/searchindex.js
testing/mozmill/mozmill-1.5.0/docs/conf.py
testing/mozmill/mozmill-1.5.0/docs/index.rst
testing/mozmill/mozmill-1.5.0/mozmill/__init__.py
testing/mozmill/mozmill-1.5.0/mozmill/extension/build.xml
testing/mozmill/mozmill-1.5.0/mozmill/extension/chrome-jar.manifest
testing/mozmill/mozmill-1.5.0/mozmill/extension/chrome.manifest
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/chrome.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/fg.menu.css
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/mozmill.css
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/smoothness/images/ui-icons_222222_256x240.png
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/smoothness/images/ui-icons_2e83ff_256x240.png
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/smoothness/images/ui-icons_454545_256x240.png
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/smoothness/images/ui-icons_888888_256x240.png
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/smoothness/images/ui-icons_cd0a0a_256x240.png
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/smoothness/jquery-ui-1.7.1.custom.css
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/dx.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/dxwindow.xul
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/editor/bespin/BespinEmbedded.css
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/editor/bespin/BespinEmbedded.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/editor/bespin/BespinMain.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/editor/bespin/BespinWorker.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/editor/bespin/resources/screen_theme/theme.less
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/editor/editor.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/img/wmIcon.png
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/inspector.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/jquery/fg.menu.css
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/jquery/fg.menu.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/jquery/jquery-1.3.2.min.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/jquery/jquery-ui-1.7.1.custom.min.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/jquery/jquery.ui.core.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/jquery/jquery.ui.menu.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/menus.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/mozmill.html
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/mozmill.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/mozmill.xul
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/output.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/overlay.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/overlay.xul
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/overlay_tb.xul
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/prefs.xul
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/rec.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/shell.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/shortcuts.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/testwindow.xul
testing/mozmill/mozmill-1.5.0/mozmill/extension/content/ui.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/defaults/preferences/debug.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/install.rdf
testing/mozmill/mozmill-1.5.0/mozmill/extension/locale/en-US/mozmill.dtd
testing/mozmill/mozmill-1.5.0/mozmill/extension/locale/en-US/overlay.dtd
testing/mozmill/mozmill-1.5.0/mozmill/extension/mozmill-1.4.2b5.xpi
testing/mozmill/mozmill-1.5.0/mozmill/extension/readme.txt
testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/modules/controller.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/modules/elementslib.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/modules/events.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/modules/frame.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/modules/init.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/modules/inspection.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/modules/jum.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/modules/mozmill.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/modules/utils.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/stdlib/EventUtils.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/stdlib/arrays.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/stdlib/dom.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/stdlib/httpd.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/stdlib/json2.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/stdlib/objects.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/stdlib/os.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/stdlib/strings.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/stdlib/withs.js
testing/mozmill/mozmill-1.5.0/mozmill/extension/skin/chrome.css
testing/mozmill/mozmill-1.5.0/mozmill/extension/skin/overlay.css
testing/mozmill/mozmill-1.5.0/mozmill/extension/zipexclude.lst
testing/mozmill/mozmill-1.5.0/setup.cfg
testing/mozmill/mozmill-1.5.0/setup.py
testing/mozmill/mozmill-1.5.0/test/test_python_callbacks_callbacks.py
testing/mozmill/mozrunner-2.5.1/PKG-INFO
testing/mozmill/mozrunner-2.5.1/mozrunner/__init__.py
testing/mozmill/mozrunner-2.5.1/mozrunner/killableprocess.py
testing/mozmill/mozrunner-2.5.1/mozrunner/qijo.py
testing/mozmill/mozrunner-2.5.1/mozrunner/winprocess.py
testing/mozmill/mozrunner-2.5.1/mozrunner/wpk.py
testing/mozmill/mozrunner-2.5.1/setup.cfg
testing/mozmill/mozrunner-2.5.1/setup.py
testing/mozmill/tests/firefox/testPrivateBrowsing/testTabRestoration.js
toolkit/components/places/src/SQLFunctions.cpp
toolkit/components/places/src/SQLFunctions.h
toolkit/components/places/src/nsNavBookmarks.cpp
toolkit/components/places/src/nsPlacesAutoComplete.js
--- a/Makefile.in
+++ b/Makefile.in
@@ -167,17 +167,17 @@ SYM_STORE_SOURCE_DIRS := $(topsrcdir)
 
 include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
 
 ifdef MOZ_SYMBOLS_EXTRA_BUILDID
 EXTRA_BUILDID := -$(MOZ_SYMBOLS_EXTRA_BUILDID)
 endif
 
 SYMBOL_INDEX_NAME = \
-  $(MOZ_APP_NAME)-$(MOZ_APP_VERSION)-$(OS_ARCH)-$(BUILDID)$(EXTRA_BUILDID)-symbols.txt
+  $(MOZ_APP_NAME)-$(MOZ_APP_VERSION)-$(OS_TARGET)-$(BUILDID)$(EXTRA_BUILDID)-symbols.txt
 
 buildsymbols:
 ifdef MOZ_CRASHREPORTER
 	echo building symbol store
 	$(RM) -rf $(DIST)/crashreporter-symbols
 	$(RM) -f "$(DIST)/$(SYMBOL_ARCHIVE_BASENAME).zip"
 	$(NSINSTALL) -D $(DIST)/crashreporter-symbols
 	$(PYTHON) $(topsrcdir)/toolkit/crashreporter/tools/symbolstore.py \
--- a/accessible/public/nsIAccessibilityService.h
+++ b/accessible/public/nsIAccessibilityService.h
@@ -135,51 +135,49 @@ public:
   /**
    * Adds/remove ATK root accessible for gtk+ native window to/from children
    * of the application accessible.
    */
   virtual nsAccessible* AddNativeRootAccessible(void* aAtkAccessible) = 0;
   virtual void RemoveNativeRootAccessible(nsAccessible* aRootAccessible) = 0;
 
   /**
-   * Used to describe sort of changes leading to accessible tree invalidation.
+   * Notification used to update the accessible tree when new content is
+   * inserted.
    */
-  enum {
-    NODE_APPEND = 0x01,
-    NODE_REMOVE = 0x02,
-    NODE_SIGNIFICANT_CHANGE = 0x03,
-    FRAME_SHOW = 0x04,
-    FRAME_HIDE = 0x05,
-    FRAME_SIGNIFICANT_CHANGE = 0x06
-  };
+  virtual void ContentRangeInserted(nsIPresShell* aPresShell,
+                                    nsIContent* aContainer,
+                                    nsIContent* aStartChild,
+                                    nsIContent* aEndChild) = 0;
 
   /**
-   * Invalidate the accessible tree when DOM tree or frame tree is changed.
-   *
-   * @param aPresShell   [in] the presShell where changes occurred
-   * @param aContent     [in] the affected DOM content
-   * @param aChangeType  [in] the change type (see constants declared above)
+   * Notification used to update the accessible tree when content is removed.
    */
-  virtual nsresult InvalidateSubtreeFor(nsIPresShell *aPresShell,
-                                        nsIContent *aContent,
-                                        PRUint32 aChangeType) = 0;
+  virtual void ContentRemoved(nsIPresShell* aPresShell, nsIContent* aContainer,
+                              nsIContent* aChild) = 0;
 
   /**
    * Notify accessibility that anchor jump has been accomplished to the given
    * target. Used by layout.
    */
   virtual void NotifyOfAnchorJumpTo(nsIContent *aTarget) = 0;
 
   /**
    * Notify the accessibility service that the given presshell is
    * being destroyed.
    */
   virtual void PresShellDestroyed(nsIPresShell *aPresShell) = 0;
 
   /**
+   * Recreate an accessible for the given content node in the presshell.
+   */
+  virtual void RecreateAccessible(nsIPresShell* aPresShell,
+                                  nsIContent* aContent) = 0;
+
+  /**
    * Fire accessible event of the given type for the given target.
    *
    * @param aEvent   [in] accessible event type
    * @param aTarget  [in] target of accessible event
    */
   virtual void FireAccessibleEvent(PRUint32 aEvent, nsAccessible* aTarget) = 0;
 };
 
--- a/accessible/src/base/AccEvent.cpp
+++ b/accessible/src/base/AccEvent.cpp
@@ -59,29 +59,25 @@
 ////////////////////////////////////////////////////////////////////////////////
 // AccEvent
 ////////////////////////////////////////////////////////////////////////////////
 
 ////////////////////////////////////////////////////////////////////////////////
 // AccEvent constructors
 
 AccEvent::AccEvent(PRUint32 aEventType, nsAccessible* aAccessible,
-                   PRBool aIsAsync, EIsFromUserInput aIsFromUserInput,
-                   EEventRule aEventRule) :
-  mEventType(aEventType), mEventRule(aEventRule), mIsAsync(aIsAsync),
-  mAccessible(aAccessible)
+                   EIsFromUserInput aIsFromUserInput, EEventRule aEventRule) :
+  mEventType(aEventType), mEventRule(aEventRule), mAccessible(aAccessible)
 {
   CaptureIsFromUserInput(aIsFromUserInput);
 }
 
 AccEvent::AccEvent(PRUint32 aEventType, nsINode* aNode,
-                   PRBool aIsAsync, EIsFromUserInput aIsFromUserInput,
-                   EEventRule aEventRule) :
-  mEventType(aEventType), mEventRule(aEventRule), mIsAsync(aIsAsync),
-  mNode(aNode)
+                   EIsFromUserInput aIsFromUserInput, EEventRule aEventRule) :
+  mEventType(aEventType), mEventRule(aEventRule), mNode(aNode)
 {
   CaptureIsFromUserInput(aIsFromUserInput);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AccEvent public methods
 
 nsAccessible *
@@ -213,58 +209,27 @@ AccEvent::CaptureIsFromUserInput(EIsFrom
     return;
   }
 
   mIsFromUserInput = esm->IsHandlingUserInputExternal();
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////
-// AccReorderEvent
-////////////////////////////////////////////////////////////////////////////////
-
-AccReorderEvent::
-  AccReorderEvent(nsAccessible* aAccTarget, PRBool aIsAsynch,
-                  PRBool aIsUnconditional, nsINode* aReasonNode) :
-  AccEvent(::nsIAccessibleEvent::EVENT_REORDER, aAccTarget,
-           aIsAsynch, eAutoDetect, AccEvent::eCoalesceFromSameSubtree),
-  mUnconditionalEvent(aIsUnconditional), mReasonNode(aReasonNode)
-{
-}
-
-PRBool
-AccReorderEvent::IsUnconditionalEvent()
-{
-  return mUnconditionalEvent;
-}
-
-PRBool
-AccReorderEvent::HasAccessibleInReasonSubtree()
-{
-  if (!mReasonNode)
-    return PR_FALSE;
-
-  nsAccessible *accessible = GetAccService()->GetAccessible(mReasonNode);
-  return accessible || nsAccUtils::HasAccessibleChildren(mReasonNode);
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
 // AccStateChangeEvent
 ////////////////////////////////////////////////////////////////////////////////
 
 // Note: we pass in eAllowDupes to the base class because we don't currently
 // support correct state change coalescence (XXX Bug 569356). Also we need to
 // decide how to coalesce events created via accessible (instead of node).
 AccStateChangeEvent::
   AccStateChangeEvent(nsAccessible* aAccessible,
                       PRUint32 aState, PRBool aIsExtraState,
-                      PRBool aIsEnabled, PRBool aIsAsynch,
-                      EIsFromUserInput aIsFromUserInput):
-  AccEvent(nsIAccessibleEvent::EVENT_STATE_CHANGE, aAccessible, aIsAsynch,
+                      PRBool aIsEnabled, EIsFromUserInput aIsFromUserInput):
+  AccEvent(nsIAccessibleEvent::EVENT_STATE_CHANGE, aAccessible,
            aIsFromUserInput, eAllowDupes),
   mState(aState), mIsExtraState(aIsExtraState), mIsEnabled(aIsEnabled)
 {
 }
 
 AccStateChangeEvent::
   AccStateChangeEvent(nsINode* aNode, PRUint32 aState, PRBool aIsExtraState,
                       PRBool aIsEnabled):
@@ -310,67 +275,92 @@ AccStateChangeEvent::CreateXPCOMObject()
 // node. This means we won't try to create an accessible based on the node when
 // we are ready to fire the event and so we will no longer assert at that point
 // if the node was removed from the document. Either way, the AT won't work with
 // a defunct accessible so the behaviour should be equivalent.
 // XXX revisit this when coalescence is faster (eCoalesceFromSameSubtree)
 AccTextChangeEvent::
   AccTextChangeEvent(nsAccessible* aAccessible, PRInt32 aStart,
                      nsAString& aModifiedText, PRBool aIsInserted,
-                     PRBool aIsAsynch, EIsFromUserInput aIsFromUserInput)
+                     EIsFromUserInput aIsFromUserInput)
   : AccEvent(aIsInserted ?
              static_cast<PRUint32>(nsIAccessibleEvent::EVENT_TEXT_INSERTED) :
              static_cast<PRUint32>(nsIAccessibleEvent::EVENT_TEXT_REMOVED),
-             aAccessible, aIsAsynch, aIsFromUserInput, eAllowDupes)
+             aAccessible, aIsFromUserInput, eAllowDupes)
   , mStart(aStart)
   , mIsInserted(aIsInserted)
   , mModifiedText(aModifiedText)
 {
 }
 
 already_AddRefed<nsAccEvent>
 AccTextChangeEvent::CreateXPCOMObject()
 {
   nsAccEvent* event = new nsAccTextChangeEvent(this);
   NS_IF_ADDREF(event);
   return event;
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////
+// AccMutationEvent
+////////////////////////////////////////////////////////////////////////////////
+
+AccMutationEvent::
+  AccMutationEvent(PRUint32 aEventType, nsAccessible* aTarget,
+                   nsINode* aTargetNode, EIsFromUserInput aIsFromUserInput) :
+  AccEvent(aEventType, aTarget, aIsFromUserInput, eCoalesceFromSameSubtree)
+{
+  mNode = aTargetNode;
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
 // AccHideEvent
 ////////////////////////////////////////////////////////////////////////////////
 
 AccHideEvent::
   AccHideEvent(nsAccessible* aTarget, nsINode* aTargetNode,
-               PRBool aIsAsynch, EIsFromUserInput aIsFromUserInput) :
-  AccEvent(nsIAccessibleEvent::EVENT_HIDE, aTarget, aIsAsynch,
-           aIsFromUserInput, eCoalesceFromSameSubtree)
+               EIsFromUserInput aIsFromUserInput) :
+  AccMutationEvent(::nsIAccessibleEvent::EVENT_HIDE, aTarget, aTargetNode,
+                   aIsFromUserInput)
 {
-  mNode = aTargetNode;
   mParent = mAccessible->GetCachedParent();
   mNextSibling = mAccessible->GetCachedNextSibling();
   mPrevSibling = mAccessible->GetCachedPrevSibling();
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////
+// AccShowEvent
+////////////////////////////////////////////////////////////////////////////////
+
+AccShowEvent::
+  AccShowEvent(nsAccessible* aTarget, nsINode* aTargetNode,
+               EIsFromUserInput aIsFromUserInput) :
+  AccMutationEvent(::nsIAccessibleEvent::EVENT_SHOW, aTarget, aTargetNode,
+                   aIsFromUserInput)
+{
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
 // AccCaretMoveEvent
 ////////////////////////////////////////////////////////////////////////////////
 
 AccCaretMoveEvent::
   AccCaretMoveEvent(nsAccessible* aAccessible, PRInt32 aCaretOffset) :
-  AccEvent(::nsIAccessibleEvent::EVENT_TEXT_CARET_MOVED, aAccessible, PR_TRUE), // Currently always asynch
+  AccEvent(::nsIAccessibleEvent::EVENT_TEXT_CARET_MOVED, aAccessible),
   mCaretOffset(aCaretOffset)
 {
 }
 
 AccCaretMoveEvent::
   AccCaretMoveEvent(nsINode* aNode) :
-  AccEvent(::nsIAccessibleEvent::EVENT_TEXT_CARET_MOVED, aNode, PR_TRUE), // Currently always asynch
+  AccEvent(::nsIAccessibleEvent::EVENT_TEXT_CARET_MOVED, aNode),
   mCaretOffset(-1)
 {
 }
 
 already_AddRefed<nsAccEvent>
 AccCaretMoveEvent::CreateXPCOMObject()
 {
   nsAccEvent* event = new nsAccCaretMoveEvent(this);
@@ -380,19 +370,18 @@ AccCaretMoveEvent::CreateXPCOMObject()
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // AccTableChangeEvent
 ////////////////////////////////////////////////////////////////////////////////
 
 AccTableChangeEvent::
   AccTableChangeEvent(nsAccessible* aAccessible, PRUint32 aEventType,
-                      PRInt32 aRowOrColIndex, PRInt32 aNumRowsOrCols,
-                      PRBool aIsAsynch) :
-  AccEvent(aEventType, aAccessible, aIsAsynch),
+                      PRInt32 aRowOrColIndex, PRInt32 aNumRowsOrCols) :
+  AccEvent(aEventType, aAccessible),
   mRowOrColIndex(aRowOrColIndex), mNumRowsOrCols(aNumRowsOrCols)
 {
 }
 
 already_AddRefed<nsAccEvent>
 AccTableChangeEvent::CreateXPCOMObject()
 {
   nsAccEvent* event = new nsAccTableChangeEvent(this);
--- a/accessible/src/base/AccEvent.h
+++ b/accessible/src/base/AccEvent.h
@@ -36,16 +36,18 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #ifndef _AccEvent_H_
 #define _AccEvent_H_
 
+#include "nsIAccessibleEvent.h"
+
 #include "nsAccessible.h"
 
 class nsAccEvent;
 class nsDocAccessible;
 
 // Constants used to point whether the event is from user input.
 enum EIsFromUserInput
 {
@@ -85,49 +87,48 @@ public:
      eRemoveDupes,
 
      // eDoNotEmit : This event is confirmed as a duplicate, do not emit it.
      eDoNotEmit
   };
 
   // Initialize with an nsIAccessible
   AccEvent(PRUint32 aEventType, nsAccessible* aAccessible,
-           PRBool aIsAsynch = PR_FALSE,
            EIsFromUserInput aIsFromUserInput = eAutoDetect,
            EEventRule aEventRule = eRemoveDupes);
   // Initialize with an nsIDOMNode
-  AccEvent(PRUint32 aEventType, nsINode* aNode, PRBool aIsAsynch = PR_FALSE,
+  AccEvent(PRUint32 aEventType, nsINode* aNode,
            EIsFromUserInput aIsFromUserInput = eAutoDetect,
            EEventRule aEventRule = eRemoveDupes);
   virtual ~AccEvent() {}
 
   // AccEvent
   PRUint32 GetEventType() const { return mEventType; }
   EEventRule GetEventRule() const { return mEventRule; }
-  PRBool IsAsync() const { return mIsAsync; }
   PRBool IsFromUserInput() const { return mIsFromUserInput; }
 
   nsAccessible *GetAccessible();
   nsDocAccessible* GetDocAccessible();
   nsINode* GetNode();
 
   /**
    * Create and return an XPCOM object for accessible event object.
    */
   virtual already_AddRefed<nsAccEvent> CreateXPCOMObject();
 
   /**
    * Down casting.
    */
   enum EventGroup {
     eGenericEvent,
-    eReorderEvent,
     eStateChangeEvent,
     eTextChangeEvent,
+    eMutationEvent,
     eHideEvent,
+    eShowEvent,
     eCaretMoveEvent,
     eTableChangeEvent
   };
 
   static const EventGroup kEventGroup = eGenericEvent;
   virtual unsigned int GetEventGroups() const
   {
     return 1U << eGenericEvent;
@@ -149,66 +150,32 @@ protected:
    * Determine whether the event is from user input by event state manager if
    * it's not pointed explicetly.
    */
   void CaptureIsFromUserInput(EIsFromUserInput aIsFromUserInput);
 
   PRBool mIsFromUserInput;
   PRUint32 mEventType;
   EEventRule mEventRule;
-  PRPackedBool mIsAsync;
   nsRefPtr<nsAccessible> mAccessible;
   nsCOMPtr<nsINode> mNode;
 
   friend class nsAccEventQueue;
 };
 
 
 /**
- * Accessible reorder event.
- */
-class AccReorderEvent : public AccEvent
-{
-public:
-  AccReorderEvent(nsAccessible* aAccTarget, PRBool aIsAsynch,
-                  PRBool aIsUnconditional, nsINode* aReasonNode);
-
-  // AccEvent
-  static const EventGroup kEventGroup = eReorderEvent;
-  virtual unsigned int GetEventGroups() const
-  {
-    return AccEvent::GetEventGroups() | (1U << eReorderEvent);
-  }
-
-  // AccReorderEvent
-  /**
-   * Return true if event is unconditional, i.e. must be fired.
-   */
-  PRBool IsUnconditionalEvent();
-
-  /**
-   * Return true if changed DOM node has accessible in its tree.
-   */
-  PRBool HasAccessibleInReasonSubtree();
-
-private:
-  PRBool mUnconditionalEvent;
-  nsCOMPtr<nsINode> mReasonNode;
-};
-
-
-/**
  * Accessible state change event.
  */
 class AccStateChangeEvent: public AccEvent
 {
 public:
   AccStateChangeEvent(nsAccessible* aAccessible,
                       PRUint32 aState, PRBool aIsExtraState,
-                      PRBool aIsEnabled, PRBool aIsAsynch = PR_FALSE,
+                      PRBool aIsEnabled,
                       EIsFromUserInput aIsFromUserInput = eAutoDetect);
 
   AccStateChangeEvent(nsINode* aNode, PRUint32 aState, PRBool aIsExtraState,
                       PRBool aIsEnabled);
 
   AccStateChangeEvent(nsINode* aNode, PRUint32 aState, PRBool aIsExtraState);
 
   // AccEvent
@@ -234,18 +201,17 @@ private:
 
 /**
  * Accessible text change event.
  */
 class AccTextChangeEvent: public AccEvent
 {
 public:
   AccTextChangeEvent(nsAccessible* aAccessible, PRInt32 aStart,
-                     nsAString& aModifiedText,
-                     PRBool aIsInserted, PRBool aIsAsynch = PR_FALSE,
+                     nsAString& aModifiedText, PRBool aIsInserted,
                      EIsFromUserInput aIsFromUserInput = eAutoDetect);
 
   // AccEvent
   virtual already_AddRefed<nsAccEvent> CreateXPCOMObject();
 
   static const EventGroup kEventGroup = eTextChangeEvent;
   virtual unsigned int GetEventGroups() const
   {
@@ -264,42 +230,86 @@ private:
   PRBool mIsInserted;
   nsString mModifiedText;
 
   friend class nsAccEventQueue;
 };
 
 
 /**
- * Accessible hide events.
+ * Base class for show and hide accessible events.
  */
-class AccHideEvent : public AccEvent
+class AccMutationEvent: public AccEvent
+{
+public:
+  AccMutationEvent(PRUint32 aEventType, nsAccessible* aTarget,
+                   nsINode* aTargetNode, EIsFromUserInput aIsFromUserInput);
+
+  // Event
+  static const EventGroup kEventGroup = eMutationEvent;
+  virtual unsigned int GetEventGroups() const
+  {
+    return AccEvent::GetEventGroups() | (1U << eMutationEvent);
+  }
+
+  // MutationEvent
+  bool IsShow() const { return mEventType == nsIAccessibleEvent::EVENT_SHOW; }
+  bool IsHide() const { return mEventType == nsIAccessibleEvent::EVENT_HIDE; }
+
+protected:
+  nsRefPtr<AccTextChangeEvent> mTextChangeEvent;
+
+  friend class nsAccEventQueue;
+};
+
+
+/**
+ * Accessible hide event.
+ */
+class AccHideEvent: public AccMutationEvent
 {
 public:
   AccHideEvent(nsAccessible* aTarget, nsINode* aTargetNode,
-               PRBool aIsAsynch, EIsFromUserInput aIsFromUserInput);
+               EIsFromUserInput aIsFromUserInput);
 
   // Event
   static const EventGroup kEventGroup = eHideEvent;
   virtual unsigned int GetEventGroups() const
   {
-    return AccEvent::GetEventGroups() | (1U << eHideEvent);
+    return AccMutationEvent::GetEventGroups() | (1U << eHideEvent);
   }
 
 protected:
   nsRefPtr<nsAccessible> mParent;
   nsRefPtr<nsAccessible> mNextSibling;
   nsRefPtr<nsAccessible> mPrevSibling;
-  nsRefPtr<AccTextChangeEvent> mTextChangeEvent;
 
   friend class nsAccEventQueue;
 };
 
 
 /**
+ * Accessible show event.
+ */
+class AccShowEvent: public AccMutationEvent
+{
+public:
+  AccShowEvent(nsAccessible* aTarget, nsINode* aTargetNode,
+               EIsFromUserInput aIsFromUserInput);
+
+  // Event
+  static const EventGroup kEventGroup = eShowEvent;
+  virtual unsigned int GetEventGroups() const
+  {
+    return AccMutationEvent::GetEventGroups() | (1U << eShowEvent);
+  }
+};
+
+
+/**
  * Accessible caret move event.
  */
 class AccCaretMoveEvent: public AccEvent
 {
 public:
   AccCaretMoveEvent(nsAccessible* aAccessible, PRInt32 aCaretOffset);
   AccCaretMoveEvent(nsINode* aNode);
 
@@ -322,18 +332,17 @@ private:
 
 /**
  * Accessible table change event.
  */
 class AccTableChangeEvent : public AccEvent
 {
 public:
   AccTableChangeEvent(nsAccessible* aAccessible, PRUint32 aEventType,
-                      PRInt32 aRowOrColIndex, PRInt32 aNumRowsOrCols,
-                      PRBool aIsAsynch);
+                      PRInt32 aRowOrColIndex, PRInt32 aNumRowsOrCols);
 
   // AccEvent
   virtual already_AddRefed<nsAccEvent> CreateXPCOMObject();
 
   static const EventGroup kEventGroup = eTableChangeEvent;
   virtual unsigned int GetEventGroups() const
   {
     return AccEvent::GetEventGroups() | (1U << eTableChangeEvent);
--- a/accessible/src/base/nsAccDocManager.cpp
+++ b/accessible/src/base/nsAccDocManager.cpp
@@ -67,29 +67,28 @@ nsDocAccessible*
 nsAccDocManager::GetDocAccessible(nsIDocument *aDocument)
 {
   if (!aDocument)
     return nsnull;
 
   // Ensure CacheChildren is called before we query cache.
   nsAccessNode::GetApplicationAccessible()->EnsureChildren();
 
-  nsDocAccessible *docAcc =
-    mDocAccessibleCache.GetWeak(static_cast<void*>(aDocument));
+  nsDocAccessible* docAcc = mDocAccessibleCache.GetWeak(aDocument);
   if (docAcc)
     return docAcc;
 
   return CreateDocOrRootAccessible(aDocument);
 }
 
 nsAccessible*
-nsAccDocManager::FindAccessibleInCache(void *aUniqueID) const
+nsAccDocManager::FindAccessibleInCache(nsINode* aNode) const
 {
   nsSearchAccessibleInCacheArg arg;
-    arg.mUniqueID = aUniqueID;
+  arg.mNode = aNode;
 
   mDocAccessibleCache.EnumerateRead(SearchAccessibleInDocCache,
                                     static_cast<void*>(&arg));
 
   return arg.mAccessible;
 }
 
 void
@@ -131,27 +130,26 @@ nsAccDocManager::Shutdown()
     progress->RemoveProgressListener(static_cast<nsIWebProgressListener*>(this));
 
   ClearDocCache();
 }
 
 void
 nsAccDocManager::ShutdownDocAccessible(nsIDocument *aDocument)
 {
-  nsDocAccessible* docAccessible =
-    mDocAccessibleCache.GetWeak(static_cast<void*>(aDocument));
+  nsDocAccessible* docAccessible = mDocAccessibleCache.GetWeak(aDocument);
   if (!docAccessible)
     return;
 
   // We're allowed to not remove listeners when accessible document is shutdown
   // since we don't keep strong reference on chrome event target and listeners
   // are removed automatically when chrome event target goes away.
 
   docAccessible->Shutdown();
-  mDocAccessibleCache.Remove(static_cast<void*>(aDocument));
+  mDocAccessibleCache.Remove(aDocument);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsISupports
 
 NS_IMPL_THREADSAFE_ISUPPORTS3(nsAccDocManager,
                               nsIWebProgressListener,
                               nsIDOMEventListener,
@@ -210,18 +208,17 @@ nsAccDocManager::OnStateChange(nsIWebPro
 
   // Document loading was started.
   NS_LOG_ACCDOCLOAD("start document loading", aWebProgress, aRequest,
                     aStateFlags)
 
   if (!IsEventTargetDocument(document))
     return NS_OK;
 
-  nsDocAccessible *docAcc =
-    mDocAccessibleCache.GetWeak(static_cast<void*>(document));
+  nsDocAccessible* docAcc = mDocAccessibleCache.GetWeak(document);
   if (!docAcc)
     return NS_OK;
 
   nsCOMPtr<nsIWebNavigation> webNav(do_GetInterface(DOMWindow));
   nsCOMPtr<nsIDocShell> docShell(do_QueryInterface(webNav));
   NS_ENSURE_STATE(docShell);
 
   // Fire reload and state busy events on existing document accessible while
@@ -341,45 +338,35 @@ nsAccDocManager::HandleEvent(nsIDOMEvent
 
 void
 nsAccDocManager::HandleDOMDocumentLoad(nsIDocument *aDocument,
                                        PRUint32 aLoadEventType,
                                        PRBool aMarkAsLoaded)
 {
   // Document accessible can be created before we were notified the DOM document
   // was loaded completely. However if it's not created yet then create it.
-  nsDocAccessible *docAcc =
-    mDocAccessibleCache.GetWeak(static_cast<void*>(aDocument));
-
+  nsDocAccessible* docAcc = mDocAccessibleCache.GetWeak(aDocument);
   if (!docAcc) {
     docAcc = CreateDocOrRootAccessible(aDocument);
     NS_ASSERTION(docAcc, "Can't create document accessible!");
     if (!docAcc)
       return;
   }
 
   if (aMarkAsLoaded)
     docAcc->MarkAsLoaded();
 
   // Do not fire document complete/stop events for root chrome document
   // accessibles and for frame/iframe documents because
   // a) screen readers start working on focus event in the case of root chrome
   // documents
   // b) document load event on sub documents causes screen readers to act is if
   // entire page is reloaded.
-  if (!IsEventTargetDocument(aDocument)) {
-    // XXX: AT doesn't update their virtual buffer once frame is loaded and it
-    // has dynamic content added after frame load. There's something wrong how
-    // we handle this changes.
-    if (!nsCoreUtils::IsRootDocument(aDocument)) {
-      docAcc->InvalidateCacheSubtree(nsnull,
-                                     nsIAccessibilityService::NODE_SIGNIFICANT_CHANGE);
-    }
+  if (!IsEventTargetDocument(aDocument))
     return;
-  }
 
   // Fire complete/load stopped if the load event type is given.
   if (aLoadEventType) {
     nsRefPtr<AccEvent> loadEvent = new AccEvent(aLoadEventType, aDocument);
     docAcc->FireDelayedAccessibleEvent(loadEvent);
   }
 
   // Fire busy state change event.
@@ -488,27 +475,27 @@ nsAccDocManager::CreateDocOrRootAccessib
   nsDocAccessible *docAcc = isRootDoc ?
     new nsRootAccessibleWrap(aDocument, rootElm, weakShell) :
     new nsDocAccessibleWrap(aDocument, rootElm, weakShell);
 
   if (!docAcc)
     return nsnull;
 
   // Cache and addref document accessible.
-  if (!mDocAccessibleCache.Put(static_cast<void*>(aDocument), docAcc)) {
+  if (!mDocAccessibleCache.Put(aDocument, docAcc)) {
     delete docAcc;
     return nsnull;
   }
 
   // XXX: ideally we should initialize an accessible and then put it into tree,
   // we can't since document accessible fires reorder event on its container
   // while initialized.
   if (!outerDocAcc->AppendChild(docAcc) ||
       !GetAccService()->InitAccessible(docAcc, nsAccUtils::GetRoleMapEntry(aDocument))) {
-    mDocAccessibleCache.Remove(static_cast<void*>(aDocument));
+    mDocAccessibleCache.Remove(aDocument);
     return nsnull;
   }
 
   NS_LOG_ACCDOCCREATE("document creation finished", aDocument)
 
   AddListeners(aDocument, isRootDoc);
   return docAcc;
 }
@@ -541,39 +528,39 @@ nsAccDocManager::ShutdownDocAccessiblesI
 
   ShutdownDocAccessible(aDocument);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsAccDocManager static
 
 PLDHashOperator
-nsAccDocManager::ClearDocCacheEntry(const void* aKey,
+nsAccDocManager::ClearDocCacheEntry(const nsIDocument* aKey,
                                     nsRefPtr<nsDocAccessible>& aDocAccessible,
                                     void* aUserArg)
 {
   NS_ASSERTION(aDocAccessible,
                "Calling ClearDocCacheEntry with a NULL pointer!");
 
   if (aDocAccessible)
     aDocAccessible->Shutdown();
 
   return PL_DHASH_REMOVE;
 }
 
 PLDHashOperator
-nsAccDocManager::SearchAccessibleInDocCache(const void* aKey,
+nsAccDocManager::SearchAccessibleInDocCache(const nsIDocument* aKey,
                                             nsDocAccessible* aDocAccessible,
                                             void* aUserArg)
 {
   NS_ASSERTION(aDocAccessible,
                "No doc accessible for the object in doc accessible cache!");
 
   if (aDocAccessible) {
     nsSearchAccessibleInCacheArg* arg =
       static_cast<nsSearchAccessibleInCacheArg*>(aUserArg);
-    arg->mAccessible = aDocAccessible->GetCachedAccessible(arg->mUniqueID);
+    arg->mAccessible = aDocAccessible->GetCachedAccessible(arg->mNode);
     if (arg->mAccessible)
       return PL_DHASH_STOP;
   }
 
   return PL_DHASH_NEXT;
 }
--- a/accessible/src/base/nsAccDocManager.h
+++ b/accessible/src/base/nsAccDocManager.h
@@ -68,31 +68,31 @@ public:
    * Return document accessible for the given DOM node.
    */
   nsDocAccessible *GetDocAccessible(nsIDocument *aDocument);
 
   /**
    * Search through all document accessibles for an accessible with the given
    * unique id.
    */
-  nsAccessible *FindAccessibleInCache(void *aUniqueID) const;
+  nsAccessible* FindAccessibleInCache(nsINode* aNode) const;
 
   /**
    * Shutdown document accessibles in the tree starting from the given one.
    *
    * @param  aDocument  [in] the DOM document of start document accessible
    */
   void ShutdownDocAccessiblesInTree(nsIDocument *aDocument);
 
   /**
    * Return document accessible from the cache. Convenient method for testing.
    */
   inline nsDocAccessible* GetDocAccessibleFromCache(nsIDocument* aDocument) const
   {
-    return mDocAccessibleCache.GetWeak(static_cast<void*>(aDocument));
+    return mDocAccessibleCache.GetWeak(aDocument);
   }
 
 protected:
   nsAccDocManager() { };
 
   /**
    * Initialize the manager.
    */
@@ -157,43 +157,43 @@ private:
   nsDocAccessible *CreateDocOrRootAccessible(nsIDocument *aDocument);
 
   /**
    * Shutdown document accessibles in the tree starting from given tree item.
    */
   void ShutdownDocAccessiblesInTree(nsIDocShellTreeItem *aTreeItem,
                                     nsIDocument *aDocument);
 
-  typedef nsRefPtrHashtable<nsVoidPtrHashKey, nsDocAccessible>
+  typedef nsRefPtrHashtable<nsPtrHashKey<const nsIDocument>, nsDocAccessible>
     nsDocAccessibleHashtable;
 
   /**
    * Shutdown and remove the document accessible from cache.
    */
   static PLDHashOperator
-    ClearDocCacheEntry(const void* aKey,
+    ClearDocCacheEntry(const nsIDocument* aKey,
                        nsRefPtr<nsDocAccessible>& aDocAccessible,
                        void* aUserArg);
 
   /**
    * Clear the cache and shutdown the document accessibles.
    */
   void ClearDocCache()
   {
     mDocAccessibleCache.Enumerate(ClearDocCacheEntry, static_cast<void*>(this));
   }
 
   struct nsSearchAccessibleInCacheArg
   {
     nsAccessible *mAccessible;
-    void *mUniqueID;
+    nsINode* mNode;
   };
 
   static PLDHashOperator
-    SearchAccessibleInDocCache(const void* aKey,
+    SearchAccessibleInDocCache(const nsIDocument* aKey,
                                nsDocAccessible* aDocAccessible,
                                void* aUserArg);
 
   nsDocAccessibleHashtable mDocAccessibleCache;
 };
 
 /**
  * nsAccDocManager debugging macros.
--- a/accessible/src/base/nsAccessNode.cpp
+++ b/accessible/src/base/nsAccessNode.cpp
@@ -147,19 +147,22 @@ nsAccessNode::Init()
 void
 nsAccessNode::Shutdown()
 {
   mContent = nsnull;
   mWeakShell = nsnull;
 }
 
 // nsIAccessNode
-NS_IMETHODIMP nsAccessNode::GetUniqueID(void **aUniqueID)
+NS_IMETHODIMP
+nsAccessNode::GetUniqueID(void **aUniqueID)
 {
-  *aUniqueID = static_cast<void*>(GetNode());
+  NS_ENSURE_ARG_POINTER(aUniqueID);
+
+  *aUniqueID = UniqueID();
   return NS_OK;
 }
 
 // nsIAccessNode
 NS_IMETHODIMP
 nsAccessNode::GetOwnerWindow(void **aWindow)
 {
   NS_ENSURE_ARG_POINTER(aWindow);
@@ -305,16 +308,22 @@ already_AddRefed<nsRootAccessible> nsAcc
 }
 
 nsIFrame*
 nsAccessNode::GetFrame()
 {
   return mContent ? mContent->GetPrimaryFrame() : nsnull;
 }
 
+bool
+nsAccessNode::IsPrimaryForNode() const
+{
+  return true;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // nsIAccessNode
 
 NS_IMETHODIMP
 nsAccessNode::GetDOMNode(nsIDOMNode **aDOMNode)
 {
   NS_ENSURE_ARG_POINTER(aDOMNode);
   *aDOMNode = nsnull;
--- a/accessible/src/base/nsAccessNode.h
+++ b/accessible/src/base/nsAccessNode.h
@@ -176,16 +176,30 @@ public:
    */
   already_AddRefed<nsIPresShell> GetPresShell();
 
   /**
    * Return presentation shell for the accessible.
    */
   nsIWeakReference* GetWeakShell() const { return mWeakShell; }
 
+  /**
+   * Return the unique identifier of the accessible.
+   */
+  void* UniqueID() { return static_cast<void*>(this); }
+
+  /**
+   * Return true if the accessible is primary accessible for the given DOM node.
+   *
+   * Accessible hierarchy may be complex for single DOM node, in this case
+   * these accessibles share the same DOM node. The primary accessible "owns"
+   * that DOM node in terms it gets stored in the accessible to node map.
+   */
+  virtual bool IsPrimaryForNode() const;
+
 protected:
     nsPresContext* GetPresContext();
 
     void LastRelease();
 
   nsCOMPtr<nsIContent> mContent;
   nsCOMPtr<nsIWeakReference> mWeakShell;
 
--- a/accessible/src/base/nsAccessibilityService.cpp
+++ b/accessible/src/base/nsAccessibilityService.cpp
@@ -69,16 +69,17 @@
 #include "nsIObserverService.h"
 #include "nsIPluginInstance.h"
 #include "nsISupportsUtils.h"
 #include "nsObjectFrame.h"
 #include "nsOuterDocAccessible.h"
 #include "nsRootAccessibleWrap.h"
 #include "nsTextFragment.h"
 #include "mozilla/Services.h"
+#include "nsIEventStateManager.h"
 
 #ifdef MOZ_XUL
 #include "nsXULAlertAccessible.h"
 #include "nsXULColorPickerAccessible.h"
 #include "nsXULComboboxAccessible.h"
 #include "nsXULFormControlAccessible.h"
 #include "nsXULListboxAccessibleWrap.h"
 #include "nsXULMenuAccessibleWrap.h"
@@ -466,16 +467,72 @@ nsAccessibilityService::CreateHTMLCaptio
 {
   nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(aPresShell));
   nsAccessible* accessible = new nsHTMLCaptionAccessible(aContent, weakShell);
   NS_IF_ADDREF(accessible);
   return accessible;
 }
 
 void
+nsAccessibilityService::ContentRangeInserted(nsIPresShell* aPresShell,
+                                             nsIContent* aContainer,
+                                             nsIContent* aStartChild,
+                                             nsIContent* aEndChild)
+{
+#ifdef DEBUG_A11Y
+  nsAutoString tag;
+  aStartChild->Tag()->ToString(tag);
+  nsIAtom* id = aStartChild->GetID();
+  nsCAutoString strid;
+  if (id)
+    id->ToUTF8String(strid);
+  nsAutoString ctag;
+  aContainer->Tag()->ToString(ctag);
+  nsIAtom* cid = aContainer->GetID();
+  nsCAutoString strcid;
+  if (cid)
+    cid->ToUTF8String(strcid);
+  printf("\ncontent inserted: %s@id='%s', container: %s@id='%s', end node: %p\n\n",
+         NS_ConvertUTF16toUTF8(tag).get(), strid.get(),
+         NS_ConvertUTF16toUTF8(ctag).get(), strcid.get(), aEndChild);
+#endif
+
+  // XXX: bug 606082. aContainer is null when root element is inserted into
+  // document, we need to handle this and update the tree, also we need to
+  // update a content node of the document accessible.
+  if (aContainer) {
+    nsDocAccessible* docAccessible = GetDocAccessible(aPresShell->GetDocument());
+    if (docAccessible)
+      docAccessible->UpdateTree(aContainer, aStartChild, aEndChild, PR_TRUE);
+  }
+}
+
+void
+nsAccessibilityService::ContentRemoved(nsIPresShell* aPresShell,
+                                       nsIContent* aContainer,
+                                       nsIContent* aChild)
+{
+#ifdef DEBUG_A11Y
+  nsAutoString id;
+  aChild->Tag()->ToString(id);
+  printf("\ncontent removed: %s\n", NS_ConvertUTF16toUTF8(id).get());
+#endif
+
+  // XXX: bug 606082. aContainer is null when root element is inserted into
+  // document, we need to handle this and update the tree, perhaps destroy
+  // the document accessible.
+  if (aContainer) {
+    nsDocAccessible* docAccessible = GetDocAccessible(aPresShell->GetDocument());
+    if (docAccessible)
+      docAccessible->UpdateTree(aContainer, aChild, aChild->GetNextSibling(),
+                                PR_FALSE);
+  }
+}
+
+void
 nsAccessibilityService::PresShellDestroyed(nsIPresShell *aPresShell)
 {
   // Presshell destruction will automatically destroy shells for descendant
   // documents, so no need to worry about those. Just shut down the accessible
   // for this one document. That keeps us from having bad behavior in case of
   // deep bushy subtrees.
   // When document subtree containing iframe is hidden then we don't get
   // pagehide event for the iframe's underlying document and its presshell is
@@ -484,24 +541,32 @@ nsAccessibilityService::PresShellDestroy
   nsIDocument* doc = aPresShell->GetDocument();
   if (!doc)
     return;
 
   NS_LOG_ACCDOCDESTROY("presshell destroyed", doc)
   ShutdownDocAccessible(doc);
 }
 
+void
+nsAccessibilityService::RecreateAccessible(nsIPresShell* aPresShell,
+                                           nsIContent* aContent)
+{
+  nsDocAccessible* document = GetDocAccessible(aPresShell->GetDocument());
+  if (document)
+    document->RecreateAccessible(aContent);
+}
+
 // nsAccessibilityService protected
 nsAccessible *
 nsAccessibilityService::GetCachedAccessible(nsINode *aNode,
                                             nsIWeakReference *aWeakShell)
 {
   nsDocAccessible *docAccessible = GetDocAccessible(aNode->GetOwnerDoc());
-  return docAccessible ?
-    docAccessible->GetCachedAccessible(static_cast<void*>(aNode)) : nsnull;
+  return docAccessible ? docAccessible->GetCachedAccessible(aNode) : nsnull;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsIAccessibleRetrieval
 
 NS_IMETHODIMP
 nsAccessibilityService::GetApplicationAccessible(nsIAccessible **aAccessibleApplication)
 {
@@ -689,17 +754,17 @@ nsAccessibilityService::GetAccessibleFro
 
   // Search for an accessible in each of our per document accessible object
   // caches. If we don't find it, and the given node is itself a document, check
   // our cache of document accessibles (document cache). Note usually shutdown
   // document accessibles are not stored in the document cache, however an
   // "unofficially" shutdown document (i.e. not from nsAccDocManager) can still
   // exist in the document cache.
   nsCOMPtr<nsINode> node(do_QueryInterface(aNode));
-  nsAccessible* accessible = FindAccessibleInCache(static_cast<void*>(node));
+  nsAccessible* accessible = FindAccessibleInCache(node);
   if (!accessible) {
     nsCOMPtr<nsIDocument> document(do_QueryInterface(node));
     if (document)
       accessible = GetDocAccessibleFromCache(document);
   }
 
   NS_IF_ADDREF(*aAccessible = accessible);
   return NS_OK;
@@ -727,35 +792,35 @@ nsAccessibilityService::GetAccessible(ns
     nsCOMPtr<nsIWeakReference> weakShell(nsCoreUtils::GetWeakShellFor(aNode));
     if (weakShell)
       return GetAccessibleByRule(aNode, weakShell, eGetAccForNode);
   }
   return nsnull;
 }
 
 nsAccessible*
-nsAccessibilityService::GetCachedContainerAccessible(nsINode* aNode)
+nsAccessibilityService::GetCachedAccessibleOrContainer(nsINode* aNode)
 {
   if (!aNode)
     return nsnull;
 
   nsIDocument *document = aNode->GetCurrentDoc();
   if (!document)
     return nsnull;
 
   nsIPresShell *presShell = document->GetShell();
   if (!presShell)
     return nsnull;
 
   nsINode *currNode = aNode;
   nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(presShell));
 
   nsAccessible *accessible = nsnull;
-  while ((currNode = currNode->GetNodeParent()) &&
-         !(accessible = GetCachedAccessible(currNode, weakShell)));
+  while (!(accessible = GetCachedAccessible(currNode, weakShell)) &&
+         (currNode = currNode->GetNodeParent()));
 
   return accessible;
 }
 
 PRBool
 nsAccessibilityService::InitAccessible(nsAccessible *aAccessible,
                                        nsRoleMapEntry *aRoleMapEntry)
 {
@@ -852,18 +917,17 @@ nsAccessibilityService::GetOrCreateAcces
 
   // Frames can be deallocated when we flush layout, or when we call into code
   // that can flush layout, either directly, or via DOM manipulation, or some
   // CSS styles like :hover. We use the weak frame checks to avoid calling
   // methods on a dead frame pointer.
   nsWeakFrame weakFrame = content->GetPrimaryFrame();
 
   // Check frame to see if it is hidden.
-  if (!weakFrame.GetFrame() ||
-      !weakFrame.GetFrame()->GetStyleVisibility()->IsVisible()) {
+  if (!weakFrame.GetFrame()) {
     if (aIsHidden)
       *aIsHidden = PR_TRUE;
 
     return nsnull;
   }
 
   if (weakFrame.GetFrame()->GetContent() != content) {
     // Not the main content for this frame. This happens because <area>
@@ -1190,33 +1254,34 @@ nsAccessibilityService::HasUniversalAria
 nsAccessible*
 nsAccessibilityService::GetAccessibleByRule(nsINode* aNode,
                                             nsIWeakReference* aWeakShell,
                                             EWhatAccToGet aWhatToGet)
 {
   if (!aNode || !aWeakShell)
     return nsnull;
 
-  nsAccessible* cachedAcc = GetCachedAccessible(aNode, aWeakShell);
-  if (cachedAcc) {
-    if (aWhatToGet & eGetAccForNode)
+  if (aWhatToGet & eGetAccForNode) {
+    nsAccessible* cachedAcc = GetCachedAccessible(aNode, aWeakShell);
+    if (cachedAcc && cachedAcc->IsBoundToParent())
       return cachedAcc;
-
-    // XXX: while nsAccessible::GetParent() tries to repair broken tree and
-    // may not return cached parent then we use GetAccessibleOrContainer().
-    return GetAccessibleByRule(aNode->GetNodeParent(), aWeakShell,
-                               eGetAccForNodeOrContainer);
   }
 
-  // Go up looking for the nearest accessible container stored in cache.
+  // Go up looking for the nearest accessible container having cached children.
   nsTArray<nsINode*> nodes;
+
   nsINode* node = aNode;
-  while ((node = node->GetNodeParent()) &&
-         !(cachedAcc = GetCachedAccessible(node, aWeakShell)))
+  nsAccessible* cachedAcc = nsnull;
+  while ((node = node->GetNodeParent())) {
+    cachedAcc = GetCachedAccessible(node, aWeakShell);
+    if (cachedAcc && cachedAcc->IsBoundToParent())
+      break;
+
     nodes.AppendElement(node);
+  }
 
   // Node is not in accessible document.
   if (!cachedAcc)
     return nsnull;
 
   // If children of the cached accessible weren't initialized then go down to
   // the given node and create accessible tree.
   nsAccessible* containerAcc = cachedAcc;
@@ -1708,39 +1773,16 @@ nsAccessibilityService::RemoveNativeRoot
   nsApplicationAccessible* applicationAcc =
     nsAccessNode::GetApplicationAccessible();
 
   if (applicationAcc)
     applicationAcc->RemoveChild(aAccessible);
 #endif
 }
 
-// Called from layout when the frame tree owned by a node changes significantly
-nsresult
-nsAccessibilityService::InvalidateSubtreeFor(nsIPresShell *aShell,
-                                             nsIContent *aChangeContent,
-                                             PRUint32 aChangeType)
-{
-  NS_ASSERTION(aChangeType == nsIAccessibilityService::FRAME_SIGNIFICANT_CHANGE ||
-               aChangeType == nsIAccessibilityService::FRAME_SHOW ||
-               aChangeType == nsIAccessibilityService::FRAME_HIDE ||
-               aChangeType == nsIAccessibilityService::NODE_SIGNIFICANT_CHANGE ||
-               aChangeType == nsIAccessibilityService::NODE_APPEND ||
-               aChangeType == nsIAccessibilityService::NODE_REMOVE,
-               "Incorrect aEvent passed in");
-
-  NS_ENSURE_ARG_POINTER(aShell);
-
-  nsDocAccessible *docAccessible = GetDocAccessible(aShell->GetDocument());
-  if (docAccessible)
-    docAccessible->InvalidateCacheSubtree(aChangeContent, aChangeType);
-
-  return NS_OK;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // NS_GetAccessibilityService
 ////////////////////////////////////////////////////////////////////////////////
 
 /**
  * Return accessibility service; creating one if necessary.
  */
 nsresult
--- a/accessible/src/base/nsAccessibilityService.h
+++ b/accessible/src/base/nsAccessibilityService.h
@@ -105,24 +105,31 @@ public:
   virtual already_AddRefed<nsAccessible>
     CreateHyperTextAccessible(nsIContent* aContent, nsIPresShell* aPresShell);
   virtual already_AddRefed<nsAccessible>
     CreateOuterDocAccessible(nsIContent* aContent, nsIPresShell* aPresShell);
 
   virtual nsAccessible* AddNativeRootAccessible(void* aAtkAccessible);
   virtual void RemoveNativeRootAccessible(nsAccessible* aRootAccessible);
 
-  virtual nsresult InvalidateSubtreeFor(nsIPresShell *aPresShell,
-                                        nsIContent *aContent,
-                                        PRUint32 aChangeType);
+  virtual void ContentRangeInserted(nsIPresShell* aPresShell,
+                                      nsIContent* aContainer,
+                                      nsIContent* aStartChild,
+                                      nsIContent* aEndChild);
+
+  virtual void ContentRemoved(nsIPresShell* aPresShell, nsIContent* aContainer,
+                              nsIContent* aChild);
 
   virtual void NotifyOfAnchorJumpTo(nsIContent *aTarget);
 
   virtual void PresShellDestroyed(nsIPresShell* aPresShell);
 
+  virtual void RecreateAccessible(nsIPresShell* aPresShell,
+                                  nsIContent* aContent);
+
   virtual void FireAccessibleEvent(PRUint32 aEvent, nsAccessible* aTarget);
 
   // nsAccessibiltiyService
 
   /**
    * Return true if accessibility service has been shutdown.
    */
   static PRBool IsShutdown() { return gIsShutdown; }
@@ -174,21 +181,31 @@ public:
    */
   inline nsAccessible* GetContainerAccessible(nsINode* aNode,
                                               nsIWeakReference* aWeakShell)
   {
     return GetAccessibleByRule(aNode, aWeakShell, eGetAccForContainer);
   }
 
   /**
+   * Return cached accessible for the given DOM node or cached container
+   * accessible if there's no cached accessible for the given node.
+   */
+  nsAccessible* GetCachedAccessibleOrContainer(nsINode* aNode);
+
+  /**
    * Return the first cached accessible parent of a DOM node.
    *
    * @param aDOMNode    [in] the DOM node to get an accessible for
    */
-  nsAccessible* GetCachedContainerAccessible(nsINode *aNode);
+  inline nsAccessible* GetCachedContainerAccessible(nsINode *aNode)
+  {
+    return aNode ?
+      GetCachedAccessibleOrContainer(aNode->GetNodeParent()) : nsnull;
+  }
 
   /**
    * Initialize an accessible and cache it. The method should be called for
    * every created accessible.
    *
    * @param  aAccessible    [in] accessible to initialize.
    * @param  aRoleMapEntry  [in] the role map entry role the ARIA role or nsnull
    *                          if none
--- a/accessible/src/base/nsAccessible.cpp
+++ b/accessible/src/base/nsAccessible.cpp
@@ -2624,38 +2624,31 @@ nsAccessible::AppendTextTo(nsAString& aT
 // nsAccessNode public methods
 
 PRBool
 nsAccessible::Init()
 {
   if (!nsAccessNodeWrap::Init())
     return PR_FALSE;
 
-  nsDocAccessible *docAcc =
+  nsDocAccessible* document =
     GetAccService()->GetDocAccessible(mContent->GetOwnerDoc());
-  NS_ASSERTION(docAcc, "Cannot cache new nsAccessible!");
-  if (!docAcc)
-    return PR_FALSE;
-
-  void *uniqueID = nsnull;
-  GetUniqueID(&uniqueID);
-
-  return docAcc->CacheAccessible(uniqueID, this);
+  NS_ASSERTION(document, "Cannot cache new nsAccessible!");
+
+  return document ? document->CacheAccessible(this) : PR_FALSE;
 }
 
 void
 nsAccessible::Shutdown()
 {
   // Invalidate the child count and pointers to other accessibles, also make
   // sure none of its children point to this parent
   InvalidateChildren();
-  if (mParent) {
-    mParent->InvalidateChildren();
-    UnbindFromParent();
-  }
+  if (mParent)
+    mParent->RemoveChild(this);
 
   nsAccessNodeWrap::Shutdown();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsAccessible public methods
 
 nsresult
@@ -2694,24 +2687,24 @@ nsAccessible::GetNameInternal(nsAString&
 }
 
 // nsAccessible protected
 void
 nsAccessible::BindToParent(nsAccessible* aParent, PRUint32 aIndexInParent)
 {
   NS_PRECONDITION(aParent, "This method isn't used to set null parent!");
 
-  if (mParent && mParent != aParent) {
-    // Adopt a child -- we allow this now. the new parent
-    // may be a dom node which wasn't previously accessible but now is.
-    // The old parent's children now need to be invalidated, since 
-    // it no longer owns the child, the new parent does
-    NS_ASSERTION(PR_FALSE, "Adopting child!");
-    if (mParent)
+  if (mParent) {
+    if (mParent != aParent) {
+      NS_ERROR("Adopting child!");
       mParent->InvalidateChildren();
+    } else {
+      NS_ERROR("Binding to the same parent!");
+      return;
+    }
   }
 
   mParent = aParent;
   mIndexInParent = aIndexInParent;
 }
 
 void
 nsAccessible::UnbindFromParent()
@@ -2768,16 +2761,23 @@ nsAccessible::InsertChildAt(PRUint32 aIn
 }
 
 PRBool
 nsAccessible::RemoveChild(nsAccessible* aChild)
 {
   if (aChild->mParent != this || aChild->mIndexInParent == -1)
     return PR_FALSE;
 
+  if (aChild->mIndexInParent >= mChildren.Length() ||
+      mChildren[aChild->mIndexInParent] != aChild) {
+    NS_ERROR("Child is bound to parent but parent hasn't this child at its index!");
+    aChild->UnbindFromParent();
+    return PR_FALSE;
+  }
+
   for (PRUint32 idx = aChild->mIndexInParent + 1; idx < mChildren.Length(); idx++)
     mChildren[idx]->mIndexInParent--;
 
   mChildren.RemoveElementAt(aChild->mIndexInParent);
   mEmbeddedObjCollector = nsnull;
 
   aChild->UnbindFromParent();
   return PR_TRUE;
@@ -2902,23 +2902,20 @@ nsAccessible::GetIndexOfEmbeddedChild(ns
 }
 
 #ifdef DEBUG
 PRBool
 nsAccessible::IsInCache()
 {
   nsDocAccessible *docAccessible =
     GetAccService()->GetDocAccessible(mContent->GetOwnerDoc());
-  if (!docAccessible)
-    return nsnull;
-
-  void *uniqueID = nsnull;
-  GetUniqueID(&uniqueID);
-
-  return docAccessible->GetCachedAccessible(uniqueID) ? PR_TRUE : PR_FALSE;
+  if (docAccessible)
+    return docAccessible->GetCachedAccessibleByUniqueID(UniqueID()) ? PR_TRUE : PR_FALSE;
+
+  return PR_FALSE;
 }
 #endif
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // HyperLinkAccessible methods
 
 bool
--- a/accessible/src/base/nsAccessible.h
+++ b/accessible/src/base/nsAccessible.h
@@ -46,31 +46,34 @@
 #include "nsIAccessibleSelectable.h"
 #include "nsIAccessibleValue.h"
 #include "nsIAccessibleRole.h"
 #include "nsIAccessibleStates.h"
 
 #include "nsStringGlue.h"
 #include "nsTArray.h"
 #include "nsRefPtrHashtable.h"
+#include "nsDataHashtable.h"
 
 class AccGroupInfo;
 class EmbeddedObjCollector;
 class nsAccessible;
 class AccEvent;
 struct nsRoleMapEntry;
 
 struct nsRect;
 class nsIContent;
 class nsIFrame;
 class nsIAtom;
 class nsIView;
 
 typedef nsRefPtrHashtable<nsVoidPtrHashKey, nsAccessible>
   nsAccessibleHashtable;
+typedef nsDataHashtable<nsPtrHashKey<const nsINode>, nsAccessible*>
+  NodeToAccessibleMap;
 
 // see nsAccessible::GetAttrValue
 #define NS_OK_NO_ARIA_VALUE \
 NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_GENERAL, 0x21)
 
 // see nsAccessible::GetNameInternal
 #define NS_OK_EMPTY_NAME \
 NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_GENERAL, 0x23)
@@ -201,16 +204,17 @@ public:
   /**
    * Set the ARIA role map entry for a new accessible.
    * For a newly created accessible, specify which role map entry should be used.
    *
    * @param aRoleMapEntry The ARIA nsRoleMapEntry* for the accessible, or 
    *                      nsnull if none.
    */
   virtual void SetRoleMapEntry(nsRoleMapEntry *aRoleMapEntry);
+  const nsRoleMapEntry* GetRoleMapEntry() const { return mRoleMapEntry; }
 
   /**
    * Cache children if necessary. Return true if the accessible is defunct.
    */
   PRBool EnsureChildren();
 
   /**
    * Set the child count to -1 (unknown) and null out cached child pointers.
@@ -285,17 +289,19 @@ public:
       mParent->mChildren.SafeElementAt(mIndexInParent + 1, nsnull).get() : nsnull;
   }
   nsAccessible* GetCachedPrevSibling() const
   {
     return mParent ?
       mParent->mChildren.SafeElementAt(mIndexInParent - 1, nsnull).get() : nsnull;
   }
   PRUint32 GetCachedChildCount() const { return mChildren.Length(); }
+  nsAccessible* GetCachedChildAt(PRUint32 aIndex) const { return mChildren.ElementAt(aIndex); }
   PRBool AreChildrenCached() const { return mChildrenFlags != eChildrenUninitialized; }
+  bool IsBoundToParent() const { return mParent; }
 
 #ifdef DEBUG
   /**
    * Return true if the access node is cached.
    */
   PRBool IsInCache();
 #endif
 
--- a/accessible/src/base/nsApplicationAccessible.cpp
+++ b/accessible/src/base/nsApplicationAccessible.cpp
@@ -358,16 +358,22 @@ nsApplicationAccessible::Init()
 }
 
 void
 nsApplicationAccessible::Shutdown()
 {
   mAppInfo = nsnull;
 }
 
+bool
+nsApplicationAccessible::IsPrimaryForNode() const
+{
+  return false;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // nsAccessible public methods
 
 nsresult
 nsApplicationAccessible::GetARIAState(PRUint32 *aState, PRUint32 *aExtraState)
 {
   return NS_OK;
 }
@@ -465,17 +471,17 @@ nsApplicationAccessible::GetSiblingAtOff
 
   if (aError)
     *aError = NS_OK; // fail peacefully
 
   return nsnull;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// nsIAccessNode
+// nsIAccessNode and nsAccessNode
 
 NS_IMETHODIMP
 nsApplicationAccessible::GetDOMNode(nsIDOMNode **aDOMNode)
 {
   NS_ENSURE_ARG_POINTER(aDOMNode);
   *aDOMNode = nsnull;
   return NS_OK;
 }
@@ -520,24 +526,16 @@ NS_IMETHODIMP
 nsApplicationAccessible::GetOwnerWindow(void **aOwnerWindow)
 {
   NS_ENSURE_ARG_POINTER(aOwnerWindow);
   *aOwnerWindow = nsnull;
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsApplicationAccessible::GetUniqueID(void **aUniqueID)
-{
-  NS_ENSURE_ARG_POINTER(aUniqueID);
-  *aUniqueID = static_cast<void *>(this);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
 nsApplicationAccessible::GetComputedStyleValue(const nsAString &aPseudoElt,
                                                const nsAString &aPropertyName,
                                                nsAString &aValue)
 {
   return NS_OK;
 }
 
 NS_IMETHODIMP
@@ -551,8 +549,9 @@ nsApplicationAccessible::GetComputedStyl
 }
 
 NS_IMETHODIMP
 nsApplicationAccessible::GetLanguage(nsAString &aLanguage)
 {
   aLanguage.Truncate();
   return NS_OK;
 }
+
--- a/accessible/src/base/nsApplicationAccessible.h
+++ b/accessible/src/base/nsApplicationAccessible.h
@@ -66,17 +66,30 @@ public:
   using nsAccessible::GetChildAtPoint;
 
   nsApplicationAccessible();
 
   // nsISupports
   NS_DECL_ISUPPORTS_INHERITED
 
   // nsIAccessNode
-  NS_DECL_NSIACCESSNODE
+  NS_SCRIPTABLE NS_IMETHOD GetDOMNode(nsIDOMNode** aDOMNode);
+  NS_SCRIPTABLE NS_IMETHOD GetDocument(nsIAccessibleDocument** aDocument);
+  NS_SCRIPTABLE NS_IMETHOD GetRootDocument(nsIAccessibleDocument** aRootDocument);
+  NS_SCRIPTABLE NS_IMETHOD GetInnerHTML(nsAString& aInnerHTML);
+  NS_SCRIPTABLE NS_IMETHOD ScrollTo(PRUint32 aScrollType);
+  NS_SCRIPTABLE NS_IMETHOD ScrollToPoint(PRUint32 aCoordinateType, PRInt32 aX, PRInt32 aY);
+  NS_IMETHOD GetOwnerWindow(void **aOwnerWindow);
+  NS_SCRIPTABLE NS_IMETHOD GetComputedStyleValue(const nsAString& aPseudoElt,
+                                                 const nsAString& aPropertyName,
+                                                 nsAString& aValue NS_OUTPARAM);
+  NS_SCRIPTABLE NS_IMETHOD GetComputedStyleCSSValue(const nsAString& aPseudoElt,
+                                                    const nsAString& aPropertyName,
+                                                    nsIDOMCSSPrimitiveValue** aValue NS_OUTPARAM);
+  NS_SCRIPTABLE NS_IMETHOD GetLanguage(nsAString& aLanguage);
 
   // nsIAccessible
   NS_IMETHOD GetParent(nsIAccessible **aParent);
   NS_IMETHOD GetNextSibling(nsIAccessible **aNextSibling);
   NS_IMETHOD GetPreviousSibling(nsIAccessible **aPreviousSibling);
   NS_IMETHOD GetName(nsAString &aName);
   NS_IMETHOD GetValue(nsAString &aValue);
   NS_IMETHOD GetDescription(nsAString &aDescription);
@@ -104,16 +117,17 @@ public:
 
   // nsIAccessibleApplication
   NS_DECL_NSIACCESSIBLEAPPLICATION
 
   // nsAccessNode
   virtual PRBool IsDefunct();
   virtual PRBool Init();
   virtual void Shutdown();
+  virtual bool IsPrimaryForNode() const;
 
   // nsAccessible
   virtual nsresult GetARIAState(PRUint32 *aState, PRUint32 *aExtraState);
   virtual PRUint32 Role();
   virtual PRUint32 NativeRole();
   virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
 
   virtual void InvalidateChildren();
--- a/accessible/src/base/nsCaretAccessible.cpp
+++ b/accessible/src/base/nsCaretAccessible.cpp
@@ -280,18 +280,17 @@ nsCaretAccessible::SpellcheckSelectionCh
   // misspelled word). If spellchecking is disabled (for example,
   // @spellcheck="false" on html:body) then we won't fire any event.
 
   nsRefPtr<nsHyperTextAccessible> textAcc =
     nsAccUtils::GetTextAccessibleFromSelection(aSel);
   NS_ENSURE_STATE(textAcc);
 
   nsRefPtr<AccEvent> event =
-    new AccEvent(nsIAccessibleEvent::EVENT_TEXT_ATTRIBUTE_CHANGED,
-                 textAcc, nsnull);
+    new AccEvent(nsIAccessibleEvent::EVENT_TEXT_ATTRIBUTE_CHANGED, textAcc);
 
   nsEventShell::FireEvent(event);
   return NS_OK;
 }
 
 nsIntRect
 nsCaretAccessible::GetCaretRect(nsIWidget **aOutWidget)
 {
--- a/accessible/src/base/nsDocAccessible.cpp
+++ b/accessible/src/base/nsDocAccessible.cpp
@@ -79,30 +79,30 @@
 #endif
 
 namespace dom = mozilla::dom;
 
 ////////////////////////////////////////////////////////////////////////////////
 // Static member initialization
 
 PRUint32 nsDocAccessible::gLastFocusedAccessiblesState = 0;
-nsIAtom *nsDocAccessible::gLastFocusedFrameType = nsnull;
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // Constructor/desctructor
 
 nsDocAccessible::
   nsDocAccessible(nsIDocument *aDocument, nsIContent *aRootContent,
                   nsIWeakReference *aShell) :
   nsHyperTextAccessibleWrap(aRootContent, aShell),
   mDocument(aDocument), mScrollPositionChangedTicks(0), mIsLoaded(PR_FALSE)
 {
   // XXX aaronl should we use an algorithm for the initial cache size?
   mAccessibleCache.Init(kDefaultCacheSize);
+  mNodeToAccessibleMap.Init(kDefaultCacheSize);
 
   // For GTK+ native window, we do nothing here.
   if (!mDocument)
     return;
 
   // nsAccDocManager creates document accessible when scrollable frame is
   // available already, it should be safe time to add scroll listener.
   AddScrollListener();
@@ -129,16 +129,17 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_
   }
 
   CycleCollectorTraverseCache(tmp->mAccessibleCache, &cb);
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsDocAccessible, nsAccessible)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mEventQueue)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSTARRAY(mChildDocuments)
+  tmp->mNodeToAccessibleMap.Clear();
   ClearCache(tmp->mAccessibleCache);
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsDocAccessible)
   NS_INTERFACE_MAP_STATIC_AMBIGUOUS(nsDocAccessible)
   NS_INTERFACE_MAP_ENTRY(nsIAccessibleDocument)
   NS_INTERFACE_MAP_ENTRY(nsIDocumentObserver)
   NS_INTERFACE_MAP_ENTRY(nsIMutationObserver)
@@ -563,26 +564,24 @@ NS_IMETHODIMP nsDocAccessible::GetAssoci
   if (isEditable) {
     NS_ADDREF(*aEditor = editor);
   }
   return NS_OK;
 }
 
 // nsDocAccessible public method
 nsAccessible *
-nsDocAccessible::GetCachedAccessible(void *aUniqueID)
+nsDocAccessible::GetCachedAccessible(nsINode *aNode)
 {
-  nsAccessible* accessible = mAccessibleCache.GetWeak(aUniqueID);
+  nsAccessible* accessible = mNodeToAccessibleMap.Get(aNode);
 
   // No accessible in the cache, check if the given ID is unique ID of this
   // document accessible.
   if (!accessible) {
-    void* thisUniqueID = nsnull;
-    GetUniqueID(&thisUniqueID);
-    if (thisUniqueID != aUniqueID)
+    if (GetNode() != aNode)
       return nsnull;
 
     accessible = this;
   }
 
 #ifdef DEBUG
   // All cached accessible nodes should be in the parent
   // It will assert if not all the children were created
@@ -593,39 +592,36 @@ nsDocAccessible::GetCachedAccessible(voi
     parent->TestChildCache(accessible);
 #endif
 
   return accessible;
 }
 
 // nsDocAccessible public method
 PRBool
-nsDocAccessible::CacheAccessible(void *aUniqueID, nsAccessible *aAccessible)
+nsDocAccessible::CacheAccessible(nsAccessible* aAccessible)
 {
-  // If there is already an accessible with the given unique ID, shut it down
-  // because the DOM node has changed.
-  nsAccessible *accessible = mAccessibleCache.GetWeak(aUniqueID);
-  NS_ASSERTION(!accessible,
-               "Caching new accessible for the DOM node while the old one is alive");
+  if (aAccessible->IsPrimaryForNode() &&
+      !mNodeToAccessibleMap.Put(aAccessible->GetNode(), aAccessible))
+    return PR_FALSE;
 
-  if (accessible)
-    accessible->Shutdown();
-
-  return mAccessibleCache.Put(aUniqueID, aAccessible);
+  return mAccessibleCache.Put(aAccessible->UniqueID(), aAccessible);
 }
 
 // nsDocAccessible public method
 void
-nsDocAccessible::RemoveAccessNodeFromCache(nsAccessible *aAccessible)
+nsDocAccessible::ShutdownAccessible(nsAccessible *aAccessible)
 {
-  if (!aAccessible)
-    return;
+  // Remove an accessible from node to accessible map if it is presented there.
+  if (aAccessible->IsPrimaryForNode() &&
+      mNodeToAccessibleMap.Get(aAccessible->GetNode()) == aAccessible)
+    mNodeToAccessibleMap.Remove(aAccessible->GetNode());
 
-  void *uniqueID = nsnull;
-  aAccessible->GetUniqueID(&uniqueID);
+  void* uniqueID = aAccessible->UniqueID();
+  aAccessible->Shutdown();
   mAccessibleCache.Remove(uniqueID);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsAccessNode
 
 PRBool
 nsDocAccessible::Init()
@@ -641,22 +637,24 @@ nsDocAccessible::Init()
 
   nsDocAccessible* parentDocument = mParent->GetDocAccessible();
   if (parentDocument)
     parentDocument->AppendChildDocument(this);
 
   // Fire reorder event to notify new accessible document has been created and
   // attached to the tree.
   nsRefPtr<AccEvent> reorderEvent =
-    new AccReorderEvent(mParent, PR_FALSE, PR_TRUE, mDocument);
-  if (!reorderEvent)
-    return PR_FALSE;
+    new AccEvent(nsIAccessibleEvent::EVENT_REORDER, mParent, eAutoDetect,
+                 AccEvent::eCoalesceFromSameSubtree);
+  if (reorderEvent) {
+    FireDelayedAccessibleEvent(reorderEvent);
+    return PR_TRUE;
+  }
 
-  FireDelayedAccessibleEvent(reorderEvent);
-  return PR_TRUE;
+  return PR_FALSE;
 }
 
 void
 nsDocAccessible::Shutdown()
 {
   if (!mWeakShell) // already shutdown
     return;
 
@@ -676,16 +674,17 @@ nsDocAccessible::Shutdown()
 
     mParent->RemoveChild(this);
   }
 
   mChildDocuments.Clear();
 
   mWeakShell = nsnull;  // Avoid reentrancy
 
+  mNodeToAccessibleMap.Clear();
   ClearCache(mAccessibleCache);
 
   nsCOMPtr<nsIDocument> kungFuDeathGripDoc = mDocument;
   mDocument = nsnull;
 
   nsHyperTextAccessibleWrap::Shutdown();
 }
 
@@ -1039,18 +1038,17 @@ nsDocAccessible::AttributeChangedImpl(ns
   }
 
   if (aAttribute == nsAccessibilityAtoms::role ||
       aAttribute == nsAccessibilityAtoms::href ||
       aAttribute == nsAccessibilityAtoms::onclick) {
     // Not worth the expense to ensure which namespace these are in
     // It doesn't kill use to recreate the accessible even if the attribute was used
     // in the wrong namespace or an element that doesn't support it
-    InvalidateCacheSubtree(aContent,
-                           nsIAccessibilityService::NODE_SIGNIFICANT_CHANGE);
+    RecreateAccessible(aContent);
     return;
   }
   
   if (aAttribute == nsAccessibilityAtoms::alt ||
       aAttribute == nsAccessibilityAtoms::title ||
       aAttribute == nsAccessibilityAtoms::aria_label ||
       aAttribute == nsAccessibilityAtoms::aria_labelledby) {
     FireDelayedAccessibleEvent(nsIAccessibleEvent::EVENT_NAME_CHANGE,
@@ -1213,44 +1211,28 @@ nsDocAccessible::ARIAAttributeChanged(ns
     return;
   }
 
   if (aAttribute == nsAccessibilityAtoms::aria_multiselectable &&
       aContent->HasAttr(kNameSpaceID_None, nsAccessibilityAtoms::role)) {
     // This affects whether the accessible supports SelectAccessible.
     // COM says we cannot change what interfaces are supported on-the-fly,
     // so invalidate this object. A new one will be created on demand.
-    InvalidateCacheSubtree(aContent,
-                           nsIAccessibilityService::NODE_SIGNIFICANT_CHANGE);
+    RecreateAccessible(aContent);
     return;
   }
 }
 
 void nsDocAccessible::ContentAppended(nsIDocument *aDocument,
                                       nsIContent* aContainer,
                                       nsIContent* aFirstNewContent,
                                       PRInt32 /* unused */)
 {
-  if (!IsContentLoaded() && mAccessibleCache.Count() <= 1) {
-    // See comments in nsDocAccessible::InvalidateCacheSubtree
-    InvalidateChildren();
-    return;
-  }
-
-  // Does this need to be a strong ref?  If so, why?
-  for (nsIContent* cur = aFirstNewContent; cur; cur = cur->GetNextSibling()) {
-    // InvalidateCacheSubtree will not fire the EVENT_SHOW for the new node
-    // unless an accessible can be created for the passed in node, which it
-    // can't do unless the node is visible. The right thing happens there so
-    // no need for an extra visibility check here.
-    InvalidateCacheSubtree(cur, nsIAccessibilityService::NODE_APPEND);
-  }
 }
 
-
 void nsDocAccessible::ContentStatesChanged(nsIDocument* aDocument,
                                            nsIContent* aContent1,
                                            nsIContent* aContent2,
                                            nsEventStates aStateMask)
 {
   if (!aStateMask.HasState(NS_EVENT_STATE_CHECKED)) {
     return;
   }
@@ -1277,34 +1259,23 @@ void nsDocAccessible::CharacterDataChang
 {
   FireTextChangeEventForText(aContent, aInfo, PR_TRUE);
 }
 
 void
 nsDocAccessible::ContentInserted(nsIDocument *aDocument, nsIContent* aContainer,
                                  nsIContent* aChild, PRInt32 /* unused */)
 {
-  // InvalidateCacheSubtree will not fire the EVENT_SHOW for the new node
-  // unless an accessible can be created for the passed in node, which it
-  // can't do unless the node is visible. The right thing happens there so
-  // no need for an extra visibility check here.
-  InvalidateCacheSubtree(aChild, nsIAccessibilityService::NODE_APPEND);
 }
 
 void
 nsDocAccessible::ContentRemoved(nsIDocument *aDocument, nsIContent* aContainer,
                                 nsIContent* aChild, PRInt32 /* unused */,
                                 nsIContent* aPreviousSibling)
 {
-  // It's no needed to invalidate the subtree of the removed element,
-  // because we get notifications directly from content (see
-  // nsGenericElement::doRemoveChildAt) *before* the frame for the content is
-  // destroyed, or any other side effects occur . That allows us to correctly
-  // calculate the TEXT_REMOVED event if there is one and coalesce events from
-  // the same subtree.
 }
 
 void
 nsDocAccessible::ParentChainChanged(nsIContent *aContent)
 {
 }
 
 
@@ -1335,46 +1306,190 @@ nsDocAccessible::GetNativeWindow() const
     vm->GetRootWidget(getter_AddRefs(widget));
     if (widget)
       return widget->GetNativeData(NS_NATIVE_WINDOW);
   }
   return nsnull;
 }
 
 nsAccessible*
-nsDocAccessible::GetCachedAccessibleInSubtree(void* aUniqueID)
+nsDocAccessible::GetCachedAccessibleByUniqueIDInSubtree(void* aUniqueID)
 {
-  nsAccessible* child = GetCachedAccessible(aUniqueID);
+  nsAccessible* child = GetCachedAccessibleByUniqueID(aUniqueID);
   if (child)
     return child;
 
   PRUint32 childDocCount = mChildDocuments.Length();
   for (PRUint32 childDocIdx= 0; childDocIdx < childDocCount; childDocIdx++) {
     nsDocAccessible* childDocument = mChildDocuments.ElementAt(childDocIdx);
-    child = childDocument->GetCachedAccessibleInSubtree(aUniqueID);
+    child = childDocument->GetCachedAccessibleByUniqueIDInSubtree(aUniqueID);
     if (child)
       return child;
   }
 
   return nsnull;
 }
 
+void
+nsDocAccessible::UpdateTree(nsIContent* aContainerNode,
+                            nsIContent* aStartNode,
+                            nsIContent* aEndNode,
+                            PRBool aIsInsert)
+{
+  // Content change notification mostly are async, thus we can't detect whether
+  // these actions are from user. This information is used to fire or do not
+  // fire events to avoid events that are generated because of document loading.
+  // Since this information may be not correct then we need to fire some events
+  // regardless the document loading state.
+
+  nsCOMPtr<nsIPresShell> presShell = GetPresShell();
+  nsIEventStateManager* esm = presShell->GetPresContext()->EventStateManager();
+  PRBool fireAllEvents = PR_TRUE;//IsContentLoaded() || esm->IsHandlingUserInputExternal();
+
+  // We don't create new accessibles on content removal.
+  nsAccessible* container = aIsInsert ?
+    GetAccService()->GetAccessibleOrContainer(aContainerNode, mWeakShell) :
+    GetAccService()->GetCachedAccessibleOrContainer(aContainerNode);
+
+  if (aIsInsert) {
+    // XXX: Invalidate parent-child relations for container accessible and its
+    // children because there's no good way to find insertion point of new child
+    // accessibles into accessible tree. We need to invalidate children even
+    // there's no inserted accessibles in the end because accessible children
+    // are created while parent recaches child accessibles.
+    container->InvalidateChildren();
+  }
+
+  EIsFromUserInput fromUserInput = esm->IsHandlingUserInputExternal() ?
+    eFromUserInput : eNoUserInput;
+
+  // Update the accessible tree in the case of content removal and fire events
+  // if allowed.
+  PRUint32 updateFlags =
+    UpdateTreeInternal(container, aStartNode, aEndNode,
+                       aIsInsert, fireAllEvents, fromUserInput);
+
+  // Content insertion/removal is not cause of accessible tree change.
+  if (updateFlags == eNoAccessible)
+    return;
+
+  // Check to see if change occurred inside an alert, and fire an EVENT_ALERT
+  // if it did.
+  if (aIsInsert && !(updateFlags & eAlertAccessible)) {
+    // XXX: tree traversal is perf issue, accessible should know if they are
+    // children of alert accessible to avoid this.
+    nsAccessible* ancestor = container;
+    while (ancestor) {
+      const nsRoleMapEntry* roleMapEntry = ancestor->GetRoleMapEntry();
+      if (roleMapEntry && roleMapEntry->role == nsIAccessibleRole::ROLE_ALERT) {
+        FireDelayedAccessibleEvent(nsIAccessibleEvent::EVENT_ALERT,
+                                   ancestor->GetNode(), AccEvent::eRemoveDupes,
+                                   fromUserInput);
+        break;
+      }
+
+      // Don't climb above this document.
+      if (ancestor == this)
+        break;
+
+      ancestor = ancestor->GetParent();
+    }
+  }
+
+  // Fire nether value change nor reorder events if action is not from user
+  // input and document is loading. We are notified about changes in editor
+  // synchronously, so from user input flag is correct for value change events.
+  if (!fireAllEvents)
+    return;
+
+  // Fire value change event.
+  if (container->Role() == nsIAccessibleRole::ROLE_ENTRY) {
+    nsRefPtr<AccEvent> valueChangeEvent =
+      new AccEvent(nsIAccessibleEvent::EVENT_VALUE_CHANGE, container,
+                   fromUserInput, AccEvent::eRemoveDupes);
+    FireDelayedAccessibleEvent(valueChangeEvent);
+  }
+
+  // Fire reorder event so the MSAA clients know the children have changed. Also
+  // the event is used internally by MSAA part.
+  nsRefPtr<AccEvent> reorderEvent =
+    new AccEvent(nsIAccessibleEvent::EVENT_REORDER, container->GetNode(),
+                 fromUserInput, AccEvent::eCoalesceFromSameSubtree);
+  if (reorderEvent)
+    FireDelayedAccessibleEvent(reorderEvent);
+}
+
+void
+nsDocAccessible::RecreateAccessible(nsINode* aNode)
+{
+  // XXX: we shouldn't recreate whole accessible subtree that happens when
+  // hide event is handled, instead we should subclass hide and show events
+  // to handle them separately and implement their coalescence with normal hide
+  // and show events.
+
+  nsAccessible* parent = nsnull;
+
+  // Fire hide event for old accessible.
+  nsAccessible* oldAccessible =
+    GetAccService()->GetAccessibleInWeakShell(aNode, mWeakShell);
+  if (oldAccessible) {
+    parent = oldAccessible->GetParent();
+
+    nsRefPtr<AccEvent> hideEvent = new AccHideEvent(oldAccessible, aNode,
+                                                    eAutoDetect);
+    if (hideEvent)
+      FireDelayedAccessibleEvent(hideEvent);
+
+    // Unbind old accessible from tree.
+    parent->RemoveChild(oldAccessible);
+
+    if (oldAccessible->IsPrimaryForNode() &&
+        mNodeToAccessibleMap.Get(oldAccessible->GetNode()) == oldAccessible)
+      mNodeToAccessibleMap.Remove(oldAccessible->GetNode());
+
+  } else {
+    parent = GetAccService()->GetContainerAccessible(aNode, mWeakShell);
+  }
+
+  // Get new accessible and fire show event.
+  parent->InvalidateChildren();
+
+  nsAccessible* newAccessible =
+    GetAccService()->GetAccessibleInWeakShell(aNode, mWeakShell);
+  if (newAccessible) {
+    nsRefPtr<AccEvent> showEvent = new AccShowEvent(newAccessible, aNode,
+                                                    eAutoDetect);
+    if (showEvent)
+      FireDelayedAccessibleEvent(showEvent);
+  }
+
+  // Fire reorder event.
+  if (oldAccessible || newAccessible) {
+    nsRefPtr<AccEvent> reorderEvent =
+      new AccEvent(nsIAccessibleEvent::EVENT_REORDER, parent->GetNode(),
+                   eAutoDetect, AccEvent::eCoalesceFromSameSubtree);
+
+    if (reorderEvent)
+      FireDelayedAccessibleEvent(reorderEvent);
+  }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // Protected members
 
 void
 nsDocAccessible::FireValueChangeForTextFields(nsAccessible *aAccessible)
 {
   if (aAccessible->Role() != nsIAccessibleRole::ROLE_ENTRY)
     return;
 
   // Dependent value change event for text changes in textfields
   nsRefPtr<AccEvent> valueChangeEvent =
     new AccEvent(nsIAccessibleEvent::EVENT_VALUE_CHANGE, aAccessible,
-                 PR_FALSE, eAutoDetect, AccEvent::eRemoveDupes);
+                 eAutoDetect, AccEvent::eRemoveDupes);
   FireDelayedAccessibleEvent(valueChangeEvent);
 }
 
 void
 nsDocAccessible::FireTextChangeEventForText(nsIContent *aContent,
                                             CharacterDataChangeInfo* aInfo,
                                             PRBool aIsInserted)
 {
@@ -1421,106 +1536,30 @@ nsDocAccessible::FireTextChangeEventForT
   if (text.IsEmpty())
     return;
 
   // Normally we only fire delayed events created from the node, not an
   // accessible object. See the AccTextChangeEvent constructor for details
   // about this exceptional case.
   nsRefPtr<AccEvent> event =
     new AccTextChangeEvent(textAccessible, offset + textOffset, text,
-                           aIsInserted, PR_FALSE);
+                          aIsInserted);
   FireDelayedAccessibleEvent(event);
 
   FireValueChangeForTextFields(textAccessible);
 }
 
-already_AddRefed<AccEvent>
-nsDocAccessible::CreateTextChangeEventForNode(nsAccessible *aContainerAccessible,
-                                              nsIContent *aChangeNode,
-                                              nsAccessible *aChangeChild,
-                                              PRBool aIsInserting,
-                                              PRBool aIsAsynch,
-                                              EIsFromUserInput aIsFromUserInput)
-{
-  nsRefPtr<nsHyperTextAccessible> textAccessible =
-    do_QueryObject(aContainerAccessible);
-  if (!textAccessible) {
-    return nsnull;
-  }
-
-  nsAutoString text;
-  PRInt32 offset = 0;
-  if (aChangeChild) {
-    // Don't fire event for the first html:br in an editor.
-    if (aChangeChild->Role() == nsIAccessibleRole::ROLE_WHITESPACE) {
-      nsCOMPtr<nsIEditor> editor;
-      textAccessible->GetAssociatedEditor(getter_AddRefs(editor));
-      if (editor) {
-        PRBool isEmpty = PR_FALSE;
-        editor->GetDocumentIsEmpty(&isEmpty);
-        if (isEmpty) {
-          return nsnull;
-        }
-      }
-    }
-
-    offset = textAccessible->GetChildOffset(aChangeChild);
-    aChangeChild->AppendTextTo(text, 0, PR_UINT32_MAX);
-
-  } else {
-    // A span-level object or something else without an accessible is being
-    // added, where it has no accessible but it has descendant content which is
-    // aggregated as text into the parent hypertext. In this case, changed text
-    // is compounded from all accessible contained in changed node.
-    nsAccTreeWalker walker(mWeakShell, aChangeNode,
-                           GetAllowsAnonChildAccessibles());
-    nsRefPtr<nsAccessible> child = walker.GetNextChild();
-
-    // No descendant content that represents any text in the hypertext parent.
-    if (!child)
-      return nsnull;
-
-    offset = textAccessible->GetChildOffset(child);
-    child->AppendTextTo(text, 0, PR_UINT32_MAX);
-
-    nsINode* containerNode = textAccessible->GetNode();
-    PRInt32 childCount = textAccessible->GetChildCount();
-    PRInt32 childIdx = child->GetIndexInParent();
-
-    for (PRInt32 idx = childIdx + 1; idx < childCount; idx++) {
-      nsAccessible* nextChild = textAccessible->GetChildAt(idx);
-      // We only want accessibles with DOM nodes as children of this node.
-      if (!nsCoreUtils::IsAncestorOf(aChangeNode, nextChild->GetNode(),
-                                     containerNode))
-        break;
-
-      nextChild->AppendTextTo(text, 0, PR_UINT32_MAX);
-    }
-  }
-
-  if (text.IsEmpty())
-    return nsnull;
-
-  AccEvent* event = new AccTextChangeEvent(aContainerAccessible, offset, text,
-                                           aIsInserting, aIsAsynch,
-                                           aIsFromUserInput);
-  NS_IF_ADDREF(event);
-
-  return event;
-}
-
 // nsDocAccessible public member
 nsresult
 nsDocAccessible::FireDelayedAccessibleEvent(PRUint32 aEventType, nsINode *aNode,
                                             AccEvent::EEventRule aAllowDupes,
-                                            PRBool aIsAsynch,
                                             EIsFromUserInput aIsFromUserInput)
 {
   nsRefPtr<AccEvent> event =
-    new AccEvent(aEventType, aNode, aIsAsynch, aIsFromUserInput, aAllowDupes);
+    new AccEvent(aEventType, aNode, aIsFromUserInput, aAllowDupes);
   NS_ENSURE_TRUE(event, NS_ERROR_OUT_OF_MEMORY);
 
   return FireDelayedAccessibleEvent(event);
 }
 
 // nsDocAccessible public member
 nsresult
 nsDocAccessible::FireDelayedAccessibleEvent(AccEvent* aEvent)
@@ -1529,509 +1568,174 @@ nsDocAccessible::FireDelayedAccessibleEv
   NS_LOG_ACCDOCLOAD_FIREEVENT(aEvent)
 
   if (mEventQueue)
     mEventQueue->Push(aEvent);
 
   return NS_OK;
 }
 
+// nsDocAccessible public member
 void
 nsDocAccessible::ProcessPendingEvent(AccEvent* aEvent)
-{  
-  nsAccessible *accessible = aEvent->GetAccessible();
-  nsINode *node = aEvent->GetNode();
-
-  PRUint32 eventType = aEvent->GetEventType();
-  EIsFromUserInput isFromUserInput =
-    aEvent->IsFromUserInput() ? eFromUserInput : eNoUserInput;
-
-  PRBool isAsync = aEvent->IsAsync();
-
-  if (node == gLastFocusedNode && isAsync &&
-      (eventType == nsIAccessibleEvent::EVENT_SHOW ||
-       eventType == nsIAccessibleEvent::EVENT_HIDE)) {
-    // If frame type didn't change for this event, then we don't actually need to invalidate
-    // However, we only keep track of the old frame type for the focus, where it's very
-    // important not to destroy and recreate the accessible for minor style changes,
-    // such as a:focus { overflow: scroll; }
-    nsCOMPtr<nsIContent> focusContent(do_QueryInterface(node));
-    if (focusContent) {
-      nsIFrame *focusFrame = focusContent->GetPrimaryFrame();
-      nsIAtom *newFrameType =
-        (focusFrame && focusFrame->GetStyleVisibility()->IsVisible()) ?
-        focusFrame->GetType() : nsnull;
-
-      if (newFrameType == gLastFocusedFrameType) {
-        // Don't need to invalidate this current accessible, but can
-        // just invalidate the children instead
-        FireShowHideEvents(node, PR_TRUE, eventType, eNormalEvent,
-                           isAsync, isFromUserInput);
-        return;
-      }
-      gLastFocusedFrameType = newFrameType;
-    }
-  }
-
-  if (eventType == nsIAccessibleEvent::EVENT_SHOW) {
-
-    nsAccessible* containerAccessible = nsnull;
-    if (accessible) {
-      containerAccessible = accessible->GetParent();
-    } else {
-      nsCOMPtr<nsIWeakReference> weakShell(nsCoreUtils::GetWeakShellFor(node));
-      containerAccessible = GetAccService()->GetContainerAccessible(node,
-                                                                    weakShell);
-    }
-
-    if (!containerAccessible)
-      containerAccessible = this;
-
-    if (isAsync) {
-      // For asynch show, delayed invalidatation of parent's children
-      containerAccessible->InvalidateChildren();
-
-      // Some show events in the subtree may have been removed to 
-      // avoid firing redundant events. But, we still need to make sure any
-      // accessibles parenting those shown nodes lose their child references.
-      InvalidateChildrenInSubtree(node);
-    }
-
-    // Also fire text changes if the node being created could affect the text in an nsIAccessibleText parent.
-    // When a node is being made visible or is inserted, the text in an ancestor hyper text will gain characters
-    // At this point we now have the frame and accessible for this node if there is one. That is why we
-    // wait to fire this here, instead of in InvalidateCacheSubtree(), where we wouldn't be able to calculate
-    // the offset, length and text for the text change.
-    if (node && node != mDocument) {
-      nsCOMPtr<nsIContent> content(do_QueryInterface(node));
-      nsRefPtr<AccEvent> textChangeEvent =
-        CreateTextChangeEventForNode(containerAccessible, content, accessible,
-                                     PR_TRUE, PR_TRUE, isFromUserInput);
-      if (textChangeEvent) {
-        // XXX Queue them up and merge the text change events
-        // XXX We need a way to ignore SplitNode and JoinNode() when they
-        // do not affect the text within the hypertext
-        nsEventShell::FireEvent(textChangeEvent);
-      }
-    }
-
-    // Fire show/create events for this node or first accessible descendants of it
-    FireShowHideEvents(node, PR_FALSE, eventType, eNormalEvent, isAsync,
-                       isFromUserInput); 
-    return;
-  }
-
-  if (accessible) {
-    if (eventType == nsIAccessibleEvent::EVENT_TEXT_CARET_MOVED) {
-      nsCOMPtr<nsIAccessibleText> accessibleText = do_QueryObject(accessible);
-      PRInt32 caretOffset;
-      if (accessibleText && NS_SUCCEEDED(accessibleText->GetCaretOffset(&caretOffset))) {
-#ifdef DEBUG_A11Y
-        PRUnichar chAtOffset;
-        accessibleText->GetCharacterAtOffset(caretOffset, &chAtOffset);
-        printf("\nCaret moved to %d with char %c", caretOffset, chAtOffset);
-#endif
-#ifdef DEBUG_CARET
-        // Test caret line # -- fire an EVENT_ALERT on the focused node so we can watch the
-        // line-number object attribute on it
-        nsAccessible *focusedAcc =
-          GetAccService()->GetAccessible(gLastFocusedNode);
-        nsEventShell::FireEvent(nsIAccessibleEvent::EVENT_ALERT, focusedAcc);
-#endif
-        nsRefPtr<AccEvent> caretMoveEvent =
-          new AccCaretMoveEvent(accessible, caretOffset);
-        if (!caretMoveEvent)
-          return;
-
-        nsEventShell::FireEvent(caretMoveEvent);
-
-        PRInt32 selectionCount;
-        accessibleText->GetSelectionCount(&selectionCount);
-        if (selectionCount) {  // There's a selection so fire selection change as well
-          nsEventShell::FireEvent(nsIAccessibleEvent::EVENT_TEXT_SELECTION_CHANGED,
-                                  accessible, PR_TRUE);
-        }
-      } 
-    }
-    else if (eventType == nsIAccessibleEvent::EVENT_REORDER) {
-      // Fire reorder event if it's unconditional (see InvalidateCacheSubtree
-      // method) or if changed node (that is the reason of this reorder event)
-      // is accessible or has accessible children.
-      AccReorderEvent* reorderEvent = downcast_accEvent(aEvent);
-      if (reorderEvent->IsUnconditionalEvent() ||
-          reorderEvent->HasAccessibleInReasonSubtree()) {
-        nsEventShell::FireEvent(aEvent);
-      }
-    }
-    else {
-      nsEventShell::FireEvent(aEvent);
-
-      // Post event processing
-      if (eventType == nsIAccessibleEvent::EVENT_HIDE && node) {
-        // Shutdown nsIAccessNode's or nsIAccessibles for any DOM nodes in
-        // this subtree.
-        // XXX: Will this bite us with asynch events.
-        RefreshNodes(node);
-      }
-    }
-  }
-}
-
-void
-nsDocAccessible::InvalidateChildrenInSubtree(nsINode *aStartNode)
 {
-  nsAccessible *accessible = GetCachedAccessible(aStartNode);
-  if (accessible)
-    accessible->InvalidateChildren();
-
-  // Invalidate accessible children in the DOM subtree 
-  PRInt32 index, numChildren = aStartNode->GetChildCount();
-  for (index = 0; index < numChildren; index ++) {
-    nsINode *childNode = aStartNode->GetChildAt(index);
-    InvalidateChildrenInSubtree(childNode);
-  }
-}
-
-void
-nsDocAccessible::RefreshNodes(nsINode *aStartNode)
-{
-  if (mAccessibleCache.Count() <= 1) {
-    return; // All we have is a doc accessible. There is nothing to invalidate, quit early
-  }
-
-  // Shut down accessible subtree, which may have been created for anonymous
-  // content subtree.
-  nsAccessible *accessible = GetCachedAccessible(aStartNode);
-  if (accessible) {
-    // Fire menupopup end if a menu goes away
-    if (accessible->Role() == nsIAccessibleRole::ROLE_MENUPOPUP) {
-      nsCOMPtr<nsIDOMXULPopupElement> popup(do_QueryInterface(aStartNode));
-      if (!popup) {
-        // Popup elements already fire these via DOMMenuInactive
-        // handling in nsRootAccessible::HandleEvent
-        nsEventShell::FireEvent(nsIAccessibleEvent::EVENT_MENUPOPUP_END,
-                                accessible);
-      }
-    }
-
-    // We only need to shutdown the accessibles here if one of them has been
-    // created.
-    if (accessible->GetCachedChildCount() > 0) {
-      nsCOMPtr<nsIArray> children;
-      // use GetChildren() to fetch all children at once, because after shutdown
-      // the child references are cleared.
-      accessible->GetChildren(getter_AddRefs(children));
-      PRUint32 childCount =0;
-      if (children)
-        children->GetLength(&childCount);
-      nsINode *possibleAnonNode = nsnull;
-      for (PRUint32 index = 0; index < childCount; index++) {
-        nsRefPtr<nsAccessNode> childAccessNode;
-        children->QueryElementAt(index, NS_GET_IID(nsAccessNode),
-                                 getter_AddRefs(childAccessNode));
-        possibleAnonNode = childAccessNode->GetNode();
-        nsCOMPtr<nsIContent> iterContent = do_QueryInterface(possibleAnonNode);
-        if (iterContent && iterContent->IsInAnonymousSubtree()) {
-          // IsInAnonymousSubtree() check is a perf win -- make sure we don't
-          // shut down the same subtree twice since we'll reach non-anon content via
-          // DOM traversal later in this method
-          RefreshNodes(possibleAnonNode);
-        }
-      }
-    }
-  }
-
-  // Shutdown ordinary content subtree as well -- there may be
-  // access node children which are not full accessible objects
-  PRUint32 childCount = aStartNode->GetChildCount();
-  for (PRUint32 childIdx = 0; childIdx < childCount; childIdx++) {
-    nsIContent *childContent = aStartNode->GetChildAt(childIdx);
-    RefreshNodes(childContent);
-  }
-
+  nsAccessible* accessible = aEvent->GetAccessible();
   if (!accessible)
     return;
 
-  if (accessible == this) {
-    // Don't shutdown our doc object -- this may just be from the finished loading.
-    // We will completely shut it down when the pagehide event is received
-    // However, we must invalidate the doc accessible's children in order to be sure
-    // all pointers to them are correct
-    InvalidateChildren();
-    return;
+  PRUint32 eventType = aEvent->GetEventType();
+
+  if (eventType == nsIAccessibleEvent::EVENT_TEXT_CARET_MOVED) {
+    nsCOMPtr<nsIAccessibleText> accessibleText = do_QueryObject(accessible);
+    PRInt32 caretOffset;
+    if (accessibleText &&
+        NS_SUCCEEDED(accessibleText->GetCaretOffset(&caretOffset))) {
+#ifdef DEBUG_A11Y
+      PRUnichar chAtOffset;
+      accessibleText->GetCharacterAtOffset(caretOffset, &chAtOffset);
+      printf("\nCaret moved to %d with char %c", caretOffset, chAtOffset);
+#endif
+#ifdef DEBUG_CARET
+      // Test caret line # -- fire an EVENT_ALERT on the focused node so we can watch the
+      // line-number object attribute on it
+      nsAccessible* focusedAcc =
+        GetAccService()->GetAccessible(gLastFocusedNode);
+      nsEventShell::FireEvent(nsIAccessibleEvent::EVENT_ALERT, focusedAcc);
+#endif
+      nsRefPtr<AccEvent> caretMoveEvent =
+          new AccCaretMoveEvent(accessible, caretOffset);
+      if (!caretMoveEvent)
+        return;
+
+      nsEventShell::FireEvent(caretMoveEvent);
+
+      PRInt32 selectionCount;
+      accessibleText->GetSelectionCount(&selectionCount);
+      if (selectionCount) {  // There's a selection so fire selection change as well
+        nsEventShell::FireEvent(nsIAccessibleEvent::EVENT_TEXT_SELECTION_CHANGED,
+                                accessible);
+      }
+    }
   }
+  else {
+    nsEventShell::FireEvent(aEvent);
 
-  // Shut down the actual accessible or access node
-  void *uniqueID;
-  accessible->GetUniqueID(&uniqueID);
-  accessible->Shutdown();
-
-  // Remove from hash table as well
-  mAccessibleCache.Remove(uniqueID);
+    // Post event processing
+    if (eventType == nsIAccessibleEvent::EVENT_HIDE)
+      ShutdownChildrenInSubtree(accessible);
+  }
 }
 
-// nsDocAccessible public member
-void
-nsDocAccessible::InvalidateCacheSubtree(nsIContent *aChild,
-                                        PRUint32 aChangeType)
+PRUint32
+nsDocAccessible::UpdateTreeInternal(nsAccessible* aContainer,
+                                    nsIContent* aStartNode,
+                                    nsIContent* aEndNode,
+                                    PRBool aIsInsert,
+                                    PRBo