fpdfsdk/src/fpdfview.cpp - Issue 1393833006: Merge to XFA: Allow compiling PDFium without V8.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: fpdfsdk/src/fpdfview.cpp

Issue 1393833006: Merge to XFA: Allow compiling PDFium without V8. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa

Patch Set: Rebase, fix build, stray include. Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: fpdfsdk/src/fpdfview.cpp

diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp

index cf05d79f5cbe7c9b17863cbe1652a55b7084a22a..a5daa8f52e43b199e19713e1a5e4806c2e219b9e 100644

--- a/fpdfsdk/src/fpdfview.cpp

+++ b/fpdfsdk/src/fpdfview.cpp

@@ -20,7 +20,7 @@

#include "../include/fpdfxfa/fpdfxfa_app.h"

#include "../include/fpdfxfa/fpdfxfa_page.h"

#include "../include/fpdfxfa/fpdfxfa_util.h"

-#include "../include/jsapi/fxjs_v8.h"

+#include "../include/javascript/IJavaScript.h"

CFPDF_FileStream::CFPDF_FileStream(FPDF_FILEHANDLER* pFS) {

m_pFS = pFS;

@@ -196,10 +196,8 @@ FPDF_InitLibraryWithConfig(const FPDF_LIBRARY_CONFIG* cfg) {

CPDF_ModuleMgr::Get()->InitPageModule();

CPDF_ModuleMgr::Get()->InitRenderModule();

CPDFXFA_App::GetInstance()->Initialize();

- if (cfg && cfg->version >= 2) {

- FXJS_Initialize(cfg->m_v8EmbedderSlot,

- reinterpret_cast<v8::Isolate*>(cfg->m_pIsolate));

- }

+ if (cfg && cfg->version >= 2)

+ IJS_Runtime::Initialize(cfg->m_v8EmbedderSlot, cfg->m_pIsolate);

}

DLLEXPORT void STDCALL FPDF_DestroyLibrary() {

« no previous file with comments | « fpdfsdk/include/javascript/IJavaScript.h ('k') | fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp » ('j') | no next file with comments »