Changes to master to more closely match XFA.

fpdfsdk/src/fpdfdoc.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "../../public/fpdf_doc.h"
 #include "../include/fsdk_define.h"
-#include "../../public/fpdf_doc.h"
 
 namespace {
 
 int THISMODULE = 0;
 
 CPDF_Bookmark FindBookmark(const CPDF_BookmarkTree& tree,
                            CPDF_Bookmark bookmark,
                            const CFX_WideString& title) {
   if (bookmark && bookmark.GetTitle().CompareNoCase(title.c_str()) == 0) {
     // First check this item
@@ skipping 307 matching lines @@
     return 0;
   CFX_WideString text = pInfo->GetUnicodeText(tag);
   // Use UTF-16LE encoding
   CFX_ByteString encodedText = text.UTF16LE_Encode();
   unsigned long len = encodedText.GetLength();
   if (buffer && buflen >= len) {
     FXSYS_memcpy(buffer, encodedText.c_str(), len);
   }
   return len;
 }