mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Merge m-c to inbound.
This commit is contained in:
commit
4dc928a360
@ -3131,7 +3131,9 @@ this.DOMApplicationRegistry = {
|
||||
} catch(e) { }
|
||||
});
|
||||
// Send back an answer to the child.
|
||||
ppmm.broadcastAsyncMessage("Webapps:ClearBrowserData:Return", msg);
|
||||
if (msg) {
|
||||
ppmm.broadcastAsyncMessage("Webapps:ClearBrowserData:Return", msg);
|
||||
}
|
||||
},
|
||||
|
||||
registerBrowserElementParentForApp: function(bep, appId) {
|
||||
|
@ -163,9 +163,9 @@ BytesPerPixelForPixelFormat(android::PixelFormat aFormat)
|
||||
case PIXEL_FORMAT_A_8:
|
||||
return 1;
|
||||
default:
|
||||
MOZ_NOT_REACHED("Unknown gralloc pixel format");
|
||||
return 0;
|
||||
}
|
||||
return gfxASurface::ImageFormatARGB32;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static android::PixelFormat
|
||||
|
Loading…
Reference in New Issue
Block a user