Backed out 6 changesets (bug 1353867) for nsDocShell.cpp failures CLOSED TREE

Backed out changeset aa9b106b15d9 (bug 1353867)
Backed out changeset 8c05f4d3f7ad (bug 1353867)
Backed out changeset 00869bed4121 (bug 1353867)
Backed out changeset 700aeb906fd2 (bug 1353867)
Backed out changeset 8b60851b93da (bug 1353867)
Backed out changeset ebdf4531b3bd (bug 1353867)
This commit is contained in:
Bogdan Tara
2018-12-31 17:47:12 +02:00
parent 926c43944a
commit ad82504d5f
85 changed files with 605 additions and 2526 deletions

View File

@@ -2309,7 +2309,7 @@ nsDocShell::NotifyScrollObservers() {
NS_IMETHODIMP
nsDocShell::GetName(nsAString& aName) {
aName = mBrowsingContext->Name();
mBrowsingContext->GetName(aName);
return NS_OK;
}
@@ -13421,6 +13421,10 @@ nsDocShell::GetColorMatrix(uint32_t* aMatrixLen, float** aMatrix) {
bool nsDocShell::IsForceReloading() { return IsForceReloadType(mLoadType); }
BrowsingContext* nsDocShell::GetBrowsingContext() const {
return mBrowsingContext;
}
NS_IMETHODIMP
nsDocShell::GetBrowsingContext(BrowsingContext** aBrowsingContext) {
*aBrowsingContext = do_AddRef(mBrowsingContext).take();