summaryrefslogtreecommitdiff
path: root/core/fpdfapi
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-09-21 16:19:19 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-09-21 20:29:29 +0000
commit9317f8f5336f989aade75ceb925391262b1ccdca (patch)
tree88f3a8f244f2d1c8f89906bb8e3ea84eb65ae5fd /core/fpdfapi
parent0b95042db2e6dab5876abd12ce485fff0a8e08fe (diff)
downloadpdfium-9317f8f5336f989aade75ceb925391262b1ccdca.tar.xz
Move CFX_SharedCopyOnWrite to SharedCopyOnWrite
This CL renames CFX_SharedCopyOnWrite to SharedCopyOnWrite and moves to the fxcrt namespace. Bug: pdfium:898 Change-Id: Iced796b9f341407720e2a88f11d1916df56fe68c Reviewed-on: https://pdfium-review.googlesource.com/14617 Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfapi')
-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
6 files changed, 12 insertions, 12 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);