Bug 1647225 - Remove unused headers. r=geckoview-reviewers,agi
authorKartikaya Gupta <kgupta@mozilla.com>
Tue, 23 Jun 2020 15:14:32 +0000
changeset 536907 be50615e8f06bbc8886334692f6fbf907a7291d9
parent 536906 d828dd605e07231c3a298af723438059adc5bdff
child 536908 4eeda6c8d8c5de4d6f512a9b543e06823098e58e
push id37533
push userdluca@mozilla.com
push dateTue, 23 Jun 2020 21:38:40 +0000
treeherdermozilla-central@d48aa0f0aa0b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgeckoview-reviewers, agi
bugs1647225
milestone79.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1647225 - Remove unused headers. r=geckoview-reviewers,agi Differential Revision: https://phabricator.services.mozilla.com/D80452
widget/android/AndroidDirectTexture.h
widget/android/AndroidGraphicBuffer.h
deleted file mode 100644
--- a/widget/android/AndroidDirectTexture.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 20; 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/. */
-
-#ifndef AndroidDirectTexture_h_
-#define AndroidDirectTexture_h_
-
-#include "gfxTypes.h"
-#include "mozilla/Mutex.h"
-#include "AndroidGraphicBuffer.h"
-#include "nsRect.h"
-
-namespace mozilla {
-
-/**
- * This is a thread safe wrapper around AndroidGraphicBuffer that handles
- * double buffering. Each call to Bind() flips the buffer when necessary.
- *
- * You need to be careful when destroying an instance of this class. If either
- * buffer is locked by the application of the driver/hardware, bad things will
- * happen. Be sure that the OpenGL texture is no longer on the screen.
- */
-class AndroidDirectTexture {
- public:
-  AndroidDirectTexture(uint32_t width, uint32_t height, uint32_t usage,
-                       gfxImageFormat format);
-  virtual ~AndroidDirectTexture();
-
-  bool Lock(uint32_t usage, unsigned char** bits);
-  bool Lock(uint32_t usage, const nsIntRect& rect, unsigned char** bits);
-  bool Unlock(bool aFlip = true);
-
-  bool Reallocate(uint32_t aWidth, uint32_t aHeight);
-  bool Reallocate(uint32_t aWidth, uint32_t aHeight, gfxImageFormat aFormat);
-
-  uint32_t Width() { return mWidth; }
-  uint32_t Height() { return mHeight; }
-
-  bool Bind();
-
- private:
-  mozilla::Mutex mLock;
-  bool mNeedFlip;
-
-  uint32_t mWidth;
-  uint32_t mHeight;
-  gfxImageFormat mFormat;
-
-  AndroidGraphicBuffer* mFrontBuffer;
-  AndroidGraphicBuffer* mBackBuffer;
-
-  AndroidGraphicBuffer* mPendingReallocBuffer;
-  void ReallocPendingBuffer();
-};
-
-}  // namespace mozilla
-#endif /* AndroidDirectTexture_h_ */
deleted file mode 100644
--- a/widget/android/AndroidGraphicBuffer.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- Mode: C++; tab-width: 20; 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/. */
-
-#ifndef AndroidGraphicBuffer_h_
-#define AndroidGraphicBuffer_h_
-
-#include "gfxTypes.h"
-#include "nsRect.h"
-
-typedef void* EGLImageKHR;
-typedef void* EGLClientBuffer;
-
-namespace mozilla {
-
-/**
- * This class allows access to Android's direct texturing mechanism. Locking
- * the buffer gives you a pointer you can read/write to directly. It is fully
- * threadsafe, but you probably really want to use the AndroidDirectTexture
- * class which will handle double buffering.
- *
- * In order to use the buffer in OpenGL, just call Bind() and it will attach
- * to whatever texture is bound to GL_TEXTURE_2D.
- */
-class AndroidGraphicBuffer {
- public:
-  enum {
-    UsageSoftwareRead = 1,
-    UsageSoftwareWrite = 1 << 1,
-    UsageTexture = 1 << 2,
-    UsageTarget = 1 << 3,
-    Usage2D = 1 << 4
-  };
-
-  AndroidGraphicBuffer(uint32_t width, uint32_t height, uint32_t usage,
-                       gfxImageFormat format);
-  virtual ~AndroidGraphicBuffer();
-
-  int Lock(uint32_t usage, unsigned char** bits);
-  int Lock(uint32_t usage, const nsIntRect& rect, unsigned char** bits);
-  int Unlock();
-  bool Reallocate(uint32_t aWidth, uint32_t aHeight, gfxImageFormat aFormat);
-
-  uint32_t Width() { return mWidth; }
-  uint32_t Height() { return mHeight; }
-
-  bool Bind();
-
-  static bool IsBlacklisted();
-
- private:
-  uint32_t mWidth;
-  uint32_t mHeight;
-  uint32_t mUsage;
-  gfxImageFormat mFormat;
-
-  bool EnsureInitialized();
-  bool EnsureEGLImage();
-
-  void DestroyBuffer();
-  bool EnsureBufferCreated();
-
-  uint32_t GetAndroidUsage(uint32_t aUsage);
-  uint32_t GetAndroidFormat(gfxImageFormat aFormat);
-
-  void* mHandle;
-  void* mEGLImage;
-};
-
-}  // namespace mozilla
-#endif /* AndroidGraphicBuffer_h_ */