fpdfsdk/include/javascript/global.h - Issue 1301793002: Merge to XFA: CFX_MapByteStringToPtr considered harmful (combo patch).

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/include/javascript/global.h

Issue 1301793002: Merge to XFA: CFX_MapByteStringToPtr considered harmful (combo patch). (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa

Patch Set: Created 5 years, 4 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:

View side-by-side diff with in-line comments

Download patch

Index: fpdfsdk/include/javascript/global.h

diff --git a/fpdfsdk/include/javascript/global.h b/fpdfsdk/include/javascript/global.h

index e881625f56de645ad9a84c4a14db3f55ae456201..7f78bb6bcbb7520155e7a56354a52fd0fd17ec13 100644

--- a/fpdfsdk/include/javascript/global.h

+++ b/fpdfsdk/include/javascript/global.h

@@ -7,6 +7,8 @@

#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_GLOBAL_H_

#define FPDFSDK_INCLUDE_JAVASCRIPT_GLOBAL_H_

+#include <map>

#include "JS_Define.h"

class CJS_GlobalData;

@@ -69,7 +71,7 @@ class JSGlobalAlternate : public CJS_EmbedObj {

void PutObjectProperty(v8::Local<v8::Object> obj, CJS_KeyValue* pData);

private:

- CFX_MapByteStringToPtr m_mapGlobal;

+ std::map<CFX_ByteString, JSGlobalData*> m_mapGlobal;

CFX_WideString m_sFilePath;

CJS_GlobalData* m_pGlobalData;

CPDFDoc_Environment* m_pApp;

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