From 7e805d1a6f3bf7ddd04b2c1ce857a2cf6d9ff873 Mon Sep 17 00:00:00 2001 From: Henrique Nakashima Date: Thu, 10 Aug 2017 15:13:19 +0000 Subject: Revert "Add a build target and a proper export header for shared library builds." This reverts commit 00334675c18a0203f313cceb670c970a77280f49. Reason for revert: Breaking the deps roller - https://chromium-review.googlesource.com/c/609307 Original change's description: > Add a build target and a proper export header for shared library builds. > > This CL adds support for Chromium's component build feature to pdfium. > > The export header stub in fpdfview.h is expanded to match Chromium's > export mechanisms and patterns (fixes pdfium:825). > > A component/shared library build can be triggered by adding > > is_component_build = true > > as a gn argument. Please note that setting this will also affect some > of pdfiums dependencies like v8, which will be build as components > too. > > Additionally, this CL provides a "pdf_source_set" template which > dynamically enables the use of "source_set" when building a complete > static library or a shared library to reduce build time. > > When testing this it is recommended to only build the pdfium target as > most of pdfiums test rely on non-public functions which aren't exported > by the shared library. > > Bug: pdfium:825,pdfium:826 > Change-Id: Icedc538ec535e11d1e53c4d5fabc8c064b275752 > Reviewed-on: https://pdfium-review.googlesource.com/8970 > Reviewed-by: dsinclair > Commit-Queue: dsinclair TBR=thestig@chromium.org,tsepez@chromium.org,brucedawson@chromium.org,dsinclair@google.com,dsinclair@chromium.org,licorn@gmail.com Change-Id: Ib02af2298932481293f50d362ae87bfedf284821 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: pdfium:825, pdfium:826 Reviewed-on: https://pdfium-review.googlesource.com/10550 Reviewed-by: Henrique Nakashima Commit-Queue: Henrique Nakashima --- public/fpdf_annot.h | 108 +++++++++++++++++++++++++--------------------------- 1 file changed, 52 insertions(+), 56 deletions(-) (limited to 'public/fpdf_annot.h') diff --git a/public/fpdf_annot.h b/public/fpdf_annot.h index ebe72eafb4..c0f9a6e4c6 100644 --- a/public/fpdf_annot.h +++ b/public/fpdf_annot.h @@ -96,7 +96,7 @@ typedef enum FPDFANNOT_COLORTYPE { // subtype - the subtype to be checked. // // Returns true if this subtype supported. -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV +DLLEXPORT FPDF_BOOL STDCALL FPDFAnnot_IsSupportedSubtype(FPDF_ANNOTATION_SUBTYPE subtype); // Experimental API. @@ -109,7 +109,7 @@ FPDFAnnot_IsSupportedSubtype(FPDF_ANNOTATION_SUBTYPE subtype); // subtype - the subtype of the new annotation. // // Returns a handle to the new annotation object, or NULL on failure. -FPDF_EXPORT FPDF_ANNOTATION FPDF_CALLCONV +DLLEXPORT FPDF_ANNOTATION STDCALL FPDFPage_CreateAnnot(FPDF_PAGE page, FPDF_ANNOTATION_SUBTYPE subtype); // Experimental API. @@ -118,7 +118,7 @@ FPDFPage_CreateAnnot(FPDF_PAGE page, FPDF_ANNOTATION_SUBTYPE subtype); // page - handle to a page. // // Returns the number of annotations in |page|. -FPDF_EXPORT int FPDF_CALLCONV FPDFPage_GetAnnotCount(FPDF_PAGE page); +DLLEXPORT int STDCALL FPDFPage_GetAnnotCount(FPDF_PAGE page); // Experimental API. // Get annotation in |page| at |index|. Must call FPDFPage_CloseAnnot() when the @@ -128,8 +128,7 @@ FPDF_EXPORT int FPDF_CALLCONV FPDFPage_GetAnnotCount(FPDF_PAGE page); // index - the index of the annotation. // // Returns a handle to the annotation object, or NULL on failure. -FPDF_EXPORT FPDF_ANNOTATION FPDF_CALLCONV FPDFPage_GetAnnot(FPDF_PAGE page, - int index); +DLLEXPORT FPDF_ANNOTATION STDCALL FPDFPage_GetAnnot(FPDF_PAGE page, int index); // Experimental API. // Close an annotation. Must be called when the annotation returned by @@ -137,7 +136,7 @@ FPDF_EXPORT FPDF_ANNOTATION FPDF_CALLCONV FPDFPage_GetAnnot(FPDF_PAGE page, // function does not remove the annotation from the document. // // annot - handle to an annotation. -FPDF_EXPORT void FPDF_CALLCONV FPDFPage_CloseAnnot(FPDF_ANNOTATION annot); +DLLEXPORT void STDCALL FPDFPage_CloseAnnot(FPDF_ANNOTATION annot); // Experimental API. // Remove the annotation in |page| at |index|. @@ -146,8 +145,7 @@ FPDF_EXPORT void FPDF_CALLCONV FPDFPage_CloseAnnot(FPDF_ANNOTATION annot); // index - the index of the annotation. // // Returns true if successful. -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFPage_RemoveAnnot(FPDF_PAGE page, - int index); +DLLEXPORT FPDF_BOOL STDCALL FPDFPage_RemoveAnnot(FPDF_PAGE page, int index); // Experimental API. // Get the subtype of an annotation. @@ -155,7 +153,7 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFPage_RemoveAnnot(FPDF_PAGE page, // annot - handle to an annotation. // // Returns the annotation subtype. -FPDF_EXPORT FPDF_ANNOTATION_SUBTYPE FPDF_CALLCONV +DLLEXPORT FPDF_ANNOTATION_SUBTYPE STDCALL FPDFAnnot_GetSubtype(FPDF_ANNOTATION annot); // Experimental API. @@ -166,7 +164,7 @@ FPDFAnnot_GetSubtype(FPDF_ANNOTATION annot); // subtype - the subtype to be checked. // // Returns true if this subtype supported. -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV +DLLEXPORT FPDF_BOOL STDCALL FPDFAnnot_IsObjectSupportedSubtype(FPDF_ANNOTATION_SUBTYPE subtype); // Experimental API. @@ -180,8 +178,8 @@ FPDFAnnot_IsObjectSupportedSubtype(FPDF_ANNOTATION_SUBTYPE subtype); // obj - handle to the object that |annot| needs to update. // // Return true if successful. -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV -FPDFAnnot_UpdateObject(FPDF_ANNOTATION annot, FPDF_PAGEOBJECT obj); +DLLEXPORT FPDF_BOOL STDCALL FPDFAnnot_UpdateObject(FPDF_ANNOTATION annot, + FPDF_PAGEOBJECT obj); // Experimental API. // Add |obj| to |annot|. |obj| must have been created by @@ -194,8 +192,8 @@ FPDFAnnot_UpdateObject(FPDF_ANNOTATION annot, FPDF_PAGEOBJECT obj); // obj - handle to the object that is to be added to |annot|. // // Return true if successful. -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV -FPDFAnnot_AppendObject(FPDF_ANNOTATION annot, FPDF_PAGEOBJECT obj); +DLLEXPORT FPDF_BOOL STDCALL FPDFAnnot_AppendObject(FPDF_ANNOTATION annot, + FPDF_PAGEOBJECT obj); // Experimental API. // Get the total number of objects in |annot|, including path objects, text @@ -204,7 +202,7 @@ FPDFAnnot_AppendObject(FPDF_ANNOTATION annot, FPDF_PAGEOBJECT obj); // annot - handle to an annotation. // // Returns the number of objects in |annot|. -FPDF_EXPORT int FPDF_CALLCONV FPDFAnnot_GetObjectCount(FPDF_ANNOTATION annot); +DLLEXPORT int STDCALL FPDFAnnot_GetObjectCount(FPDF_ANNOTATION annot); // Experimental API. // Get the object in |annot| at |index|. @@ -213,8 +211,8 @@ FPDF_EXPORT int FPDF_CALLCONV FPDFAnnot_GetObjectCount(FPDF_ANNOTATION annot); // index - the index of the object. // // Return a handle to the object, or NULL on failure. -FPDF_EXPORT FPDF_PAGEOBJECT FPDF_CALLCONV -FPDFAnnot_GetObject(FPDF_ANNOTATION annot, int index); +DLLEXPORT FPDF_PAGEOBJECT STDCALL FPDFAnnot_GetObject(FPDF_ANNOTATION annot, + int index); // Experimental API. // Remove the object in |annot| at |index|. @@ -223,8 +221,8 @@ FPDFAnnot_GetObject(FPDF_ANNOTATION annot, int index); // index - the index of the object to be removed. // // Return true if successful. -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV -FPDFAnnot_RemoveObject(FPDF_ANNOTATION annot, int index); +DLLEXPORT FPDF_BOOL STDCALL FPDFAnnot_RemoveObject(FPDF_ANNOTATION annot, + int index); // Experimental API. // Set the color of an annotation. Fails when called on annotations with @@ -237,12 +235,12 @@ FPDFAnnot_RemoveObject(FPDF_ANNOTATION annot, int index); // A - buffer to hold the opacity. Ranges from 0 to 255. // // Returns true if successful. -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFAnnot_SetColor(FPDF_ANNOTATION annot, - FPDFANNOT_COLORTYPE type, - unsigned int R, - unsigned int G, - unsigned int B, - unsigned int A); +DLLEXPORT FPDF_BOOL STDCALL FPDFAnnot_SetColor(FPDF_ANNOTATION annot, + FPDFANNOT_COLORTYPE type, + unsigned int R, + unsigned int G, + unsigned int B, + unsigned int A); // Experimental API. // Get the color of an annotation. If no color is specified, default to yellow @@ -256,12 +254,12 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFAnnot_SetColor(FPDF_ANNOTATION annot, // A - buffer to hold the opacity. Ranges from 0 to 255. // // Returns true if successful. -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFAnnot_GetColor(FPDF_ANNOTATION annot, - FPDFANNOT_COLORTYPE type, - unsigned int* R, - unsigned int* G, - unsigned int* B, - unsigned int* A); +DLLEXPORT FPDF_BOOL STDCALL FPDFAnnot_GetColor(FPDF_ANNOTATION annot, + FPDFANNOT_COLORTYPE type, + unsigned int* R, + unsigned int* G, + unsigned int* B, + unsigned int* A); // Experimental API. // Check if the annotation is of a type that has attachment points @@ -275,7 +273,7 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFAnnot_GetColor(FPDF_ANNOTATION annot, // // Returns true if the annotation is of a type that has quadpoints, false // otherwise. -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV +DLLEXPORT FPDF_BOOL STDCALL FPDFAnnot_HasAttachmentPoints(FPDF_ANNOTATION annot); // Experimental API. @@ -287,7 +285,7 @@ FPDFAnnot_HasAttachmentPoints(FPDF_ANNOTATION annot); // quadPoints - the quadpoints to be set. // // Returns true if successful. -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV +DLLEXPORT FPDF_BOOL STDCALL FPDFAnnot_SetAttachmentPoints(FPDF_ANNOTATION annot, const FS_QUADPOINTSF* quadPoints); @@ -299,7 +297,7 @@ FPDFAnnot_SetAttachmentPoints(FPDF_ANNOTATION annot, // annot - handle to an annotation. // // Returns a quadpoints object, or an empty set of quadpoints on failure. -FPDF_EXPORT FS_QUADPOINTSF FPDF_CALLCONV +DLLEXPORT FS_QUADPOINTSF STDCALL FPDFAnnot_GetAttachmentPoints(FPDF_ANNOTATION annot); // Experimental API. @@ -311,8 +309,8 @@ FPDFAnnot_GetAttachmentPoints(FPDF_ANNOTATION annot); // rect - the annotation rectangle to be set. // // Returns true if successful. -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFAnnot_SetRect(FPDF_ANNOTATION annot, - const FS_RECTF* rect); +DLLEXPORT FPDF_BOOL STDCALL FPDFAnnot_SetRect(FPDF_ANNOTATION annot, + const FS_RECTF* rect); // Experimental API. // Get the annotation rectangle defining the location of the annotation. If the @@ -322,7 +320,7 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFAnnot_SetRect(FPDF_ANNOTATION annot, // annot - handle to an annotation. // // Returns a rectangle object, or an empty rectangle on failure. -FPDF_EXPORT FS_RECTF FPDF_CALLCONV FPDFAnnot_GetRect(FPDF_ANNOTATION annot); +DLLEXPORT FS_RECTF STDCALL FPDFAnnot_GetRect(FPDF_ANNOTATION annot); // Experimental API. // Check if |annot|'s dictionary has |key| as a key. @@ -331,8 +329,8 @@ FPDF_EXPORT FS_RECTF FPDF_CALLCONV FPDFAnnot_GetRect(FPDF_ANNOTATION annot); // key - the key to look for. // // Returns true if |key| exists. -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFAnnot_HasKey(FPDF_ANNOTATION annot, - FPDF_WIDESTRING key); +DLLEXPORT FPDF_BOOL STDCALL FPDFAnnot_HasKey(FPDF_ANNOTATION annot, + FPDF_WIDESTRING key); // Experimental API. // Get the type of the value corresponding to |key| in |annot|'s dictionary. @@ -341,8 +339,8 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFAnnot_HasKey(FPDF_ANNOTATION annot, // key - the key to look for. // // Returns the type of the dictionary value. -FPDF_EXPORT FPDF_OBJECT_TYPE FPDF_CALLCONV -FPDFAnnot_GetValueType(FPDF_ANNOTATION annot, FPDF_WIDESTRING key); +DLLEXPORT FPDF_OBJECT_TYPE STDCALL FPDFAnnot_GetValueType(FPDF_ANNOTATION annot, + FPDF_WIDESTRING key); // Experimental API. // Set the string value corresponding to |key| in |annot|'s dictionary, @@ -354,10 +352,9 @@ FPDFAnnot_GetValueType(FPDF_ANNOTATION annot, FPDF_WIDESTRING key); // value - the string value to be set, encoded in UTF16-LE. // // Returns true if successful. -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV -FPDFAnnot_SetStringValue(FPDF_ANNOTATION annot, - FPDF_WIDESTRING key, - FPDF_WIDESTRING value); +DLLEXPORT FPDF_BOOL STDCALL FPDFAnnot_SetStringValue(FPDF_ANNOTATION annot, + FPDF_WIDESTRING key, + FPDF_WIDESTRING value); // Experimental API. // Get the string value corresponding to |key| in |annot|'s dictionary. |buffer| @@ -374,11 +371,10 @@ FPDFAnnot_SetStringValue(FPDF_ANNOTATION annot, // buflen - length of the buffer. // // Returns the length of the string value. -FPDF_EXPORT unsigned long FPDF_CALLCONV -FPDFAnnot_GetStringValue(FPDF_ANNOTATION annot, - FPDF_WIDESTRING key, - void* buffer, - unsigned long buflen); +DLLEXPORT unsigned long STDCALL FPDFAnnot_GetStringValue(FPDF_ANNOTATION annot, + FPDF_WIDESTRING key, + void* buffer, + unsigned long buflen); // Experimental API. // Get the annotation flags of |annot|. @@ -386,7 +382,7 @@ FPDFAnnot_GetStringValue(FPDF_ANNOTATION annot, // annot - handle to an annotation. // // Returns the annotation flags. -FPDF_EXPORT int FPDF_CALLCONV FPDFAnnot_GetFlags(FPDF_ANNOTATION annot); +DLLEXPORT int STDCALL FPDFAnnot_GetFlags(FPDF_ANNOTATION annot); // Experimental API. // Set the |annot|'s flags to be of the value |flags|. @@ -395,8 +391,8 @@ FPDF_EXPORT int FPDF_CALLCONV FPDFAnnot_GetFlags(FPDF_ANNOTATION annot); // flags - the flag values to be set. // // Returns true if successful. -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFAnnot_SetFlags(FPDF_ANNOTATION annot, - int flags); +DLLEXPORT FPDF_BOOL STDCALL FPDFAnnot_SetFlags(FPDF_ANNOTATION annot, + int flags); // Experimental API. // Get the annotation flags of |annot|, which is an interactive form @@ -406,8 +402,8 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFAnnot_SetFlags(FPDF_ANNOTATION annot, // annot - handle to an interactive form annotation. // // Returns the annotation flags specific to interactive forms. -FPDF_EXPORT int FPDF_CALLCONV -FPDFAnnot_GetFormFieldFlags(FPDF_PAGE page, FPDF_ANNOTATION annot); +DLLEXPORT int STDCALL FPDFAnnot_GetFormFieldFlags(FPDF_PAGE page, + FPDF_ANNOTATION annot); // Experimental API. // Retrieves an interactive form annotation whose rectangle contains a given @@ -423,7 +419,7 @@ FPDFAnnot_GetFormFieldFlags(FPDF_PAGE page, FPDF_ANNOTATION annot); // // Returns the interactive form annotation whose rectangle contains the given // coordinates on the page. If there is no such annotation, return NULL. -FPDF_EXPORT FPDF_ANNOTATION FPDF_CALLCONV +DLLEXPORT FPDF_ANNOTATION STDCALL FPDFAnnot_GetFormFieldAtPoint(FPDF_FORMHANDLE hHandle, FPDF_PAGE page, double page_x, -- cgit v1.2.3