Bug 1355187 - Update some of the ExternalImage data types to be more similar in Rust and C++. r=rhunt

The WrExternalImageId is currently a struct wrapping a uint64_t on the C++ side,
which is unnecessary as we can just typedef it directly to a uint64_t. On the
Rust side it's a tuple of (u64).

Also the WrExternalImageIdType enum should be WrExternalImageType for consistency.

MozReview-Commit-ID: DgOf4xfY9h3

gfx/webrender_bindings/RendererOGL.cpp

@@ -19,7 +19,7 @@ namespace wr {
 WrExternalImage LockExternalImage(void* aObj, WrExternalImageId aId)
 {
   RendererOGL* renderer = reinterpret_cast<RendererOGL*>(aObj);
-  RenderTextureHost* texture = renderer->GetRenderTexture(aId.id);
+  RenderTextureHost* texture = renderer->GetRenderTexture(aId);
 
   if (texture->AsBufferTextureHost()) {
     RenderBufferTextureHost* bufferTexture = texture->AsBufferTextureHost();
@@ -45,7 +45,7 @@ WrExternalImage LockExternalImage(void* aObj, WrExternalImageId aId)
 void UnlockExternalImage(void* aObj, WrExternalImageId aId)
 {
   RendererOGL* renderer = reinterpret_cast<RendererOGL*>(aObj);
-  RenderTextureHost* texture = renderer->GetRenderTexture(aId.id);
+  RenderTextureHost* texture = renderer->GetRenderTexture(aId);
   MOZ_ASSERT(texture);
   texture->Unlock();
 }

gfx/webrender_bindings/WebRenderTypes.h

@@ -348,16 +348,14 @@ static inline WrComplexClipRegion ToWrComplexClipRegion(const gfx::RectTyped<T>&
 
 static inline WrExternalImageId ToWrExternalImageId(uint64_t aID)
 {
-  WrExternalImageId id;
+  return aID;
-  id.id = aID;
-  return id;
 }
 
 static inline WrExternalImage RawDataToWrExternalImage(const uint8_t* aBuff,
                                                        size_t size)
 {
   return WrExternalImage {
-    WrExternalImageIdType::RawData,
+    WrExternalImageType::RawData,
     0, 0.0f, 0.0f, 0.0f, 0.0f,
     aBuff, size
   };
@@ -368,7 +366,7 @@ static inline WrExternalImage NativeTextureToWrExternalImage(uint8_t aHandle,
                                                              float u1, float v1)
 {
   return WrExternalImage {
-    WrExternalImageIdType::NativeTexture,
+    WrExternalImageType::NativeTexture,
     aHandle, u0, v0, u1, v1,
     nullptr, 0
   };

gfx/webrender_bindings/webrender_ffi.h

@@ -128,7 +128,7 @@ enum class WrImageRendering: uint32_t
   Sentinel /* this must be last, for IPC serialization purposes */
 };
 
-enum class WrExternalImageIdType: uint32_t
+enum class WrExternalImageType: uint32_t
 {
   NativeTexture, // Currently, we only support gl texture handle.
   RawData,
@@ -180,7 +180,7 @@ enum class WrRepeatMode : uint32_t
 // Typedefs for struct fields and function signatures below.
 // -----
 
-typedef uint64_t WrImageIdType;
+typedef uint64_t WrExternalImageId;
 
 // -----
 // Structs used in C++ code with corresponding types in Rust code
@@ -404,14 +404,9 @@ struct WrClipRegion
   bool has_image_mask;
 };
 
-struct WrExternalImageId
-{
-  WrImageIdType id;
-};
-
 struct WrExternalImage
 {
-  WrExternalImageIdType type;
+  WrExternalImageType type;
 
   // external texture handle
   uint32_t handle;