wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge m-c to inbound.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2013-06-07 15:28:41 -04:00
commit eeaf3c339a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/apps/src/Webapps.jsm
View File

@ -3131,7 +3131,9 @@ this.DOMApplicationRegistry = {
} catch(e) { } } catch(e) { }
}); });
// Send back an answer to the child. // 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) { registerBrowserElementParentForApp: function(bep, appId) {

4
gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp
View File

@ -163,9 +163,9 @@ BytesPerPixelForPixelFormat(android::PixelFormat aFormat)
case PIXEL_FORMAT_A_8: case PIXEL_FORMAT_A_8:
return 1; return 1;
default: default:
MOZ_NOT_REACHED("Unknown gralloc pixel format"); return 0;
} }
return gfxASurface::ImageFormatARGB32; return 0;
} }
static android::PixelFormat static android::PixelFormat