The union and first level nested struct were vestiges of the previous

device context design.  Remove them and shorten the paths to 2D members.
Also add "reserved" void* to allow quick access to implementation data.
Review URL: http://codereview.chromium.org/490009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34359 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 16 insertions, 18 deletions

diff --git a/third_party/npapi/bindings/npapi_extensions.h b/third_party/npapi/bindings/npapi_extensions.h
index f93a9e9..67c8ca9 100644
--- a/third_party/npapi/bindings/npapi_extensions.h
+++ b/third_party/npapi/bindings/npapi_extensions.h
@@ -203,24 +203,21 @@ typedef struct _NPDeviceContext2DConfig {
 
 typedef struct _NPDeviceContext2D
 {
-  union {
-    struct {
-      void* region;
-      int32 stride;
-
-      /* The dirty region that the plugin has painted into the buffer. This
-       * will be initialized to the size of the plugin image in
-       * initializeRenderContextPtr. The plugin can change the values to only
-       * update portions of the image.
-       */
-      struct {
-        int32 left;
-        int32 top;
-        int32 right;
-        int32 bottom;
-      } dirty;
-    } graphicsRgba;
-  } u;
+  void* reserved;
+  void* region;
+  int32 stride;
+
+  /* The dirty region that the plugin has painted into the buffer. This
+   * will be initialized to the size of the plugin image in
+   * initializeContextPtr. The plugin can change the values to only
+   * update portions of the image.
+   */
+  struct {
+    int32 left;
+    int32 top;
+    int32 right;
+    int32 bottom;
+  } dirty;
 } NPDeviceContext2D;
 
 /* 3D -----------------------------------------------------------------------*/
@@ -232,6 +229,7 @@ typedef struct _NPDeviceContext3DConfig {
 
 typedef struct _NPDeviceContext3D
 {
+  void* reserved;
   void* buffer;
   int32 bufferLength;
 } NPDeviceContext3D;