diff options
Diffstat (limited to 'WebCore/bridge/npapi.h')
| -rw-r--r-- | WebCore/bridge/npapi.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/WebCore/bridge/npapi.h b/WebCore/bridge/npapi.h index b1e8fcd..6b8556d 100644 --- a/WebCore/bridge/npapi.h +++ b/WebCore/bridge/npapi.h @@ -381,7 +381,6 @@ typedef enum { , NPPVpluginCoreAnimationLayer = 1003 #endif -<<<<<<< HEAD #ifdef ANDROID /* Used when the plugin returns 0 from NPN_WriteReady and wishes the browser * to wait a certain amount of millis before calling NPN_WriteReady again. @@ -392,10 +391,7 @@ typedef enum { , NPPFakeValueToForce32Bits = 0x7FFFFFFF #endif -#if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO == 5) -======= #if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO >= 5) ->>>>>>> webkit.org at r68651 , NPPVpluginWindowlessLocalBool = 2002 #endif } NPPVariable; @@ -441,16 +437,12 @@ typedef enum { #endif , NPNVsupportsCocoaBool = 3001 /* TRUE if the browser supports the Cocoa event model */ #endif /* XP_MACOSX */ -<<<<<<< HEAD #ifdef ANDROID , NPNFakeValueToForce32Bits = 0x7FFFFFFF #endif -#if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO == 5) -======= #if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO >= 5) ->>>>>>> webkit.org at r68651 , NPNVSupportsWindowlessLocal = 2002 #endif } NPNVariable; |