Revision 8598e8717ddd8daf383d81952a6c02a29a4ecb60 authored by Jordan Lund on 25 February 2016, 21:25:37 UTC, committed by Jordan Lund on 25 February 2016, 21:25:37 UTC
I tested this via running fx_desktop_build.py with and without this patch and compared self.config: ``` ./scripts/fx_desktop_build.py --cfg configs/builds/releng_base_linux_64_builds.py --custom-build-variant-cfg debug --branch date --build-pool production --developer-run --dump-config ``` diff -pU 10 logs/localconfig_without_patch.json logs/localconfig_with_patch.json here is the diff of the above: http://people.mozilla.org/~jlund/update-channel-self-config.diff MozReview-Commit-ID: J82rgamohTk --HG-- extra : source : 9bcdab8d416f0ae3db1bef533f778d08d797f5dd extra : intermediate-source : fd9990a554a2120bb0f9fe59f575562a808323c4
1 parent c8c77b1
GfxInfoWebGL.cpp
/* vim: se cin sw=2 ts=2 et : */
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "GfxInfoWebGL.h"
#include "nsServiceManagerUtils.h"
#include "GLDefs.h"
#include "nsIDOMWebGLRenderingContext.h"
#include "nsICanvasRenderingContextInternal.h"
using namespace mozilla::widget;
nsresult
GfxInfoWebGL::GetWebGLParameter(const nsAString& aParam, nsAString& aResult)
{
GLenum param;
if (aParam.EqualsLiteral("vendor")) param = LOCAL_GL_VENDOR;
else if (aParam.EqualsLiteral("renderer")) param = LOCAL_GL_RENDERER;
else if (aParam.EqualsLiteral("version")) param = LOCAL_GL_VERSION;
else if (aParam.EqualsLiteral("shading_language_version")) param = LOCAL_GL_SHADING_LANGUAGE_VERSION;
else if (aParam.EqualsLiteral("extensions")) param = LOCAL_GL_EXTENSIONS;
else if (aParam.EqualsLiteral("full-renderer")) param = 0;
else return NS_ERROR_INVALID_ARG;
nsCOMPtr<nsIDOMWebGLRenderingContext> webgl =
do_CreateInstance("@mozilla.org/content/canvas-rendering-context;1?id=webgl");
if (!webgl)
return NS_ERROR_NOT_AVAILABLE;
nsCOMPtr<nsICanvasRenderingContextInternal> webglInternal =
do_QueryInterface(webgl);
if (!webglInternal)
return NS_ERROR_NOT_AVAILABLE;
nsresult rv = webglInternal->SetDimensions(16, 16);
NS_ENSURE_SUCCESS(rv, rv);
if (param)
return webgl->MozGetUnderlyingParamString(param, aResult);
// this is the "full renderer" string, which is vendor + renderer + version
nsAutoString str;
rv = webgl->MozGetUnderlyingParamString(LOCAL_GL_VENDOR, str);
NS_ENSURE_SUCCESS(rv, rv);
aResult.Append(str);
aResult.AppendLiteral(" -- ");
rv = webgl->MozGetUnderlyingParamString(LOCAL_GL_RENDERER, str);
NS_ENSURE_SUCCESS(rv, rv);
aResult.Append(str);
aResult.AppendLiteral(" -- ");
rv = webgl->MozGetUnderlyingParamString(LOCAL_GL_VERSION, str);
NS_ENSURE_SUCCESS(rv, rv);
aResult.Append(str);
return NS_OK;
}
Computing file changes ...