Commit 1fb78282 authored by Yury Delendik's avatar Yury Delendik Committed by Georg Koppen
Browse files

Bug 1250046 - Remove Shumway references from IPC. r=jmathies

parent 397885e9

dom/plugins/ipc/PluginInstanceParent.cpp

+0 −5
Original line number Diff line number Diff line
@@ -68,10 +68,6 @@ extern const wchar_t* kFlashFullscreenClass; 
#include <ApplicationServices/ApplicationServices.h>

#endif // defined(XP_MACOSX)



// This is the pref used to determine whether to use Shumway on a Flash object

// (when Shumway is enabled).

static const char kShumwayWhitelistPref[] = "shumway.swf.whitelist";



using namespace mozilla::plugins;

using namespace mozilla::layers;

using namespace mozilla::gl;
@@ -122,7 +118,6 @@ PluginInstanceParent::PluginInstanceParent(PluginModuleParent* parent, 
    , mUseSurrogate(true)

    , mNPP(npp)

    , mNPNIface(npniface)

    , mIsWhitelistedForShumway(false)

    , mWindowType(NPWindowTypeWindow)

    , mDrawingModel(kDefaultDrawingModel)

    , mLastRecordedDrawingModel(-1)

dom/plugins/ipc/PluginInstanceParent.h

+0 −13
Original line number Diff line number Diff line
@@ -314,18 +314,6 @@ public: 
        aOutput = mSrcAttribute;

    }



    /**

     * This function tells us whether this plugin instance would have been

     * whitelisted for Shumway if Shumway had been enabled. This is being used

     * for the purpose of gathering telemetry on Flash hangs that could

     * potentially be avoided by using Shumway instead.

     */

    bool

    IsWhitelistedForShumway() const

    {

        return mIsWhitelistedForShumway;

    }



    virtual bool

    AnswerPluginFocusChange(const bool& gotFocus) override;
@@ -389,7 +377,6 @@ private: 
    NPP mNPP;

    const NPNetscapeFuncs* mNPNIface;

    nsCString mSrcAttribute;

    bool mIsWhitelistedForShumway;

    NPWindowType mWindowType;

    int16_t mDrawingModel;

dom/plugins/ipc/PluginModuleParent.cpp

+0 −18
Original line number Diff line number Diff line
@@ -1152,24 +1152,6 @@ PluginModuleChromeParent::AnnotateHang(mozilla::HangMonitor::HangAnnotations& aA 
        aAnnotations.AddAnnotation(NS_LITERAL_STRING("pluginName"), mPluginName);

        aAnnotations.AddAnnotation(NS_LITERAL_STRING("pluginVersion"),

                                   mPluginVersion);

        if (mIsFlashPlugin) {

            bool isWhitelistedForShumway = false;

            { // Scope for lock

                mozilla::MutexAutoLock lock(mHangAnnotatorMutex);

                if (!mProtocolCallStack.IsEmpty()) {

                    mozilla::ipc::IProtocol* topProtocol =

                        mProtocolCallStack.LastElement();

                    PluginInstanceParent* instance =

                        GetManagingInstance(topProtocol);

                    if (instance) {

                        isWhitelistedForShumway =

                            instance->IsWhitelistedForShumway();

                    }

                }

            }

            aAnnotations.AddAnnotation(NS_LITERAL_STRING("pluginIsWhitelistedForShumway"),

                                       isWhitelistedForShumway);

        }

    }

}