merge backout.
authorJim Mathies <jmathies@mozilla.com>
Wed, 02 Jun 2010 17:18:04 -0500
changeset 43037 8e30dc6ebc53
parent 43035 cc96dd446d61 (current diff)
parent 43036 7f9ffd367918 (diff)
child 43038 4cd6efa6f123
push id13587
push userjmathies@mozilla.com
push dateWed, 02 Jun 2010 22:27:56 +0000
treeherdermozilla-central@8e30dc6ebc53 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone1.9.3a5pre
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
merge backout.
modules/plugin/base/public/npapi.h
--- a/modules/plugin/base/public/npapi.h
+++ b/modules/plugin/base/public/npapi.h
@@ -429,16 +429,17 @@ typedef struct _NPWindow
   void* window;  /* Platform specific window handle */
                  /* OS/2: x - Position of bottom left corner */
                  /* OS/2: y - relative to visible netscape window */
   int32_t  x;      /* Position of top left corner relative */
   int32_t  y;      /* to a netscape page. */
   uint32_t width;  /* Maximum window size */
   uint32_t height;
   NPRect   clipRect; /* Clipping rectangle in port coordinates */
+                     /* Used by MAC only. */
 #if defined(XP_UNIX) && !defined(XP_MACOSX)
   void * ws_info; /* Platform-dependent additional data */
 #endif /* XP_UNIX */
   NPWindowType type; /* Is this a window or a drawable? */
 } NPWindow;
 
 typedef struct _NPImageExpose
 {