Backed out changeset c69b5af20a85 because Ms2ger already fixed it on m-c and this would only give a merge conflict
authorBenoit Jacob <bjacob@mozilla.com>
Thu, 09 Aug 2012 11:58:40 -0400
changeset 101966 28a61955e49cd1a46742af577d4b62d18b6980fb
parent 101965 c69b5af20a85c3e237cba78c87b0cb968214739f
child 101967 2adcd343440494c5acf39d548ede7b47e2caab2e
push id13249
push userbjacob@mozilla.com
push dateThu, 09 Aug 2012 15:59:59 +0000
treeherdermozilla-inbound@28a61955e49c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone17.0a1
backs outc69b5af20a85c3e237cba78c87b0cb968214739f
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset c69b5af20a85 because Ms2ger already fixed it on m-c and this would only give a merge conflict
dom/plugins/ipc/PluginInstanceParent.cpp
--- a/dom/plugins/ipc/PluginInstanceParent.cpp
+++ b/dom/plugins/ipc/PluginInstanceParent.cpp
@@ -445,17 +445,17 @@ PluginInstanceParent::AnswerNPN_SetValue
         ImageContainer *container = GetImageContainer();
         if (!container) {
             *result = NPERR_GENERIC_ERROR;
             return true;
         }
 
         mDrawingModel = drawingModel;
         *result = mNPNIface->setvalue(mNPP, NPPVpluginDrawingModel,
-                                      (void*)(intptr_t)drawingModel);
+                                      (void*)drawingModel);
 
         if (mRemoteImageDataShmem.IsWritable()) {
             container->SetRemoteImageData(nullptr, nullptr);
             container->SetCompositionNotifySink(nullptr);
             DeallocShmem(mRemoteImageDataShmem);
             mRemoteImageDataMutex = NULL;
         }
     } else {