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

Bug 734306: Fix bad conversion from nsresult to NPError. r=bas

Browse Source
This commit is contained in:
Josh Aas
2012-03-12 10:39:54 -04:00
parent 14001e77e2
commit 671bce02a0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dom/plugins/base/nsNPAPIPluginInstance.cpp
View File

@@ -1488,7 +1488,7 @@ nsNPAPIPluginInstance::InitAsyncSurface(NPSize *size, NPImageFormat format,
if (mOwner) if (mOwner)
return mOwner->InitAsyncSurface(size, format, initData, surface); return mOwner->InitAsyncSurface(size, format, initData, surface);
return NS_ERROR_FAILURE; return NPERR_GENERIC_ERROR;
} }
NPError NPError
@@ -1497,7 +1497,7 @@ nsNPAPIPluginInstance::FinalizeAsyncSurface(NPAsyncSurface *surface)
if (mOwner) if (mOwner)
return mOwner->FinalizeAsyncSurface(surface); return mOwner->FinalizeAsyncSurface(surface);
return NS_ERROR_FAILURE; return NPERR_GENERIC_ERROR;
} }
void void

4
dom/plugins/base/nsPluginInstanceOwner.cpp
View File

@@ -804,12 +804,12 @@ NPBool nsPluginInstanceOwner::ConvertPoint(double sourceX, double sourceY, NPCoo
NPError nsPluginInstanceOwner::InitAsyncSurface(NPSize *size, NPImageFormat format, NPError nsPluginInstanceOwner::InitAsyncSurface(NPSize *size, NPImageFormat format,
void *initData, NPAsyncSurface *surface) void *initData, NPAsyncSurface *surface)
{ {
return NPERR_GENERIC_ERROR; return NPERR_INCOMPATIBLE_VERSION_ERROR;
} }
NPError nsPluginInstanceOwner::FinalizeAsyncSurface(NPAsyncSurface *) NPError nsPluginInstanceOwner::FinalizeAsyncSurface(NPAsyncSurface *)
{ {
return NPERR_GENERIC_ERROR; return NPERR_INCOMPATIBLE_VERSION_ERROR;
} }
void nsPluginInstanceOwner::SetCurrentAsyncSurface(NPAsyncSurface *, NPRect*) void nsPluginInstanceOwner::SetCurrentAsyncSurface(NPAsyncSurface *, NPRect*)