| Index: xfa/fxfa/parser/cxfa_layoutprocessor.cpp
|
| diff --git a/xfa/fxfa/parser/xfa_document_layout_imp.cpp b/xfa/fxfa/parser/cxfa_layoutprocessor.cpp
|
| similarity index 68%
|
| rename from xfa/fxfa/parser/xfa_document_layout_imp.cpp
|
| rename to xfa/fxfa/parser/cxfa_layoutprocessor.cpp
|
| index ec407a27579ecfc50656d733edca10685ff2cd80..7ebe5285e337e6d11d33c7ec1f00682581775a1f 100644
|
| --- a/xfa/fxfa/parser/xfa_document_layout_imp.cpp
|
| +++ b/xfa/fxfa/parser/cxfa_layoutprocessor.cpp
|
| @@ -1,13 +1,12 @@
|
| -// Copyright 2014 PDFium Authors. All rights reserved.
|
| +// Copyright 2016 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 "xfa/fxfa/parser/xfa_document_layout_imp.h"
|
| +#include "xfa/fxfa/parser/cxfa_layoutprocessor.h"
|
|
|
| #include "xfa/fxfa/parser/cxfa_measurement.h"
|
| -#include "xfa/fxfa/parser/xfa_doclayout.h"
|
| #include "xfa/fxfa/parser/xfa_document.h"
|
| #include "xfa/fxfa/parser/xfa_document_datamerger_imp.h"
|
| #include "xfa/fxfa/parser/xfa_layout_appadapter.h"
|
| @@ -24,18 +23,22 @@ CXFA_LayoutProcessor* CXFA_Document::GetLayoutProcessor() {
|
| }
|
| return m_pLayoutProcessor;
|
| }
|
| +
|
| CXFA_LayoutProcessor* CXFA_Document::GetDocLayout() {
|
| return GetLayoutProcessor();
|
| }
|
| +
|
| CXFA_LayoutProcessor::CXFA_LayoutProcessor(CXFA_Document* pDocument)
|
| : m_pDocument(pDocument),
|
| m_pRootItemLayoutProcessor(nullptr),
|
| m_pLayoutPageMgr(nullptr),
|
| m_nProgressCounter(0),
|
| m_bNeeLayout(TRUE) {}
|
| +
|
| CXFA_LayoutProcessor::~CXFA_LayoutProcessor() {
|
| ClearLayoutData();
|
| }
|
| +
|
| CXFA_Document* CXFA_LayoutProcessor::GetDocument() const {
|
| return m_pDocument;
|
| }
|
| @@ -49,32 +52,29 @@ int32_t CXFA_LayoutProcessor::StartLayout(FX_BOOL bForceRestart) {
|
| m_nProgressCounter = 0;
|
| CXFA_Node* pFormPacketNode =
|
| ToNode(m_pDocument->GetXFAObject(XFA_HASHCODE_Form));
|
| - if (!pFormPacketNode) {
|
| + if (!pFormPacketNode)
|
| return -1;
|
| - }
|
| +
|
| CXFA_Node* pFormRoot =
|
| pFormPacketNode->GetFirstChildByClass(XFA_Element::Subform);
|
| - if (!pFormRoot) {
|
| + if (!pFormRoot)
|
| return -1;
|
| - }
|
| - if (!m_pLayoutPageMgr) {
|
| + if (!m_pLayoutPageMgr)
|
| m_pLayoutPageMgr = new CXFA_LayoutPageMgr(this);
|
| - }
|
| - if (!m_pLayoutPageMgr->InitLayoutPage(pFormRoot)) {
|
| + if (!m_pLayoutPageMgr->InitLayoutPage(pFormRoot))
|
| return -1;
|
| - }
|
| - if (!m_pLayoutPageMgr->PrepareFirstPage(pFormRoot)) {
|
| + if (!m_pLayoutPageMgr->PrepareFirstPage(pFormRoot))
|
| return -1;
|
| - }
|
| m_pRootItemLayoutProcessor =
|
| new CXFA_ItemLayoutProcessor(pFormRoot, m_pLayoutPageMgr);
|
| m_nProgressCounter = 1;
|
| return 0;
|
| }
|
| +
|
| int32_t CXFA_LayoutProcessor::DoLayout(IFX_Pause* pPause) {
|
| - if (m_nProgressCounter < 1) {
|
| + if (m_nProgressCounter < 1)
|
| return -1;
|
| - }
|
| +
|
| XFA_ItemLayoutProcessorResult eStatus;
|
| CXFA_Node* pFormNode = m_pRootItemLayoutProcessor->GetFormNode();
|
| FX_FLOAT fPosX = pFormNode->GetMeasure(XFA_ATTRIBUTE_X).ToUnit(XFA_UNIT_Pt);
|
| @@ -83,17 +83,18 @@ int32_t CXFA_LayoutProcessor::DoLayout(IFX_Pause* pPause) {
|
| FX_FLOAT fAvailHeight = m_pLayoutPageMgr->GetAvailHeight();
|
| eStatus =
|
| m_pRootItemLayoutProcessor->DoLayout(TRUE, fAvailHeight, fAvailHeight);
|
| - if (eStatus != XFA_ItemLayoutProcessorResult_Done) {
|
| + if (eStatus != XFA_ItemLayoutProcessorResult_Done)
|
| m_nProgressCounter++;
|
| - }
|
| +
|
| CXFA_ContentLayoutItem* pLayoutItem =
|
| m_pRootItemLayoutProcessor->ExtractLayoutItem();
|
| - if (pLayoutItem) {
|
| + if (pLayoutItem)
|
| pLayoutItem->m_sPos = CFX_PointF(fPosX, fPosY);
|
| - }
|
| +
|
| m_pLayoutPageMgr->SubmitContentItem(pLayoutItem, eStatus);
|
| } while (eStatus != XFA_ItemLayoutProcessorResult_Done &&
|
| (!pPause || !pPause->NeedToPauseNow()));
|
| +
|
| if (eStatus == XFA_ItemLayoutProcessorResult_Done) {
|
| m_pLayoutPageMgr->FinishPaginatedPageSets();
|
| m_pLayoutPageMgr->SyncLayoutData();
|
| @@ -105,18 +106,19 @@ int32_t CXFA_LayoutProcessor::DoLayout(IFX_Pause* pPause) {
|
| : m_nProgressCounter - 1) /
|
| m_nProgressCounter;
|
| }
|
| +
|
| FX_BOOL CXFA_LayoutProcessor::IncrementLayout() {
|
| if (m_bNeeLayout) {
|
| StartLayout(TRUE);
|
| return DoLayout(nullptr) == 100;
|
| }
|
| +
|
| for (int32_t i = 0, c = m_rgChangedContainers.GetSize(); i < c; i++) {
|
| CXFA_Node* pNode = m_rgChangedContainers[i];
|
| CXFA_Node* pParentNode =
|
| pNode->GetNodeItem(XFA_NODEITEM_Parent, XFA_ObjectType::ContainerNode);
|
| - if (!pParentNode) {
|
| + if (!pParentNode)
|
| return FALSE;
|
| - }
|
| if (!CXFA_ItemLayoutProcessor::IncrementRelayoutNode(this, pNode,
|
| pParentNode)) {
|
| return FALSE;
|
| @@ -125,21 +127,25 @@ FX_BOOL CXFA_LayoutProcessor::IncrementLayout() {
|
| m_rgChangedContainers.RemoveAll();
|
| return TRUE;
|
| }
|
| +
|
| int32_t CXFA_LayoutProcessor::CountPages() const {
|
| return m_pLayoutPageMgr ? m_pLayoutPageMgr->GetPageCount() : 0;
|
| }
|
| +
|
| CXFA_ContainerLayoutItem* CXFA_LayoutProcessor::GetPage(int32_t index) const {
|
| return m_pLayoutPageMgr ? m_pLayoutPageMgr->GetPage(index) : nullptr;
|
| }
|
| +
|
| CXFA_LayoutItem* CXFA_LayoutProcessor::GetLayoutItem(CXFA_Node* pFormItem) {
|
| return static_cast<CXFA_LayoutItem*>(
|
| pFormItem->GetUserData(XFA_LAYOUTITEMKEY));
|
| }
|
| +
|
| void CXFA_LayoutProcessor::AddChangedContainer(CXFA_Node* pContainer) {
|
| - if (m_rgChangedContainers.Find(pContainer) < 0) {
|
| + if (m_rgChangedContainers.Find(pContainer) < 0)
|
| m_rgChangedContainers.Add(pContainer);
|
| - }
|
| }
|
| +
|
| CXFA_ContainerLayoutItem* CXFA_LayoutProcessor::GetRootLayoutItem() const {
|
| return m_pLayoutPageMgr ? m_pLayoutPageMgr->GetRootLayoutItem() : nullptr;
|
| }
|
| @@ -155,49 +161,3 @@ void CXFA_LayoutProcessor::ClearLayoutData() {
|
| FX_BOOL CXFA_LayoutProcessor::IsNeedLayout() {
|
| return m_bNeeLayout || m_rgChangedContainers.GetSize() > 0;
|
| }
|
| -CXFA_LayoutItem::CXFA_LayoutItem(CXFA_Node* pNode, FX_BOOL bIsContentLayoutItem)
|
| - : m_pFormNode(pNode),
|
| - m_pParent(nullptr),
|
| - m_pNextSibling(nullptr),
|
| - m_pFirstChild(nullptr),
|
| - m_bIsContentLayoutItem(bIsContentLayoutItem) {}
|
| -CXFA_LayoutItem::~CXFA_LayoutItem() {}
|
| -CXFA_ContainerLayoutItem::CXFA_ContainerLayoutItem(CXFA_Node* pNode)
|
| - : CXFA_LayoutItem(pNode, FALSE), m_pOldSubform(nullptr) {}
|
| -CXFA_LayoutProcessor* CXFA_ContainerLayoutItem::GetLayout() const {
|
| - return m_pFormNode->GetDocument()->GetLayoutProcessor();
|
| -}
|
| -int32_t CXFA_ContainerLayoutItem::GetPageIndex() const {
|
| - return m_pFormNode->GetDocument()
|
| - ->GetLayoutProcessor()
|
| - ->GetLayoutPageMgr()
|
| - ->GetPageIndex(this);
|
| -}
|
| -
|
| -void CXFA_ContainerLayoutItem::GetPageSize(CFX_SizeF& size) const {
|
| - size.clear();
|
| - CXFA_Node* pMedium = m_pFormNode->GetFirstChildByClass(XFA_Element::Medium);
|
| - if (!pMedium)
|
| - return;
|
| -
|
| - size = CFX_SizeF(pMedium->GetMeasure(XFA_ATTRIBUTE_Short).ToUnit(XFA_UNIT_Pt),
|
| - pMedium->GetMeasure(XFA_ATTRIBUTE_Long).ToUnit(XFA_UNIT_Pt));
|
| - if (pMedium->GetEnum(XFA_ATTRIBUTE_Orientation) ==
|
| - XFA_ATTRIBUTEENUM_Landscape) {
|
| - size = CFX_SizeF(size.y, size.x);
|
| - }
|
| -}
|
| -
|
| -CXFA_Node* CXFA_ContainerLayoutItem::GetMasterPage() const {
|
| - return m_pFormNode;
|
| -}
|
| -CXFA_ContentLayoutItem::CXFA_ContentLayoutItem(CXFA_Node* pNode)
|
| - : CXFA_LayoutItem(pNode, TRUE),
|
| - m_pPrev(nullptr),
|
| - m_pNext(nullptr),
|
| - m_dwStatus(0) {}
|
| -CXFA_ContentLayoutItem::~CXFA_ContentLayoutItem() {
|
| - if (m_pFormNode->GetUserData(XFA_LAYOUTITEMKEY) == this) {
|
| - m_pFormNode->SetUserData(XFA_LAYOUTITEMKEY, nullptr);
|
| - }
|
| -}
|
|
|