wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 736123 - kill GetVendor() and EGLUtils.h - r=jrmuizel

Browse Source 
Was only returning "Android" instead of something useful.
This commit is contained in:
Benoit Jacob 2012-04-30 17:43:12 -04:00
parent ab2060c307
commit a18775a5a3
4 changed files with 2 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
gfx/gl/EGLUtils.h
View File

@ -1,42 +0,0 @@
/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Initial Developer of the Original Code is Mozilla Foundation.
* Portions created by the Initial Developer are Copyright (C) 2010
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
namespace mozilla {
namespace gl {
const char*
GetVendor();
}
}

11
gfx/gl/GLContextProviderEGL.cpp
View File

@ -140,7 +140,6 @@ public:
#include "GLLibraryEGL.h"
#include "nsDebug.h"
#include "nsThreadUtils.h"
#include "EGLUtils.h"
#include "nsIWidget.h"
@ -1514,16 +1513,6 @@ CreateSurfaceForWindow(nsIWidget *aWidget, EGLConfig config)
return surface;
}
const char*
GetVendor()
{
if (!sEGLLibrary.EnsureInitialized()) {
return nsnull;
}
return reinterpret_cast<const char*>(sEGLLibrary.fQueryString(EGL_DISPLAY(), LOCAL_EGL_VENDOR));
}
already_AddRefed<GLContext>
GLContextProviderEGL::CreateForWindow(nsIWidget *aWidget)
{

1
gfx/gl/Makefile.in
View File

@ -52,7 +52,6 @@ EXPORTS = \
GLContextProvider.h \
GLContextProviderImpl.h \
GLLibraryLoader.h \
EGLUtils.h \
ForceDiscreteGPUHelperCGL.h \
$(NULL)

5
widget/android/GfxInfo.cpp
View File

@ -38,7 +38,6 @@
#include "mozilla/FunctionTimer.h"
#include "prenv.h"
#include "prprf.h"
#include "EGLUtils.h"
#include "nsHashKeys.h"
#include "AndroidBridge.h"
@ -92,11 +91,11 @@ GfxInfo::GetCleartypeParameters(nsAString & aCleartypeParams)
nsresult
GfxInfo::Init()
{
mAdapterDescription.AssignASCII(mozilla::gl::GetVendor());
mAdapterDescription.AssignLiteral(""); // we may append to it below
if (mozilla::AndroidBridge::Bridge()) {
nsAutoString str;
mAdapterDescription.Append(NS_LITERAL_STRING(", Model: '"));
mAdapterDescription.Append(NS_LITERAL_STRING("Model: '"));
if (mozilla::AndroidBridge::Bridge()->GetStaticStringField("android/os/Build", "MODEL", str)) {
mAdapterDeviceID = str;
mAdapterDescription.Append(str);