core/include/fdpfapi cleanup Part I.

fpdfsdk/pdfwindow/PWL_Icon.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 "core/include/fpdfapi/cpdf_array.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Icon.h"
+
+#include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
+#include "core/include/fpdfapi/fpdf_page.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
 
 CPWL_Image::CPWL_Image() : m_pPDFStream(NULL) {}
 
 CPWL_Image::~CPWL_Image() {}
 
 CFX_ByteString CPWL_Image::GetImageAppStream() {
   CFX_ByteTextBuf sAppStream;
 
@@ skipping 195 matching lines @@
   FX_FLOAT fImageFactHeight = fImageHeight * fVScale;
 
   FX_FLOAT fPlateWidth, fPlateHeight;
   CFX_FloatRect rcPlate = GetClientRect();
   fPlateWidth = rcPlate.right - rcPlate.left;
   fPlateHeight = rcPlate.top - rcPlate.bottom;
 
   x = (fPlateWidth - fImageFactWidth) * fLeft;
   y = (fPlateHeight - fImageFactHeight) * fBottom;
 }