Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(906)

Side by Side Diff: xfa/fwl/lightwidget/cfwl_picturebox.cpp

Issue 2433133002: Remove IFWL_*::Create methods, use new (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "xfa/fwl/lightwidget/cfwl_picturebox.h" 7 #include "xfa/fwl/lightwidget/cfwl_picturebox.h"
8 8
9 #include <memory> 9 #include <memory>
10 10
11 #include "third_party/base/ptr_util.h"
12
11 IFWL_PictureBox* CFWL_PictureBox::GetWidget() { 13 IFWL_PictureBox* CFWL_PictureBox::GetWidget() {
12 return static_cast<IFWL_PictureBox*>(m_pIface.get()); 14 return static_cast<IFWL_PictureBox*>(m_pIface.get());
13 } 15 }
14 16
15 const IFWL_PictureBox* CFWL_PictureBox::GetWidget() const { 17 const IFWL_PictureBox* CFWL_PictureBox::GetWidget() const {
16 return static_cast<IFWL_PictureBox*>(m_pIface.get()); 18 return static_cast<IFWL_PictureBox*>(m_pIface.get());
17 } 19 }
18 20
19 FWL_Error CFWL_PictureBox::Initialize( 21 FWL_Error CFWL_PictureBox::Initialize(
20 const CFWL_WidgetProperties* pProperties) { 22 const CFWL_WidgetProperties* pProperties) {
21 if (m_pIface) 23 if (m_pIface)
22 return FWL_Error::Indefinite; 24 return FWL_Error::Indefinite;
23 if (pProperties) { 25 if (pProperties) {
24 *m_pProperties = *pProperties; 26 *m_pProperties = *pProperties;
25 } 27 }
26 std::unique_ptr<IFWL_PictureBox> pPictureBox(IFWL_PictureBox::Create( 28 std::unique_ptr<IFWL_PictureBox> pPictureBox =
27 m_pProperties->MakeWidgetImpProperties(&m_PictureBoxDP), nullptr)); 29 pdfium::MakeUnique<IFWL_PictureBox>(
30 m_pProperties->MakeWidgetImpProperties(&m_PictureBoxDP));
28 FWL_Error ret = pPictureBox->Initialize(); 31 FWL_Error ret = pPictureBox->Initialize();
29 if (ret != FWL_Error::Succeeded) { 32 if (ret != FWL_Error::Succeeded) {
30 return ret; 33 return ret;
31 } 34 }
32 m_pIface = std::move(pPictureBox); 35 m_pIface = std::move(pPictureBox);
33 CFWL_Widget::Initialize(); 36 CFWL_Widget::Initialize();
34 return FWL_Error::Succeeded; 37 return FWL_Error::Succeeded;
35 } 38 }
36 39
37 CFX_DIBitmap* CFWL_PictureBox::GetPicture() { 40 CFX_DIBitmap* CFWL_PictureBox::GetPicture() {
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 matrix.Rotate(m_fRotation); 150 matrix.Rotate(m_fRotation);
148 matrix.Translate(fLen, fWid); 151 matrix.Translate(fLen, fWid);
149 matrix.Scale(m_fScaleX, m_fScaleY); 152 matrix.Scale(m_fScaleX, m_fScaleY);
150 matrix.Translate(m_fOffSetX, m_fOffSetY); 153 matrix.Translate(m_fOffSetX, m_fOffSetY);
151 return FWL_Error::Succeeded; 154 return FWL_Error::Succeeded;
152 } 155 }
153 156
154 int32_t CFWL_PictureBox::CFWL_PictureBoxDP::GetFlipMode(IFWL_Widget* pWidget) { 157 int32_t CFWL_PictureBox::CFWL_PictureBoxDP::GetFlipMode(IFWL_Widget* pWidget) {
155 return m_iFlipMode; 158 return m_iFlipMode;
156 } 159 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698