merge fx-team to mozilla-central a=merge

merge autoland to mozilla-central a=merge

Bug 1283679 - fix misspelled mask-composite:subtract keyword. r=dbaron MozReview-Commit-ID: 67UEtupOLoM

Bug 1283579 - Use data schema rather than outside document for test of bug 682592 to make it faster. r=jfkthame MozReview-Commit-ID: 6ccLpZF1qr8

Bug 1224994 part.13 Fix some comments which say "locked content" in TSFTextStore.cpp r=m_kato MozReview-Commit-ID: Jze8WtPx82G

Bug 1224994 part.12 Rename the variable names for the result of TSFTextStore::SelectionForTSF() to selectionForTSF r=m_kato MozReview-Commit-ID: 9gYiIKVohQl

Bug 1224994 part.11 Rename TSFTextStore::CurrentSelection() to TSFTextStore::SelectionForTSF() r=m_kato MozReview-Commit-ID: 9KVLN63NL9Z

Bug 1224994 part.10 Rename TSFTextStore::mSelection to TSFTextStore::mSelectionForTSF for making its meaning clearer r=m_kato MozReview-Commit-ID: K9tVAw9aCaN

Bug 1224994 part.9 TSFTextStore shouldn't set selection when there is unknown pending text changes r=m_kato I'm still not sure what we should do in this case, though. If mContentForTSF is initialized and there are some unknown changes in actual contents, i.e., not caused by composition of the active TIP itself, we cannot set selection range properly in some cases. For example, if TSF tires to set non-empty selection range but the range has been removed by web apps. For now, let's try to return E_FAIL in such case because that should occur at reconversion or something immediately after previous content change not caused by previous composition. If TIP does nothing in this case, user can retry with same operation after all pending text changes are notified to TSF. MozReview-Commit-ID: 9unrNVeC1tW

Bug 1224994 part.8 Don't notify TSF of text changes while there is cached content r=m_kato Same as selection change notification, text change notification shouldn't be notified to TSF while there is cachec content because neither TSF nor TIP may allow to change text by web applications during keeping storing cached content. This patch makes TSFTextStore stores and merges text changes until MaybeFlushPendingNotifications() is called and there is no cached content. MozReview-Commit-ID: 9fj0GREbX18

Bug 1224994 part.7 Don't notify TSF of selection changes while there is a cached content r=m_kato TSFTextStore shouldn't notify TSF of selection change until MaybeFlushPendingNotifications() is called and there is no cached content because while there is cached content, neither TSF nor TIP may allow to change selection by web applications. Therefore, ITextStoreACP::GetSelection() and similar methods need to use mSelection instead of actual selection in the focused editor. Therefore, TSFTextStore should store selection change data during keeping storing content cache and notify it when the cache is cleared. So, when TSFTextStore notifies TSF of selection change, TSFTextStore needs to update mSelection to the actual selection which is stored in mPendingSelectionChangeData. MozReview-Commit-ID: 8ZWASzu7Znv

Bug 1224994 part.6 Don't clear TSFTextStore::mContentForTSF until active composition is committed r=m_kato This patch stop clearing mContentForTSF at unlocking the document because we should keep it until active composition is committed. If so, TSF/TIP won't be confused by content changes by JS. So, this is important for a11y of TIP users in some complicated websites like GoogleDocs, Facebook, etc. Note that this patch doesn't work well without following patches. We need to stop notifying TSF of selection changes and text changed while mContentForTSF is valid. MozReview-Commit-ID: 9QOGZxdYU3I

Bug 1224994 part.5 Implement TSFTextStore::IsComposingInContent() to check if the focused editor has composition r=m_kato MozReview-Commit-ID: 2bmGeaxUpUU

Bug 1224994 part.4 Rename the variable name which is for storing the result of TSFTextStore::ContentForTSFRef() to contentForTSF r=m_kato MozReview-Commit-ID: 3wWMrpSWW6b

Bug 1224994 part.3 Rename TSFTextStore::mDeferClearingLockedContent to TSFTextStore::mDeferClearingContentForTSF r=m_kato MozReview-Commit-ID: 9cZ3Itx2zb4

Bug 1224994 part.2 Rename TSFTextStore::LockedContent() to TSFTextStore::ContentForTSFRef() r=m_kato MozReview-Commit-ID: JC4lgZu38e9

Bug 1224994 part.1 Rename TSFTextStore::mLockedContent to TSFTextStore::mContentForTSF r=m_kato MozReview-Commit-ID: 5K0zPW1Mx4b

Bug 1249497 - Use isolate-override for bdo elements. r=jfkthame MozReview-Commit-ID: 9Sx87z5gcqZ

Bug 1284292 - Allow GLScreenBuffer::CreateFactory to work without a CompositableForwarder r=gw280 - GLScreenBuffer::CreateFactory has been overloaded to accept either a CompositableForwarder or a ClientIPCAllocator. - WebVR 1.0 API implementation in Bug 1250244 uses GLScreenBuffer without a CompositableForwarder. MozReview-Commit-ID: GWR1XuIgPBT

Bug 1283596 - Update firefox-ui-tests task template files for local and remote tests. r=garndt Firefox-ui functional tests which use local test data should report with the Tier-1 level. Due to restrictions of Tier-1 the other tests with remote test data have to be kept as Tier-2 jobs. The patches reorganize our hierarchy of templates accordingly. MozReview-Commit-ID: 9QcuYUzkvwf