bug 1276013, fix regression in e10s window name handling, r=mconley

--HG--
extra : rebase_source : 0ed994af42ae9f070fb31ec4a1e82914dbf7e48e
This commit is contained in:
Olli Pettay 2016-05-31 22:38:44 +03:00
Родитель 89b93668b8
Коммит ceff37e7d0
1 изменённых файлов: 5 добавлений и 2 удалений

Просмотреть файл

@ -5539,10 +5539,13 @@ ContentParent::RecvCreateWindow(PBrowserParent* aThisTab,
nsCOMPtr<mozIDOMWindowProxy> window; nsCOMPtr<mozIDOMWindowProxy> window;
TabParent::AutoUseNewTab aunt(newTab, aWindowIsNew, aURLToLoad); TabParent::AutoUseNewTab aunt(newTab, aWindowIsNew, aURLToLoad);
const char* name = aName.IsVoid() ? nullptr : NS_ConvertUTF16toUTF8(aName).get();
const char* features = aFeatures.IsVoid() ? nullptr : aFeatures.get(); const char* features = aFeatures.IsVoid() ? nullptr : aFeatures.get();
*aResult = pwwatch->OpenWindow2(parent, nullptr, name, features, aCalledFromJS, *aResult = pwwatch->OpenWindow2(parent, nullptr,
aName.IsVoid() ?
nullptr :
NS_ConvertUTF16toUTF8(aName).get(),
features, aCalledFromJS,
false, false, thisTabParent, nullptr, false, false, thisTabParent, nullptr,
aFullZoom, 1, getter_AddRefs(window)); aFullZoom, 1, getter_AddRefs(window));