Commit 1a923cc3 authored by Doug Sherk's avatar Doug Sherk
Browse files

Bug 689598: fix crash reporter on Android r=BenWa

parent 0d1edb8e

widget/src/android/GfxInfo.cpp

+2 −7
Original line number Diff line number Diff line
@@ -88,8 +88,6 @@ GfxInfo::GetCleartypeParameters(nsAString & aCleartypeParams) 
nsresult

GfxInfo::Init()

{

  mSetCrashReportAnnotations = false;



  mAdapterDescription.AssignASCII(mozilla::gl::GetVendor());

  if (mozilla::AndroidBridge::Bridge()) {

    nsAutoString str;
@@ -124,6 +122,8 @@ GfxInfo::Init() 
    mAndroidSDKVersion = version;

  }



  AddOpenGLCrashReportAnnotations();



  return GfxInfoBase::Init();

}
@@ -311,11 +311,6 @@ GfxInfo::GetFeatureStatusImpl(PRInt32 aFeature, 
  // Don't evaluate special cases when evaluating the downlaoded blocklist.

  if (!aDriverInfo.Length()) {

    if (aFeature == FEATURE_OPENGL_LAYERS) {

      if (!mSetCrashReportAnnotations) {

        AddOpenGLCrashReportAnnotations();

        mSetCrashReportAnnotations = true;

      }



      /* The following code is an old way to whitelist devices when we're ready.

       * It is staying here for reference. The best way to do this now is to add

       * an entry in the list above. There is a dummy entry which will whitelist a

widget/src/android/GfxInfo.h

+0 −1
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ protected: 
private:



  void     AddOpenGLCrashReportAnnotations();

  bool     mSetCrashReportAnnotations;

  nsString mRendererIDsString;

  nsString mAdapterRAMString;