Merge to XFA: Remove header files that only have includes.

fpdfsdk/src/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 "fpdfsdk/include/pdfwindow/PDFWindow.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Icon.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
 
-/* ------------------------------- CPWL_Image ----------------------------------
- */
-
 CPWL_Image::CPWL_Image() : m_pPDFStream(NULL) {}
 
 CPWL_Image::~CPWL_Image() {}
 
 CFX_ByteString CPWL_Image::GetImageAppStream() {
   CFX_ByteTextBuf sAppStream;
 
   CFX_ByteString sAlias = GetImageAlias();
   CPDF_Rect rcPlate = GetClientRect();
   CFX_Matrix mt;
@@ skipping 51 matching lines @@
   if (m_pPDFStream) {
     if (CPDF_Dictionary* pDict = m_pPDFStream->GetDict()) {
       return pDict->GetMatrix("Matrix");
     }
   }
 
   return CFX_Matrix();
 }
 
 CFX_ByteString CPWL_Image::GetImageAlias() {
-  if (m_sImageAlias.IsEmpty()) {
-    if (m_pPDFStream) {
-      if (CPDF_Dictionary* pDict = m_pPDFStream->GetDict()) {
-        return pDict->GetString("Name");
-      }
+  if (!m_sImageAlias.IsEmpty())
+    return m_sImageAlias;
+
+  if (m_pPDFStream) {
+    if (CPDF_Dictionary* pDict = m_pPDFStream->GetDict()) {
+      return pDict->GetString("Name");
     }
-  } else
-    return m_sImageAlias;
+  }
 
   return CFX_ByteString();
 }
 
 void CPWL_Image::SetImageAlias(const FX_CHAR* sImageAlias) {
   m_sImageAlias = sImageAlias;
 }
 
 void CPWL_Image::GetScale(FX_FLOAT& fHScale, FX_FLOAT& fVScale) {
   fHScale = 1.0f;
   fVScale = 1.0f;
 }
 
 void CPWL_Image::GetImageOffset(FX_FLOAT& x, FX_FLOAT& y) {
   x = 0.0f;
   y = 0.0f;
 }
 
-/* ------------------------------- CPWL_Icon ----------------------------------
- */
-
 CPWL_Icon::CPWL_Icon() : m_pIconFit(NULL) {}
 
 CPWL_Icon::~CPWL_Icon() {}
 
 int32_t CPWL_Icon::GetScaleMethod() {
   if (m_pIconFit)
     return m_pIconFit->GetScaleMethod();
 
   return 0;
 }
 
 FX_BOOL CPWL_Icon::IsProportionalScale() {
   if (m_pIconFit)
     return m_pIconFit->IsProportionalScale();
 
   return FALSE;
 }
 
 void CPWL_Icon::GetIconPosition(FX_FLOAT& fLeft, FX_FLOAT& fBottom) {
   if (m_pIconFit) {
-    // m_pIconFit->GetIconPosition(fLeft,fBottom);
     fLeft = 0.0f;
     fBottom = 0.0f;
     CPDF_Array* pA =
         m_pIconFit->m_pDict ? m_pIconFit->m_pDict->GetArray("A") : NULL;
     if (pA) {
       FX_DWORD dwCount = pA->GetCount();
       if (dwCount > 0)
         fLeft = pA->GetNumber(0);
       if (dwCount > 1)
         fBottom = pA->GetNumber(1);
@@ skipping 75 matching lines @@
   FX_FLOAT fImageFactHeight = fImageHeight * fVScale;
 
   FX_FLOAT fPlateWidth, fPlateHeight;
   CPDF_Rect rcPlate = GetClientRect();
   fPlateWidth = rcPlate.right - rcPlate.left;
   fPlateHeight = rcPlate.top - rcPlate.bottom;
 
   x = (fPlateWidth - fImageFactWidth) * fLeft;
   y = (fPlateHeight - fImageFactHeight) * fBottom;
 }