diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-10 23:26:35 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-10 23:26:35 +0000 |
| commit | 3196dea60472c09f0e57a69081f0c263b3da1ab0 (patch) | |
| tree | 5333cf874f7da109c57b4bd6b7b79ab84368c109 /third_party/npapi | |
| parent | 169d001b3e65d587be044cde668ca288b68ccc7b (diff) | |
| download | chromium_src-3196dea60472c09f0e57a69081f0c263b3da1ab0.zip chromium_src-3196dea60472c09f0e57a69081f0c263b3da1ab0.tar.gz chromium_src-3196dea60472c09f0e57a69081f0c263b3da1ab0.tar.bz2 | |
Add Symbian defines to npapi.h to match upstream changes
BUG=42645
TEST=None; no behavioral changes.
Review URL: http://codereview.chromium.org/2015009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46871 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/npapi')
| -rw-r--r-- | third_party/npapi/bindings/npapi.h | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/third_party/npapi/bindings/npapi.h b/third_party/npapi/bindings/npapi.h index bdaa4db..ed1e155 100644 --- a/third_party/npapi/bindings/npapi.h +++ b/third_party/npapi/bindings/npapi.h @@ -76,11 +76,11 @@ /* END GOOGLE MODIFICATIONS */ #ifdef __SYMBIAN32__ -# ifndef XP_SYMBIAN -# define XP_SYMBIAN 1 -# undef XP_WIN -# endif -#endif /* __SYMBIAN32__ */ +#ifndef XP_SYMBIAN +#define XP_SYMBIAN 1 +#undef XP_WIN +#endif +#endif #if defined(__APPLE_CC__) && !defined(__MACOS_CLASSIC__) && !defined(XP_UNIX) # define XP_MACOSX @@ -113,6 +113,11 @@ /* END GOOGLE MODIFICATIONS */ #endif +#if defined(XP_SYMBIAN) +#include <QEvent> +#include <QRegion> +#endif + /*----------------------------------------------------------------------*/ /* Plugin Version Constants */ /*----------------------------------------------------------------------*/ @@ -430,7 +435,7 @@ typedef struct _NPWindow uint32_t width; /* Maximum window size */ uint32_t height; NPRect clipRect; /* Clipping rectangle in port coordinates */ -#if defined(XP_UNIX) && !defined(XP_MACOSX) +#if (defined(XP_UNIX) || defined(XP_SYMBIAN)) && !defined(XP_MACOSX) void * ws_info; /* Platform-dependent additional data */ #endif /* XP_UNIX */ NPWindowType type; /* Is this a window or a drawable? */ @@ -477,10 +482,11 @@ typedef struct _NPPrint } NPPrint; #if defined(XP_MACOSX) - #ifndef NP_NO_CARBON typedef EventRecord NPEvent; #endif +#elif defined(XP_SYMBIAN) +typedef QEvent NPEvent; #elif defined(XP_WIN) typedef struct _NPEvent { @@ -495,7 +501,7 @@ typedef struct _NPEvent uint32_t wParam; uint32_t lParam; } NPEvent; -#elif defined (XP_UNIX) && defined(MOZ_X11) +#elif defined(XP_UNIX) && defined(MOZ_X11) /* BEGIN GOOGLE MODIFICATIONS */ typedef union _XEvent XEvent; /* END GOOGLE MODIFICATIONS */ @@ -517,6 +523,8 @@ typedef HRGN NPRegion; typedef struct _XRegion *Region; /* END GOOGLE MODIFICATIONS */ typedef Region NPRegion; +#elif defined(XP_SYMBIAN) +typedef QRegion* NPRegion; #else typedef void *NPRegion; #endif |