summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/fpdfapi/page/cpdf_clippath.h4
-rw-r--r--core/fpdfapi/page/cpdf_colorstate.h4
-rw-r--r--core/fpdfapi/page/cpdf_contentmark.h4
-rw-r--r--core/fpdfapi/page/cpdf_generalstate.h4
-rw-r--r--core/fpdfapi/page/cpdf_path.h4
-rw-r--r--core/fpdfapi/page/cpdf_textstate.h4
-rw-r--r--core/fxcrt/shared_copy_on_write.h (renamed from core/fxcrt/cfx_shared_copy_on_write.h)26
-rw-r--r--core/fxcrt/shared_copy_on_write_unittest.cpp (renamed from core/fxcrt/cfx_shared_copy_on_write_unittest.cpp)30
-rw-r--r--core/fxge/cfx_graphstate.h4
9 files changed, 45 insertions, 39 deletions
diff --git a/core/fpdfapi/page/cpdf_clippath.h b/core/fpdfapi/page/cpdf_clippath.h
index 0105270b35..740342f14b 100644
--- a/core/fpdfapi/page/cpdf_clippath.h
+++ b/core/fpdfapi/page/cpdf_clippath.h
@@ -12,8 +12,8 @@
#include <vector>
#include "core/fpdfapi/page/cpdf_path.h"
-#include "core/fxcrt/cfx_shared_copy_on_write.h"
#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/shared_copy_on_write.h"
class CPDF_Path;
class CPDF_TextObject;
@@ -56,7 +56,7 @@ class CPDF_ClipPath {
std::vector<std::unique_ptr<CPDF_TextObject>> m_TextList;
};
- CFX_SharedCopyOnWrite<PathData> m_Ref;
+ SharedCopyOnWrite<PathData> m_Ref;
};
#endif // CORE_FPDFAPI_PAGE_CPDF_CLIPPATH_H_
diff --git a/core/fpdfapi/page/cpdf_colorstate.h b/core/fpdfapi/page/cpdf_colorstate.h
index cf63d24ea3..36a2c2d260 100644
--- a/core/fpdfapi/page/cpdf_colorstate.h
+++ b/core/fpdfapi/page/cpdf_colorstate.h
@@ -8,8 +8,8 @@
#define CORE_FPDFAPI_PAGE_CPDF_COLORSTATE_H_
#include "core/fpdfapi/page/cpdf_color.h"
-#include "core/fxcrt/cfx_shared_copy_on_write.h"
#include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/shared_copy_on_write.h"
class CPDF_Color;
class CPDF_ColorSpace;
@@ -66,7 +66,7 @@ class CPDF_ColorState {
float* pValue,
uint32_t nValues);
- CFX_SharedCopyOnWrite<ColorData> m_Ref;
+ SharedCopyOnWrite<ColorData> m_Ref;
};
#endif // CORE_FPDFAPI_PAGE_CPDF_COLORSTATE_H_
diff --git a/core/fpdfapi/page/cpdf_contentmark.h b/core/fpdfapi/page/cpdf_contentmark.h
index 1b2fe79e3c..f702859065 100644
--- a/core/fpdfapi/page/cpdf_contentmark.h
+++ b/core/fpdfapi/page/cpdf_contentmark.h
@@ -10,8 +10,8 @@
#include <vector>
#include "core/fpdfapi/page/cpdf_contentmarkitem.h"
-#include "core/fxcrt/cfx_shared_copy_on_write.h"
#include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/shared_copy_on_write.h"
class CPDF_Dictionary;
@@ -55,7 +55,7 @@ class CPDF_ContentMark {
std::vector<CPDF_ContentMarkItem> m_Marks;
};
- CFX_SharedCopyOnWrite<MarkData> m_Ref;
+ SharedCopyOnWrite<MarkData> m_Ref;
};
#endif // CORE_FPDFAPI_PAGE_CPDF_CONTENTMARK_H_
diff --git a/core/fpdfapi/page/cpdf_generalstate.h b/core/fpdfapi/page/cpdf_generalstate.h
index a55f1a7b33..8721a45268 100644
--- a/core/fpdfapi/page/cpdf_generalstate.h
+++ b/core/fpdfapi/page/cpdf_generalstate.h
@@ -7,10 +7,10 @@
#ifndef CORE_FPDFAPI_PAGE_CPDF_GENERALSTATE_H_
#define CORE_FPDFAPI_PAGE_CPDF_GENERALSTATE_H_
-#include "core/fxcrt/cfx_shared_copy_on_write.h"
#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_coordinates.h"
#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/shared_copy_on_write.h"
#include "core/fxge/fx_dib.h"
class CPDF_Object;
@@ -106,7 +106,7 @@ class CPDF_GeneralState {
float m_Smoothness;
};
- CFX_SharedCopyOnWrite<StateData> m_Ref;
+ SharedCopyOnWrite<StateData> m_Ref;
};
#endif // CORE_FPDFAPI_PAGE_CPDF_GENERALSTATE_H_
diff --git a/core/fpdfapi/page/cpdf_path.h b/core/fpdfapi/page/cpdf_path.h
index f604abdfe2..613d715b03 100644
--- a/core/fpdfapi/page/cpdf_path.h
+++ b/core/fpdfapi/page/cpdf_path.h
@@ -9,8 +9,8 @@
#include <vector>
-#include "core/fxcrt/cfx_shared_copy_on_write.h"
#include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/shared_copy_on_write.h"
#include "core/fxge/cfx_defaultrenderdevice.h"
#include "core/fxge/cfx_pathdata.h"
#include "core/fxge/cfx_renderdevice.h"
@@ -43,7 +43,7 @@ class CPDF_Path {
const CFX_PathData* GetObject() const { return m_Ref.GetObject(); }
private:
- CFX_SharedCopyOnWrite<CFX_PathData> m_Ref;
+ SharedCopyOnWrite<CFX_PathData> m_Ref;
};
#endif // CORE_FPDFAPI_PAGE_CPDF_PATH_H_
diff --git a/core/fpdfapi/page/cpdf_textstate.h b/core/fpdfapi/page/cpdf_textstate.h
index e7239e1f91..1e9ea04e6a 100644
--- a/core/fpdfapi/page/cpdf_textstate.h
+++ b/core/fpdfapi/page/cpdf_textstate.h
@@ -7,8 +7,8 @@
#ifndef CORE_FPDFAPI_PAGE_CPDF_TEXTSTATE_H_
#define CORE_FPDFAPI_PAGE_CPDF_TEXTSTATE_H_
-#include "core/fxcrt/cfx_shared_copy_on_write.h"
#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/shared_copy_on_write.h"
class CPDF_Document;
class CPDF_Font;
@@ -84,7 +84,7 @@ class CPDF_TextState {
void ReleaseFont();
};
- CFX_SharedCopyOnWrite<TextData> m_Ref;
+ SharedCopyOnWrite<TextData> m_Ref;
};
bool SetTextRenderingModeFromInt(int iMode, TextRenderingMode* mode);
diff --git a/core/fxcrt/cfx_shared_copy_on_write.h b/core/fxcrt/shared_copy_on_write.h
index f897368813..c04730d5e0 100644
--- a/core/fxcrt/cfx_shared_copy_on_write.h
+++ b/core/fxcrt/shared_copy_on_write.h
@@ -4,21 +4,23 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXCRT_CFX_SHARED_COPY_ON_WRITE_H_
-#define CORE_FXCRT_CFX_SHARED_COPY_ON_WRITE_H_
+#ifndef CORE_FXCRT_SHARED_COPY_ON_WRITE_H_
+#define CORE_FXCRT_SHARED_COPY_ON_WRITE_H_
#include "core/fxcrt/fx_system.h"
#include "core/fxcrt/retain_ptr.h"
+namespace fxcrt {
+
// A shared object with Copy on Write semantics that makes it appear as
// if each one were independent.
template <class ObjClass>
-class CFX_SharedCopyOnWrite {
+class SharedCopyOnWrite {
public:
- CFX_SharedCopyOnWrite() {}
- CFX_SharedCopyOnWrite(const CFX_SharedCopyOnWrite& other)
+ SharedCopyOnWrite() {}
+ SharedCopyOnWrite(const SharedCopyOnWrite& other)
: m_pObject(other.m_pObject) {}
- ~CFX_SharedCopyOnWrite() {}
+ ~SharedCopyOnWrite() {}
template <typename... Args>
ObjClass* Emplace(Args... params) {
@@ -26,7 +28,7 @@ class CFX_SharedCopyOnWrite {
return m_pObject.Get();
}
- CFX_SharedCopyOnWrite& operator=(const CFX_SharedCopyOnWrite& that) {
+ SharedCopyOnWrite& operator=(const SharedCopyOnWrite& that) {
if (*this != that)
m_pObject = that.m_pObject;
return *this;
@@ -44,10 +46,10 @@ class CFX_SharedCopyOnWrite {
return m_pObject.Get();
}
- bool operator==(const CFX_SharedCopyOnWrite& that) const {
+ bool operator==(const SharedCopyOnWrite& that) const {
return m_pObject == that.m_pObject;
}
- bool operator!=(const CFX_SharedCopyOnWrite& that) const {
+ bool operator!=(const SharedCopyOnWrite& that) const {
return !(*this == that);
}
explicit operator bool() const { return !!m_pObject; }
@@ -82,4 +84,8 @@ class CFX_SharedCopyOnWrite {
RetainPtr<CountedObj> m_pObject;
};
-#endif // CORE_FXCRT_CFX_SHARED_COPY_ON_WRITE_H_
+} // namespace fxcrt
+
+using fxcrt::SharedCopyOnWrite;
+
+#endif // CORE_FXCRT_SHARED_COPY_ON_WRITE_H_
diff --git a/core/fxcrt/cfx_shared_copy_on_write_unittest.cpp b/core/fxcrt/shared_copy_on_write_unittest.cpp
index 797837465b..a683767054 100644
--- a/core/fxcrt/cfx_shared_copy_on_write_unittest.cpp
+++ b/core/fxcrt/shared_copy_on_write_unittest.cpp
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "core/fxcrt/cfx_shared_copy_on_write.h"
+#include "core/fxcrt/shared_copy_on_write.h"
#include <map>
#include <string>
@@ -45,26 +45,26 @@ class Object {
} // namespace
-TEST(fxcrt, SharedCopyOnWriteNull) {
+TEST(SharedCopyOnWrite, Null) {
Observer observer;
{
- CFX_SharedCopyOnWrite<Object> ptr;
+ SharedCopyOnWrite<Object> ptr;
EXPECT_EQ(nullptr, ptr.GetObject());
}
}
-TEST(fxcrt, SharedCopyOnWriteCopy) {
+TEST(SharedCopyOnWrite, Copy) {
Observer observer;
{
- CFX_SharedCopyOnWrite<Object> ptr1;
+ SharedCopyOnWrite<Object> ptr1;
ptr1.Emplace(&observer, std::string("one"));
{
- CFX_SharedCopyOnWrite<Object> ptr2 = ptr1;
+ SharedCopyOnWrite<Object> ptr2 = ptr1;
EXPECT_EQ(1, observer.GetConstructionCount("one"));
EXPECT_EQ(0, observer.GetDestructionCount("one"));
}
{
- CFX_SharedCopyOnWrite<Object> ptr3(ptr1);
+ SharedCopyOnWrite<Object> ptr3(ptr1);
EXPECT_EQ(1, observer.GetConstructionCount("one"));
EXPECT_EQ(0, observer.GetDestructionCount("one"));
}
@@ -74,10 +74,10 @@ TEST(fxcrt, SharedCopyOnWriteCopy) {
EXPECT_EQ(1, observer.GetDestructionCount("one"));
}
-TEST(fxcrt, SharedCopyOnWriteAssignOverOld) {
+TEST(SharedCopyOnWrite, AssignOverOld) {
Observer observer;
{
- CFX_SharedCopyOnWrite<Object> ptr1;
+ SharedCopyOnWrite<Object> ptr1;
ptr1.Emplace(&observer, std::string("one"));
ptr1.Emplace(&observer, std::string("two"));
EXPECT_EQ(1, observer.GetConstructionCount("one"));
@@ -88,12 +88,12 @@ TEST(fxcrt, SharedCopyOnWriteAssignOverOld) {
EXPECT_EQ(1, observer.GetDestructionCount("two"));
}
-TEST(fxcrt, SharedCopyOnWriteAssignOverRetained) {
+TEST(SharedCopyOnWrite, AssignOverRetained) {
Observer observer;
{
- CFX_SharedCopyOnWrite<Object> ptr1;
+ SharedCopyOnWrite<Object> ptr1;
ptr1.Emplace(&observer, std::string("one"));
- CFX_SharedCopyOnWrite<Object> ptr2(ptr1);
+ SharedCopyOnWrite<Object> ptr2(ptr1);
ptr1.Emplace(&observer, std::string("two"));
EXPECT_EQ(1, observer.GetConstructionCount("one"));
EXPECT_EQ(1, observer.GetConstructionCount("two"));
@@ -104,10 +104,10 @@ TEST(fxcrt, SharedCopyOnWriteAssignOverRetained) {
EXPECT_EQ(1, observer.GetDestructionCount("two"));
}
-TEST(fxcrt, SharedCopyOnWriteGetModify) {
+TEST(SharedCopyOnWrite, GetModify) {
Observer observer;
{
- CFX_SharedCopyOnWrite<Object> ptr;
+ SharedCopyOnWrite<Object> ptr;
EXPECT_NE(nullptr, ptr.GetPrivateCopy(&observer, std::string("one")));
EXPECT_EQ(1, observer.GetConstructionCount("one"));
EXPECT_EQ(0, observer.GetDestructionCount("one"));
@@ -116,7 +116,7 @@ TEST(fxcrt, SharedCopyOnWriteGetModify) {
EXPECT_EQ(1, observer.GetConstructionCount("one"));
EXPECT_EQ(0, observer.GetDestructionCount("one"));
{
- CFX_SharedCopyOnWrite<Object> other(ptr);
+ SharedCopyOnWrite<Object> other(ptr);
EXPECT_NE(nullptr, ptr.GetPrivateCopy(&observer, std::string("one")));
EXPECT_EQ(2, observer.GetConstructionCount("one"));
EXPECT_EQ(0, observer.GetDestructionCount("one"));
diff --git a/core/fxge/cfx_graphstate.h b/core/fxge/cfx_graphstate.h
index b023ce790d..bf4fccd47d 100644
--- a/core/fxge/cfx_graphstate.h
+++ b/core/fxge/cfx_graphstate.h
@@ -7,7 +7,7 @@
#ifndef CORE_FXGE_CFX_GRAPHSTATE_H_
#define CORE_FXGE_CFX_GRAPHSTATE_H_
-#include "core/fxcrt/cfx_shared_copy_on_write.h"
+#include "core/fxcrt/shared_copy_on_write.h"
#include "core/fxge/cfx_graphstatedata.h"
class CPDF_Array;
@@ -38,7 +38,7 @@ class CFX_GraphState {
const CFX_GraphStateData* GetObject() const { return m_Ref.GetObject(); }
private:
- CFX_SharedCopyOnWrite<CFX_GraphStateData> m_Ref;
+ SharedCopyOnWrite<CFX_GraphStateData> m_Ref;
};
#endif // CORE_FXGE_CFX_GRAPHSTATE_H_
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 09:14:16 +0000