Merge to XFA: Return const-ref object in a few CPWL_Wnd getters.

fpdfsdk/src/pdfwindow/PWL_Wnd.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 <map>
 
 #include "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
@@ skipping 284 matching lines @@
 }
 
 void CPWL_Wnd::InvalidateRectMove(const CPDF_Rect& rcOld,
                                   const CPDF_Rect& rcNew) {
   CPDF_Rect rcUnion = rcOld;
   rcUnion.Union(rcNew);
 
   InvalidateRect(&rcUnion);
 }
 
-void CPWL_Wnd::GetAppearanceStream(CFX_ByteString& sAppStream) {
-  if (IsValid()) {
-    CFX_ByteTextBuf sTextBuf;
-    GetAppearanceStream(sTextBuf);
-    sAppStream += sTextBuf.GetByteString();
-  }
-}
-
 void CPWL_Wnd::GetAppearanceStream(CFX_ByteTextBuf& sAppStream) {
   if (IsValid() && IsVisible()) {
     GetThisAppearanceStream(sAppStream);
     GetChildAppearanceStream(sAppStream);
   }
 }
 
 // if don't set,Get default apperance stream
 void CPWL_Wnd::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) {
   CPDF_Rect rectWnd = GetWindowRect();
@@ skipping 36 matching lines @@
   CPDF_Rect rectWnd = GetWindowRect();
   if (!rectWnd.IsEmpty()) {
     if (HasFlag(PWS_BACKGROUND)) {
       CPDF_Rect rcClient = CPWL_Utils::DeflateRect(
           rectWnd, (FX_FLOAT)(GetBorderWidth() + GetInnerBorderWidth()));
       CPWL_Utils::DrawFillRect(pDevice, pUser2Device, rcClient,
                                GetBackgroundColor(), GetTransparency());
     }
 
     if (HasFlag(PWS_BORDER))
-      CPWL_Utils::DrawBorder(
-          pDevice, pUser2Device, rectWnd, (FX_FLOAT)GetBorderWidth(),
-          GetBorderColor(), GetBorderLeftTopColor(GetBorderStyle()),
-          GetBorderRightBottomColor(GetBorderStyle()), GetBorderStyle(),
-          GetBorderDash(), GetTransparency());
+      CPWL_Utils::DrawBorder(pDevice, pUser2Device, rectWnd,
+                             (FX_FLOAT)GetBorderWidth(), GetBorderColor(),
+                             GetBorderLeftTopColor(GetBorderStyle()),
+                             GetBorderRightBottomColor(GetBorderStyle()),
+                             GetBorderStyle(), GetTransparency());
   }
 }
 
 void CPWL_Wnd::DrawChildAppearance(CFX_RenderDevice* pDevice,
                                    CFX_Matrix* pUser2Device) {
   for (int32_t i = 0, sz = m_aChildren.GetSize(); i < sz; i++) {
     if (CPWL_Wnd* pChild = m_aChildren.GetAt(i)) {
       CFX_Matrix mt = pChild->GetChildMatrix();
       if (mt.IsIdentity()) {
         pChild->DrawAppearance(pDevice, pUser2Device);
@@ skipping 137 matching lines @@
       break;
     default:
       break;
   }
 }
 
 FX_BOOL CPWL_Wnd::IsValid() const {
   return m_bCreated;
 }
 
-PWL_CREATEPARAM CPWL_Wnd::GetCreationParam() const {
+const PWL_CREATEPARAM& CPWL_Wnd::GetCreationParam() const {
   return m_sPrivateParam;
 }
 
 CPWL_Wnd* CPWL_Wnd::GetParentWindow() const {
   return m_sPrivateParam.pParentWnd;
 }
 
-CPDF_Rect CPWL_Wnd::GetOriginWindowRect() const {
-  return m_sPrivateParam.rcRectWnd;
-}
-
 CPDF_Rect CPWL_Wnd::GetWindowRect() const {
   return m_rcWindow;
 }
 
 CPDF_Rect CPWL_Wnd::GetClientRect() const {
   CPDF_Rect rcWindow = GetWindowRect();
   CPDF_Rect rcClient = CPWL_Utils::DeflateRect(
       rcWindow, (FX_FLOAT)(GetBorderWidth() + GetInnerBorderWidth()));
   if (CPWL_ScrollBar* pVSB = GetVScrollBar())
     rcClient.right -= pVSB->GetScrollBarWidth();
 
   rcClient.Normalize();
   return rcWindow.Contains(rcClient) ? rcClient : CPDF_Rect();
 }
 
 CPDF_Point CPWL_Wnd::GetCenterPoint() const {
   CPDF_Rect rcClient = GetClientRect();
   return CPDF_Point((rcClient.left + rcClient.right) * 0.5f,
                     (rcClient.top + rcClient.bottom) * 0.5f);
 }
 
-CPDF_Rect CPWL_Wnd::GetClientCenterSquare() const {
-  return CPWL_Utils::GetCenterSquare(GetClientRect());
-}
-
-CPDF_Rect CPWL_Wnd::GetWindowCenterSquare() const {
-  return CPWL_Utils::GetCenterSquare(
-      CPWL_Utils::DeflateRect(GetWindowRect(), 0.1f));
-}
-
 FX_BOOL CPWL_Wnd::HasFlag(FX_DWORD dwFlags) const {
   return (m_sPrivateParam.dwFlags & dwFlags) != 0;
 }
 
 void CPWL_Wnd::RemoveFlag(FX_DWORD dwFlags) {
   m_sPrivateParam.dwFlags &= ~dwFlags;
 }
 
 void CPWL_Wnd::AddFlag(FX_DWORD dwFlags) {
   m_sPrivateParam.dwFlags |= dwFlags;
@@ skipping 36 matching lines @@
   if (HasFlag(PWS_BORDER))
     return m_sPrivateParam.dwBorderWidth;
 
   return 0;
 }
 
 int32_t CPWL_Wnd::GetInnerBorderWidth() const {
   return 0;
 }
 
-void CPWL_Wnd::SetBorderWidth(int32_t nBorderWidth) {
-  if (HasFlag(PWS_BORDER))
-    m_sPrivateParam.dwBorderWidth = nBorderWidth;
-}
-
 CPWL_Color CPWL_Wnd::GetBorderColor() const {
   if (HasFlag(PWS_BORDER))
     return m_sPrivateParam.sBorderColor;
 
   return CPWL_Color();
 }
 
-void CPWL_Wnd::SetBorderColor(const CPWL_Color& color) {
-  if (HasFlag(PWS_BORDER))
-    m_sPrivateParam.sBorderColor = color;
-}
-
-CPWL_Dash CPWL_Wnd::GetBorderDash() const {
+const CPWL_Dash& CPWL_Wnd::GetBorderDash() const {
   return m_sPrivateParam.sDash;
 }
 
 void* CPWL_Wnd::GetAttachedData() const {
   return m_sPrivateParam.pAttachedData;
 }
 
-void CPWL_Wnd::SetBorderDash(const CPWL_Dash& sDash) {
-  if (HasFlag(PWS_BORDER))
-    m_sPrivateParam.sDash = sDash;
-}
-
 CPWL_ScrollBar* CPWL_Wnd::GetVScrollBar() const {
   if (HasFlag(PWS_VSCROLL))
     return m_pVScrollBar;
 
   return NULL;
 }
 
 void CPWL_Wnd::CreateScrollBar(const PWL_CREATEPARAM& cp) {
   CreateVScrollBar(cp);
 }
@@ skipping 78 matching lines @@
       InvalidateRect();
     }
   }
 }
 
 void CPWL_Wnd::SetClipRect(const CPDF_Rect& rect) {
   m_rcClip = rect;
   m_rcClip.Normalize();
 }
 
-CPDF_Rect CPWL_Wnd::GetClipRect() const {
+const CPDF_Rect& CPWL_Wnd::GetClipRect() const {
   return m_rcClip;
 }
 
 FX_BOOL CPWL_Wnd::IsReadOnly() const {
   return HasFlag(PWS_READONLY);
 }
 
 void CPWL_Wnd::RePosChildWnd() {
   CPDF_Rect rcContent = CPWL_Utils::DeflateRect(
       GetWindowRect(), (FX_FLOAT)(GetBorderWidth() + GetInnerBorderWidth()));
@@ skipping 296 matching lines @@
   return FALSE;
 }
 
 FX_BOOL CPWL_Wnd::IsINSERTpressed(FX_DWORD nFlag) const {
   if (IFX_SystemHandler* pSystemHandler = GetSystemHandler()) {
     return pSystemHandler->IsINSERTKeyDown(nFlag);
   }
 
   return FALSE;
 }