corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge mozilla-inbound to mozilla-central a=merge

Browse Source
This commit is contained in:
Carsten "Tomcat" Book
2017-06-29 15:47:04 +02:00
parent 1759948617 2d53b5dd88
commit dff92b2a3c
2910 changed files with 37357 additions and 27206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
widget/PuppetWidget.cpp
View File

@@ -1192,10 +1192,14 @@ PuppetWidget::GetNativeData(uint32_t aDataType)
{
switch (aDataType) {
case NS_NATIVE_SHAREABLE_WINDOW: {
MOZ_ASSERT(mTabChild, "Need TabChild to get the nativeWindow from!");
// NOTE: We can not have a tab child in some situations, such as when we're
// rendering to a fake widget for thumbnails.
if (!mTabChild) {
NS_WARNING("Need TabChild to get the nativeWindow from!");
}
mozilla::WindowsHandle nativeData = 0;
if (mTabChild) {
mTabChild->SendGetWidgetNativeData(&nativeData);
nativeData = mTabChild->WidgetNativeData();
}
return (void*)nativeData;
}