Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(104)

Side by Side Diff: fpdfsdk/src/fpdfview.cpp

Issue 1152693005: Merge to XFA: Move fx_safe_types.h to include/ directory. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Fix BUILD.gn Created 5 years, 6 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 unified diff | Download patch
« no previous file with comments | « core/src/fxcrt/fx_safe_types.h ('k') | fpdfsdk/src/pdfwindow/PWL_Edit.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7
7 #include "../../public/fpdf_ext.h" 8 #include "../../public/fpdf_ext.h"
8 #include "../../public/fpdf_formfill.h" 9 #include "../../public/fpdf_formfill.h"
9 #include "../../public/fpdf_progressive.h" 10 #include "../../public/fpdf_progressive.h"
10 #include "../../public/fpdfview.h" 11 #include "../../public/fpdfview.h"
11 #include "../include/fsdk_define.h" 12 #include "../include/fsdk_define.h"
12 #include "../include/fsdk_mgr.h" 13 #include "../include/fsdk_mgr.h"
13 #include "../include/fsdk_rendercontext.h" 14 #include "../include/fsdk_rendercontext.h"
14 #include "../../../core/src/fxcrt/fx_safe_types.h" 15 #include "../../../core/include/fxcrt/fx_safe_types.h"
Lei Zhang 2015/06/05 02:34:57 Not sure why you didn't sort this file.
15 #include "../../third_party/base/nonstd_unique_ptr.h" 16 #include "../../third_party/base/nonstd_unique_ptr.h"
16 #include "../../third_party/base/numerics/safe_conversions_impl.h" 17 #include "../../third_party/base/numerics/safe_conversions_impl.h"
17 #include "../include/fpdfxfa/fpdfxfa_doc.h" 18 #include "../include/fpdfxfa/fpdfxfa_doc.h"
18 #include "../include/fpdfxfa/fpdfxfa_app.h" 19 #include "../include/fpdfxfa/fpdfxfa_app.h"
19 #include "../include/fpdfxfa/fpdfxfa_page.h" 20 #include "../include/fpdfxfa/fpdfxfa_page.h"
20 #include "../include/fpdfxfa/fpdfxfa_util.h" 21 #include "../include/fpdfxfa/fpdfxfa_util.h"
21 22
22 CFPDF_FileStream::CFPDF_FileStream(FPDF_FILEHANDLER* pFS) 23 CFPDF_FileStream::CFPDF_FileStream(FPDF_FILEHANDLER* pFS)
23 { 24 {
24 m_pFS = pFS; 25 m_pFS = pFS;
(...skipping 1017 matching lines...) Expand 10 before | Expand all | Expand 10 after
1042 if (!buffer) { 1043 if (!buffer) {
1043 *buflen = len; 1044 *buflen = len;
1044 } else if (*buflen >= len) { 1045 } else if (*buflen >= len) {
1045 memcpy(buffer, utf16Name.c_str(), len); 1046 memcpy(buffer, utf16Name.c_str(), len);
1046 *buflen = len; 1047 *buflen = len;
1047 } else { 1048 } else {
1048 *buflen = -1; 1049 *buflen = -1;
1049 } 1050 }
1050 return (FPDF_DEST)pDestObj; 1051 return (FPDF_DEST)pDestObj;
1051 } 1052 }
OLDNEW
« no previous file with comments | « core/src/fxcrt/fx_safe_types.h ('k') | fpdfsdk/src/pdfwindow/PWL_Edit.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698