Commit eba6e9f2 authored by Mark Finkle's avatar Mark Finkle
Browse files

Backout 39d5bb6c6d4d for reftest-2 failures on Android

parent f9a5a340

content/base/src/nsObjectLoadingContent.cpp

+0 −10
Original line number Diff line number Diff line
@@ -105,10 +105,6 @@ static PRLogModuleInfo* gObjectLog = PR_NewLogModule("objlc"); 
#define LOG(args) PR_LOG(gObjectLog, PR_LOG_DEBUG, args)

#define LOG_ENABLED() PR_LOG_TEST(gObjectLog, PR_LOG_DEBUG)



#ifdef ANDROID

#include "nsXULAppAPI.h"

#endif



class nsAsyncInstantiateEvent : public nsRunnable {

public:

  // This stores both the content and the frame so that Instantiate calls can be
@@ -1053,12 +1049,6 @@ nsObjectLoadingContent::AsyncOnChannelRedirect(nsIChannel *aOldChannel, 
nsEventStates

nsObjectLoadingContent::ObjectState() const

{

#ifdef ANDROID

  if (XRE_GetProcessType() == GeckoProcessType_Content) {

    return NS_EVENT_STATE_TYPE_CLICK_TO_PLAY;

  }

#endif



  switch (mType) {

    case eType_Loading:

      return NS_EVENT_STATE_LOADING;

content/events/public/nsEventStates.h

+0 −2
Original line number Diff line number Diff line
@@ -264,8 +264,6 @@ private: 
// Content is the full screen element, or a frame containing the

// current full-screen element.

#define NS_EVENT_STATE_FULL_SCREEN   NS_DEFINE_EVENT_STATE_MACRO(34)

// Handler for click to play plugin

#define NS_EVENT_STATE_TYPE_CLICK_TO_PLAY NS_DEFINE_EVENT_STATE_MACRO(35)



/**

 * NOTE: do not go over 63 without updating nsEventStates::InternalType!

dom/plugins/base/nsPluginHost.cpp

+0 −6
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ 
#include "nsXPCOMCID.h"

#include "nsISupportsPrimitives.h"



#include "nsXULAppAPI.h"

#include "nsIXULRuntime.h"



// for the dialog
@@ -2252,11 +2251,6 @@ nsresult nsPluginHost::ScanPluginsDirectoryList(nsISimpleEnumerator *dirEnum, 


nsresult nsPluginHost::LoadPlugins()

{

#ifdef ANDROID

  if (XRE_GetProcessType() == GeckoProcessType_Content) {

    return NS_OK;

  }

#endif

  // do not do anything if it is already done

  // use ReloadPlugins() to enforce loading

  if (mPluginsLoaded)

embedding/android/GeckoApp.java

+4 −0
Original line number Diff line number Diff line
@@ -151,15 +151,18 @@ abstract public class GeckoApp 
    public ArrayList<PackageInfo> mPackageInfoCache = new ArrayList<PackageInfo>();



    String[] getPluginDirectories() {



        ArrayList<String> directories = new ArrayList<String>();

        PackageManager pm = this.mAppContext.getPackageManager();

        List<ResolveInfo> plugins = pm.queryIntentServices(new Intent(PLUGIN_ACTION),

                PackageManager.GET_SERVICES | PackageManager.GET_META_DATA);



        synchronized(mPackageInfoCache) {



            // clear the list of existing packageInfo objects

            mPackageInfoCache.clear();





            for (ResolveInfo info : plugins) {



                // retrieve the plugin's service information
@@ -171,6 +174,7 @@ abstract public class GeckoApp 


                Log.w(LOGTAG, "Loading plugin: " + serviceInfo.packageName);





                // retrieve information from the plugin's manifest

                PackageInfo pkgInfo;

                try {

layout/style/nsCSSPseudoClassList.h

+0 −2
Original line number Diff line number Diff line
@@ -156,8 +156,6 @@ CSS_STATE_PSEUDO_CLASS(mozSuppressed, ":-moz-suppressed", 
CSS_STATE_PSEUDO_CLASS(mozLoading, ":-moz-loading", NS_EVENT_STATE_LOADING)

CSS_STATE_PSEUDO_CLASS(mozTypeUnsupported, ":-moz-type-unsupported",

                       NS_EVENT_STATE_TYPE_UNSUPPORTED)

CSS_STATE_PSEUDO_CLASS(mozHandlerClickToPlay, ":-moz-handler-clicktoplay",

                       NS_EVENT_STATE_TYPE_CLICK_TO_PLAY)

CSS_STATE_PSEUDO_CLASS(mozHandlerDisabled, ":-moz-handler-disabled",

                       NS_EVENT_STATE_HANDLER_DISABLED)

CSS_STATE_PSEUDO_CLASS(mozHandlerBlocked, ":-moz-handler-blocked",