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

Backed out changeset 6f05267b4afc (bug 798033) for Android bustage.

Browse Source
This commit is contained in:
Ryan VanderMeulen
2014-03-05 09:55:52 -05:00
parent c31c559910
commit 86af8bac61
42 changed files with 179 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dom/plugins/base/nsNPAPIPlugin.cpp
View File

@@ -540,7 +540,7 @@ MakeNewNPAPIStreamInternal(NPP npp, const char *relativeURL, const char *target,
// Set aCallNotify here to false. If pluginHost->GetURL or PostURL fail,
// the listener's destructor will do the notification while we are about to
// return a failure code.
// Call SetCallNotify(true) below after we are sure we cannot return a failure
// Call SetCallNotify(true) below after we are sure we cannot return a failure
// code.
if (!target) {
inst->NewStreamListener(relativeURL, notifyData,
@@ -611,7 +611,7 @@ public:
return (mFunc != nullptr);
}
private:
private:
NPP mInstance;
PluginThreadCallback mFunc;
void *mUserData;
@@ -1063,10 +1063,10 @@ _destroystream(NPP npp, NPStream *pstream, NPError reason)
// This type of stream (NPStream) was created via NPN_NewStream. The plugin holds
// the reference until it is to be deleted here. Deleting the wrapper will
// release the wrapped nsIOutputStream.
//
//
// The NPStream the plugin references should always be a sub-object of it's own
// 'ndata', which is our nsNPAPIStramWrapper. See bug 548441.
NS_ASSERTION((char*)streamWrapper <= (char*)pstream &&
NS_ASSERTION((char*)streamWrapper <= (char*)pstream &&
((char*)pstream) + sizeof(*pstream)
<= ((char*)streamWrapper) + sizeof(*streamWrapper),
"pstream is not a subobject of wrapper");
@@ -2247,10 +2247,10 @@ _getvalue(NPP npp, NPNVariable variable, void *result)
uint32_t* bits = reinterpret_cast<uint32_t*>(result);
*bits = kBitmap_ANPDrawingModel && kSurface_ANPDrawingModel;
return NPERR_NO_ERROR;
}
}
case kJavaContext_ANPGetValue: {
jobject ret = mozilla::widget::android::GeckoAppShell::GetContext();
jobject ret = GeckoAppShell::GetContext();
if (!ret)
return NPERR_GENERIC_ERROR;