diff options
author | Henrique Nakashima <hnakashima@chromium.org> | 2017-08-10 15:13:19 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-08-10 15:13:33 +0000 |
commit | 7e805d1a6f3bf7ddd04b2c1ce857a2cf6d9ff873 (patch) | |
tree | 0aab30fc879ea390d3f3351dafc5511e16ddedc0 /fpdfsdk/fpdf_structtree.cpp | |
parent | e6c67cd64a80bd67c587ad3ffb380fe1b7574d1f (diff) | |
download | pdfium-7e805d1a6f3bf7ddd04b2c1ce857a2cf6d9ff873.tar.xz |
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 <dsinclair@chromium.org>
> Commit-Queue: dsinclair <dsinclair@chromium.org>
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 <hnakashima@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'fpdfsdk/fpdf_structtree.cpp')
-rw-r--r-- | fpdfsdk/fpdf_structtree.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/fpdfsdk/fpdf_structtree.cpp b/fpdfsdk/fpdf_structtree.cpp index a6bf60d0df..bd6641f7cb 100644 --- a/fpdfsdk/fpdf_structtree.cpp +++ b/fpdfsdk/fpdf_structtree.cpp @@ -37,8 +37,7 @@ unsigned long WideStringToBuffer(const CFX_WideString& str, } // namespace -FPDF_EXPORT FPDF_STRUCTTREE FPDF_CALLCONV -FPDF_StructTree_GetForPage(FPDF_PAGE page) { +DLLEXPORT FPDF_STRUCTTREE STDCALL FPDF_StructTree_GetForPage(FPDF_PAGE page) { CPDF_Page* pPage = CPDFPageFromFPDFPage(page); if (!pPage) return nullptr; @@ -47,18 +46,17 @@ FPDF_StructTree_GetForPage(FPDF_PAGE page) { .release(); } -FPDF_EXPORT void FPDF_CALLCONV -FPDF_StructTree_Close(FPDF_STRUCTTREE struct_tree) { +DLLEXPORT void STDCALL FPDF_StructTree_Close(FPDF_STRUCTTREE struct_tree) { std::unique_ptr<CPDF_StructTree>(ToStructTree(struct_tree)); } -FPDF_EXPORT int FPDF_CALLCONV +DLLEXPORT int STDCALL FPDF_StructTree_CountChildren(FPDF_STRUCTTREE struct_tree) { CPDF_StructTree* tree = ToStructTree(struct_tree); return tree ? tree->CountTopElements() : -1; } -FPDF_EXPORT FPDF_STRUCTELEMENT FPDF_CALLCONV +DLLEXPORT FPDF_STRUCTELEMENT STDCALL FPDF_StructTree_GetChildAtIndex(FPDF_STRUCTTREE struct_tree, int index) { CPDF_StructTree* tree = ToStructTree(struct_tree); if (!tree || index < 0 || index >= tree->CountTopElements()) @@ -66,7 +64,7 @@ FPDF_StructTree_GetChildAtIndex(FPDF_STRUCTTREE struct_tree, int index) { return tree->GetTopElement(index); } -FPDF_EXPORT unsigned long FPDF_CALLCONV +DLLEXPORT unsigned long STDCALL FPDF_StructElement_GetAltText(FPDF_STRUCTELEMENT struct_element, void* buffer, unsigned long buflen) { @@ -77,7 +75,7 @@ FPDF_StructElement_GetAltText(FPDF_STRUCTELEMENT struct_element, : 0; } -FPDF_EXPORT unsigned long FPDF_CALLCONV +DLLEXPORT unsigned long STDCALL FPDF_StructElement_GetType(FPDF_STRUCTELEMENT struct_element, void* buffer, unsigned long buflen) { @@ -86,7 +84,7 @@ FPDF_StructElement_GetType(FPDF_STRUCTELEMENT struct_element, : 0; } -FPDF_EXPORT unsigned long FPDF_CALLCONV +DLLEXPORT unsigned long STDCALL FPDF_StructElement_GetTitle(FPDF_STRUCTELEMENT struct_element, void* buffer, unsigned long buflen) { @@ -96,13 +94,13 @@ FPDF_StructElement_GetTitle(FPDF_STRUCTELEMENT struct_element, : 0; } -FPDF_EXPORT int FPDF_CALLCONV +DLLEXPORT int STDCALL FPDF_StructElement_CountChildren(FPDF_STRUCTELEMENT struct_element) { CPDF_StructElement* elem = ToStructTreeElement(struct_element); return elem ? elem->CountKids() : -1; } -FPDF_EXPORT FPDF_STRUCTELEMENT FPDF_CALLCONV +DLLEXPORT FPDF_STRUCTELEMENT STDCALL FPDF_StructElement_GetChildAtIndex(FPDF_STRUCTELEMENT struct_element, int index) { CPDF_StructElement* elem = ToStructTreeElement(struct_element); |