28 files changed, 31 insertions, 28 deletions
diff --git a/fpdfsdk/fpdfannot.cpp b/fpdfsdk/fpdf_annot.cpp
index 2ab0bca454..2ab0bca454 100644
--- a/fpdfsdk/fpdfannot.cpp
+++ b/fpdfsdk/fpdf_annot.cpp
diff --git a/fpdfsdk/fpdfannot_embeddertest.cpp b/fpdfsdk/fpdf_annot_embeddertest.cpp
index 552398c41f..b97193db46 100644
--- a/fpdfsdk/fpdfannot_embeddertest.cpp
+++ b/fpdfsdk/fpdf_annot_embeddertest.cpp
@@ -1011,12 +1011,13 @@ TEST_F(FPDFAnnotEmbeddertest, GetSetStringValue) {
   EXPECT_TRUE(FPDF_SaveAsCopy(document(), this, 0));
   UnloadPage(page);
 
-  // Open the saved annotation.
 #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
   const char md5[] = "4d64e61c9c0f8c60ab3cc3234bb73b1c";
 #else
   const char md5[] = "c96ee1f316d7f5a1b154de9f9d467f01";
 #endif
+
+  // Open the saved annotation.
   OpenSavedDocument();
   page = LoadSavedPage(0);
   VerifySavedRendering(page, 595, 842, md5);
diff --git a/fpdfsdk/fpdfattachment.cpp b/fpdfsdk/fpdf_attachment.cpp
index 0bb9364834..0bb9364834 100644
--- a/fpdfsdk/fpdfattachment.cpp
+++ b/fpdfsdk/fpdf_attachment.cpp
diff --git a/fpdfsdk/fpdfattachment_embeddertest.cpp b/fpdfsdk/fpdf_attachment_embeddertest.cpp
index dd9b5aebf3..dd9b5aebf3 100644
--- a/fpdfsdk/fpdfattachment_embeddertest.cpp
+++ b/fpdfsdk/fpdf_attachment_embeddertest.cpp
diff --git a/fpdfsdk/fpdfcatalog.cpp b/fpdfsdk/fpdf_catalog.cpp
index af6e40a0ad..af6e40a0ad 100644
--- a/fpdfsdk/fpdfcatalog.cpp
+++ b/fpdfsdk/fpdf_catalog.cpp
diff --git a/fpdfsdk/fpdfcatalog_unittest.cpp b/fpdfsdk/fpdf_catalog_unittest.cpp
index 13c063453b..b00748b49d 100644
--- a/fpdfsdk/fpdfcatalog_unittest.cpp
+++ b/fpdfsdk/fpdf_catalog_unittest.cpp
@@ -4,6 +4,8 @@
 
 #include "public/fpdf_catalog.h"
 
+#include <memory>
+
 #include "core/fpdfapi/cpdf_modulemgr.h"
 #include "core/fpdfapi/parser/cpdf_document.h"
 #include "core/fpdfapi/parser/cpdf_number.h"
diff --git a/fpdfsdk/fpdfdoc.cpp b/fpdfsdk/fpdf_doc.cpp
index d8be12066a..d8be12066a 100644
--- a/fpdfsdk/fpdfdoc.cpp
+++ b/fpdfsdk/fpdf_doc.cpp
diff --git a/fpdfsdk/fpdfdoc_embeddertest.cpp b/fpdfsdk/fpdf_doc_embeddertest.cpp
index 07b83263be..07b83263be 100644
--- a/fpdfsdk/fpdfdoc_embeddertest.cpp
+++ b/fpdfsdk/fpdf_doc_embeddertest.cpp
diff --git a/fpdfsdk/fpdfdoc_unittest.cpp b/fpdfsdk/fpdf_doc_unittest.cpp
index b52cccf098..b52cccf098 100644
--- a/fpdfsdk/fpdfdoc_unittest.cpp
+++ b/fpdfsdk/fpdf_doc_unittest.cpp
diff --git a/fpdfsdk/fpdfedit_embeddertest.cpp b/fpdfsdk/fpdf_edit_embeddertest.cpp
index 7ea22d0aa4..074bb40592 100644
--- a/fpdfsdk/fpdfedit_embeddertest.cpp
+++ b/fpdfsdk/fpdf_edit_embeddertest.cpp
@@ -106,8 +106,8 @@ class FPDFEditEmbeddertest : public EmbedderTest {
         size_t inner_idx = 0;
         for (cur_cid = cid; cur_cid < cid + cnt; cur_cid++) {
           uint32_t width = arr->GetNumberAt(inner_idx++);
-          EXPECT_EQ(width, typed_font->GetCharWidthF(cur_cid)) << " at cid "
-                                                               << cur_cid;
+          EXPECT_EQ(width, typed_font->GetCharWidthF(cur_cid))
+              << " at cid " << cur_cid;
         }
         num_cids_checked += cnt;
         continue;
@@ -118,8 +118,8 @@ class FPDFEditEmbeddertest : public EmbedderTest {
       ASSERT_FALSE(++idx == widths_array->GetCount());
       uint32_t width = widths_array->GetNumberAt(idx);
       for (cur_cid = cid; cur_cid <= last_cid; cur_cid++) {
-        EXPECT_EQ(width, typed_font->GetCharWidthF(cur_cid)) << " at cid "
-                                                             << cur_cid;
+        EXPECT_EQ(width, typed_font->GetCharWidthF(cur_cid))
+            << " at cid " << cur_cid;
       }
       num_cids_checked += last_cid - cid + 1;
     }
@@ -390,11 +390,11 @@ TEST_F(FPDFEditEmbeddertest, RemovePageObject) {
   // Show what the original file looks like.
   {
 #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
-  const char kOriginalMD5[] = "b90475ca64d1348c3bf5e2b77ad9187a";
+    const char kOriginalMD5[] = "b90475ca64d1348c3bf5e2b77ad9187a";
 #elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
-  const char kOriginalMD5[] = "e5a6fa28298db07484cd922f3e210c88";
+    const char kOriginalMD5[] = "e5a6fa28298db07484cd922f3e210c88";
 #else
-  const char kOriginalMD5[] = "2baa4c0e1758deba1b9c908e1fbd04ed";
+    const char kOriginalMD5[] = "2baa4c0e1758deba1b9c908e1fbd04ed";
 #endif
     std::unique_ptr<void, FPDFBitmapDeleter> page_bitmap =
         RenderPageWithFlags(page, nullptr, 0);
@@ -410,11 +410,11 @@ TEST_F(FPDFEditEmbeddertest, RemovePageObject) {
   // Verify the "Hello, world!" text is gone.
   {
 #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
-  const char kRemovedMD5[] = "af760c4702467cb1492a57fb8215efaa";
+    const char kRemovedMD5[] = "af760c4702467cb1492a57fb8215efaa";
 #elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
-  const char kRemovedMD5[] = "72be917349bf7004a5c39661fe1fc433";
+    const char kRemovedMD5[] = "72be917349bf7004a5c39661fe1fc433";
 #else
-  const char kRemovedMD5[] = "b76df015fe88009c3c342395df96abf1";
+    const char kRemovedMD5[] = "b76df015fe88009c3c342395df96abf1";
 #endif
     std::unique_ptr<void, FPDFBitmapDeleter> page_bitmap =
         RenderPageWithFlags(page, nullptr, 0);
@@ -766,13 +766,13 @@ TEST_F(FPDFEditEmbeddertest, AddStandardFontText) {
     std::unique_ptr<void, FPDFBitmapDeleter> page_bitmap =
         RenderPageWithFlags(page, nullptr, 0);
 #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
-  const char md5_2[] = "a5c4ace4c6f27644094813fe1441a21c";
+    const char md5_2[] = "a5c4ace4c6f27644094813fe1441a21c";
 #elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
-  const char md5_2[] = "2587eac9a787e97a37636d54d11bd28d";
+    const char md5_2[] = "2587eac9a787e97a37636d54d11bd28d";
 #else
-  const char md5_2[] = "76fcc7d08aa15445efd2e2ceb7c6cc3b";
+    const char md5_2[] = "76fcc7d08aa15445efd2e2ceb7c6cc3b";
 #endif
-  CompareBitmap(page_bitmap.get(), 612, 792, md5_2);
+    CompareBitmap(page_bitmap.get(), 612, 792, md5_2);
   }
 
   // And some randomly transformed text
diff --git a/fpdfsdk/fpdfeditimg.cpp b/fpdfsdk/fpdf_editimg.cpp
index f1d90ece2d..f1d90ece2d 100644
--- a/fpdfsdk/fpdfeditimg.cpp
+++ b/fpdfsdk/fpdf_editimg.cpp
diff --git a/fpdfsdk/fpdfeditimg_unittest.cpp b/fpdfsdk/fpdf_editimg_unittest.cpp
index fcc081ab76..fcc081ab76 100644
--- a/fpdfsdk/fpdfeditimg_unittest.cpp
+++ b/fpdfsdk/fpdf_editimg_unittest.cpp
diff --git a/fpdfsdk/fpdfeditpage.cpp b/fpdfsdk/fpdf_editpage.cpp
index 29cad9a752..bc494f8d85 100644
--- a/fpdfsdk/fpdfeditpage.cpp
+++ b/fpdfsdk/fpdf_editpage.cpp
@@ -156,7 +156,7 @@ FPDF_EXPORT FPDF_PAGE FPDF_CALLCONV FPDFPage_New(FPDF_DOCUMENT document,
       static_cast<CPDFXFA_Context*>(document), page_index);
   pXFAPage->LoadPDFPage(pPageDict);
   return pXFAPage.Leak();  // Caller takes ownership.
-#else   // PDF_ENABLE_XFA
+#else  // PDF_ENABLE_XFA
   auto pPage = pdfium::MakeUnique<CPDF_Page>(pDoc, pPageDict, true);
   pPage->ParseContent();
   return pPage.release();  // Caller takes ownership.
diff --git a/fpdfsdk/fpdfeditpath.cpp b/fpdfsdk/fpdf_editpath.cpp
index 745c3b763b..2daec67e36 100644
--- a/fpdfsdk/fpdfeditpath.cpp
+++ b/fpdfsdk/fpdf_editpath.cpp
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <vector>
-
 #include "public/fpdf_edit.h"
 
+#include <vector>
+
 #include "core/fpdfapi/page/cpdf_path.h"
 #include "core/fpdfapi/page/cpdf_pathobject.h"
 #include "core/fxcrt/fx_system.h"
diff --git a/fpdfsdk/fpdfeditpath_embeddertest.cpp b/fpdfsdk/fpdf_editpath_embeddertest.cpp
index 59e5dbbabf..59e5dbbabf 100644
--- a/fpdfsdk/fpdfeditpath_embeddertest.cpp
+++ b/fpdfsdk/fpdf_editpath_embeddertest.cpp
diff --git a/fpdfsdk/fpdfedittext.cpp b/fpdfsdk/fpdf_edittext.cpp
index 8155003a1f..8155003a1f 100644
--- a/fpdfsdk/fpdfedittext.cpp
+++ b/fpdfsdk/fpdf_edittext.cpp
diff --git a/fpdfsdk/fpdfext_embeddertest.cpp b/fpdfsdk/fpdf_ext_embeddertest.cpp
index 7c28c29a8e..7c28c29a8e 100644
--- a/fpdfsdk/fpdfext_embeddertest.cpp
+++ b/fpdfsdk/fpdf_ext_embeddertest.cpp
diff --git a/fpdfsdk/fpdfformfill.cpp b/fpdfsdk/fpdf_formfill.cpp
index ddd460da05..ddd460da05 100644
--- a/fpdfsdk/fpdfformfill.cpp
+++ b/fpdfsdk/fpdf_formfill.cpp
diff --git a/fpdfsdk/fpdfformfill_embeddertest.cpp b/fpdfsdk/fpdf_formfill_embeddertest.cpp
index 709bc39bfa..99a51fd4a4 100644
--- a/fpdfsdk/fpdfformfill_embeddertest.cpp
+++ b/fpdfsdk/fpdf_formfill_embeddertest.cpp
@@ -285,7 +285,6 @@ class FPDFFormFillComboBoxFormEmbeddertest
   // Selects one of the pre-selected values from a combobox with three options.
   // Options are specified by |item_index|, which is 0-based.
   void SelectOption(int item_index, const CFX_PointF& point) {
-
     // Navigate to button for drop down and click mouse to reveal options.
     ClickOnFormFieldAtPoint(point);
 
diff --git a/fpdfsdk/fpdfppo_embeddertest.cpp b/fpdfsdk/fpdf_ppo_embeddertest.cpp
index f62ca52048..f62ca52048 100644
--- a/fpdfsdk/fpdfppo_embeddertest.cpp
+++ b/fpdfsdk/fpdf_ppo_embeddertest.cpp
diff --git a/fpdfsdk/fpdfsave.cpp b/fpdfsdk/fpdf_save.cpp
index da3e12fc9c..da3e12fc9c 100644
--- a/fpdfsdk/fpdfsave.cpp
+++ b/fpdfsdk/fpdf_save.cpp
diff --git a/fpdfsdk/fpdfsave_embeddertest.cpp b/fpdfsdk/fpdf_save_embeddertest.cpp
index e753ba0356..e753ba0356 100644
--- a/fpdfsdk/fpdfsave_embeddertest.cpp
+++ b/fpdfsdk/fpdf_save_embeddertest.cpp
diff --git a/fpdfsdk/fpdftext.cpp b/fpdfsdk/fpdf_text.cpp
index 7778696931..7778696931 100644
--- a/fpdfsdk/fpdftext.cpp
+++ b/fpdfsdk/fpdf_text.cpp
diff --git a/fpdfsdk/fpdftext_embeddertest.cpp b/fpdfsdk/fpdf_text_embeddertest.cpp
index 9d09381d7c..9d09381d7c 100644
--- a/fpdfsdk/fpdftext_embeddertest.cpp
+++ b/fpdfsdk/fpdf_text_embeddertest.cpp
diff --git a/fpdfsdk/fpdfview.cpp b/fpdfsdk/fpdf_view.cpp
index 187db9b126..a0877f38b5 100644
--- a/fpdfsdk/fpdfview.cpp
+++ b/fpdfsdk/fpdf_view.cpp
@@ -904,10 +904,11 @@ void FPDF_RenderPage_Retail(CPDF_PageRenderContext* pContext,
   if (!pPage)
     return;
 
-  RenderPageImpl(pContext, pPage, pPage->GetDisplayMatrix(
-                                      start_x, start_y, size_x, size_y, rotate),
-                 FX_RECT(start_x, start_y, start_x + size_x, start_y + size_y),
-                 flags, bNeedToRestore, pause);
+  RenderPageImpl(
+      pContext, pPage,
+      pPage->GetDisplayMatrix(start_x, start_y, size_x, size_y, rotate),
+      FX_RECT(start_x, start_y, start_x + size_x, start_y + size_y), flags,
+      bNeedToRestore, pause);
 }
 
 FPDF_EXPORT int FPDF_CALLCONV FPDF_GetPageSizeByIndex(FPDF_DOCUMENT document,
diff --git a/fpdfsdk/fpdfview_c_api_test.c b/fpdfsdk/fpdf_view_c_api_test.c
index a0bcc13ff3..df7ade8539 100644
--- a/fpdfsdk/fpdfview_c_api_test.c
+++ b/fpdfsdk/fpdf_view_c_api_test.c
@@ -7,7 +7,7 @@
 
 #include <stdio.h>
 
-#include "fpdfsdk/fpdfview_c_api_test.h"
+#include "fpdfsdk/fpdf_view_c_api_test.h"
 
 #include "public/fpdf_annot.h"
 #include "public/fpdf_attachment.h"
diff --git a/fpdfsdk/fpdfview_c_api_test.h b/fpdfsdk/fpdf_view_c_api_test.h
index d5b84a27a9..c662f40068 100644
--- a/fpdfsdk/fpdfview_c_api_test.h
+++ b/fpdfsdk/fpdf_view_c_api_test.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FPDFSDK_FPDFVIEW_C_API_TEST_H_
-#define FPDFSDK_FPDFVIEW_C_API_TEST_H_
+#ifndef FPDFSDK_FPDF_VIEW_C_API_TEST_H_
+#define FPDFSDK_FPDF_VIEW_C_API_TEST_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -17,4 +17,4 @@ int CheckPDFiumCApi();
 }
 #endif
 
-#endif  // FPDFSDK_FPDFVIEW_C_API_TEST_H_
+#endif  // FPDFSDK_FPDF_VIEW_C_API_TEST_H_
diff --git a/fpdfsdk/fpdfview_embeddertest.cpp b/fpdfsdk/fpdf_view_embeddertest.cpp
index ab7606479d..0bfa1a30b2 100644
--- a/fpdfsdk/fpdfview_embeddertest.cpp
+++ b/fpdfsdk/fpdf_view_embeddertest.cpp
@@ -7,7 +7,7 @@
 #include <memory>
 #include <string>
 
-#include "fpdfsdk/fpdfview_c_api_test.h"
+#include "fpdfsdk/fpdf_view_c_api_test.h"
 #include "public/fpdfview.h"
 #include "testing/embedder_test.h"
 #include "testing/gtest/include/gtest/gtest.h"