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

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

Issue 1439223003: Merge to XFA: Remove relative includes. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: fix merge Created 5 years, 1 month 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 | « fpdfsdk/src/fsdk_baseform.cpp ('k') | fpdfsdk/src/fsdk_rendercontext.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 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "../include/fsdk_mgr.h" 9 #include "fpdfsdk/include/fsdk_mgr.h"
10 10
11 #include "../include/formfiller/FFL_FormFiller.h" 11 #include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
12 #include "../include/fsdk_define.h" 12 #include "fpdfsdk/include/fsdk_define.h"
13 #include "../include/javascript/IJavaScript.h" 13 #include "fpdfsdk/include/javascript/IJavaScript.h"
14 #include "public/fpdf_ext.h" 14 #include "public/fpdf_ext.h"
15 #include "third_party/base/nonstd_unique_ptr.h" 15 #include "third_party/base/nonstd_unique_ptr.h"
16 16
17 #include "../include/fpdfxfa/fpdfxfa_app.h" 17 #include "../include/fpdfxfa/fpdfxfa_app.h"
18 #include "../include/fpdfxfa/fpdfxfa_doc.h" 18 #include "../include/fpdfxfa/fpdfxfa_doc.h"
19 #include "../include/fpdfxfa/fpdfxfa_page.h" 19 #include "../include/fpdfxfa/fpdfxfa_page.h"
20 #include "../include/fpdfxfa/fpdfxfa_util.h" 20 #include "../include/fpdfxfa/fpdfxfa_util.h"
21 21
22 #if _FX_OS_ == _FX_ANDROID_ 22 #if _FX_OS_ == _FX_ANDROID_
23 #include "time.h" 23 #include "time.h"
(...skipping 1077 matching lines...) Expand 10 before | Expand all | Expand 10 after
1101 CPDFSDK_Annot* pFocusAnnot = m_pSDKDoc->GetFocusAnnot(); 1101 CPDFSDK_Annot* pFocusAnnot = m_pSDKDoc->GetFocusAnnot();
1102 if (!pFocusAnnot) 1102 if (!pFocusAnnot)
1103 return nullptr; 1103 return nullptr;
1104 1104
1105 for (CPDFSDK_Annot* pAnnot : m_fxAnnotArray) { 1105 for (CPDFSDK_Annot* pAnnot : m_fxAnnotArray) {
1106 if (pAnnot == pFocusAnnot) 1106 if (pAnnot == pFocusAnnot)
1107 return pAnnot; 1107 return pAnnot;
1108 } 1108 }
1109 return nullptr; 1109 return nullptr;
1110 } 1110 }
OLDNEW
« no previous file with comments | « fpdfsdk/src/fsdk_baseform.cpp ('k') | fpdfsdk/src/fsdk_rendercontext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698