From e5434b5531f2c081c1d69f67125b6665070ea969 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 1 Nov 2017 16:04:36 +0000 Subject: Split JS code out of CXFA_Node. This CL moves JS code out of CXFA_Node and places it into fxjs/cjx_node. The CXFA_Node then has a CJX_Node as a member and, currently, proxies JS calls to the CJX_Node member. Change-Id: Ic5b95184c8fd2347f0bdcfbccfa89bb6b52835b6 Reviewed-on: https://pdfium-review.googlesource.com/17290 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- xfa/fxfa/parser/cxfa_image.cpp | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_image.cpp') diff --git a/xfa/fxfa/parser/cxfa_image.cpp b/xfa/fxfa/parser/cxfa_image.cpp index b6d78d9eda..cfa3db76f1 100644 --- a/xfa/fxfa/parser/cxfa_image.cpp +++ b/xfa/fxfa/parser/cxfa_image.cpp @@ -12,43 +12,44 @@ CXFA_Image::CXFA_Image(CXFA_Node* pNode, bool bDefValue) : CXFA_Data(pNode), m_bDefValue(bDefValue) {} int32_t CXFA_Image::GetAspect() { - return m_pNode->GetEnum(XFA_ATTRIBUTE_Aspect); + return m_pNode->JSNode()->GetEnum(XFA_ATTRIBUTE_Aspect); } bool CXFA_Image::GetContentType(WideString& wsContentType) { - return m_pNode->TryCData(XFA_ATTRIBUTE_ContentType, wsContentType); + return m_pNode->JSNode()->TryCData(XFA_ATTRIBUTE_ContentType, wsContentType); } bool CXFA_Image::GetHref(WideString& wsHref) { if (m_bDefValue) - return m_pNode->TryCData(XFA_ATTRIBUTE_Href, wsHref); - return m_pNode->GetAttribute(L"href", wsHref); + return m_pNode->JSNode()->TryCData(XFA_ATTRIBUTE_Href, wsHref); + return m_pNode->JSNode()->GetAttribute(L"href", wsHref); } int32_t CXFA_Image::GetTransferEncoding() { if (m_bDefValue) - return m_pNode->GetEnum(XFA_ATTRIBUTE_TransferEncoding); + return m_pNode->JSNode()->GetEnum(XFA_ATTRIBUTE_TransferEncoding); return XFA_ATTRIBUTEENUM_Base64; } bool CXFA_Image::GetContent(WideString& wsText) { - return m_pNode->TryContent(wsText); + return m_pNode->JSNode()->TryContent(wsText); } bool CXFA_Image::SetContentType(const WideString& wsContentType) { - return m_pNode->SetCData(XFA_ATTRIBUTE_ContentType, wsContentType); + return m_pNode->JSNode()->SetCData(XFA_ATTRIBUTE_ContentType, wsContentType); } bool CXFA_Image::SetHref(const WideString& wsHref) { if (m_bDefValue) - return m_pNode->SetCData(XFA_ATTRIBUTE_Href, wsHref); - return m_pNode->SetAttribute(XFA_ATTRIBUTE_Href, wsHref.AsStringView()); + return m_pNode->JSNode()->SetCData(XFA_ATTRIBUTE_Href, wsHref); + return m_pNode->JSNode()->SetAttribute(XFA_ATTRIBUTE_Href, + wsHref.AsStringView()); } bool CXFA_Image::SetTransferEncoding(int32_t iTransferEncoding) { if (m_bDefValue) { - return m_pNode->SetEnum(XFA_ATTRIBUTE_TransferEncoding, - (XFA_ATTRIBUTEENUM)iTransferEncoding); + return m_pNode->JSNode()->SetEnum(XFA_ATTRIBUTE_TransferEncoding, + (XFA_ATTRIBUTEENUM)iTransferEncoding); } return true; } -- cgit v1.2.3