Continuation of DWriteForwarder replacement

Based on foundation layed in the dotnet#6260
kant2002 · Jul 5, 2022 · 451afd8 · 451afd8
1 parent 2dd5601
commit 451afd8
Show file tree

Hide file tree

Showing 42 changed files with 2,535 additions and 2,339 deletions.
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/Factory.h b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/Factory.h
@@ -9,10 +9,16 @@
 #include "FactoryType.h"
 #include "FontFile.h"
 #include "FontFace.h"
-#include "FontCollection.h"
 #include "DWriteTypeConverter.h"
 #include "FontFileLoader.h"
-#include "TextAnalyzer.h"
+#include "TextItemizer.h"
+#include "DWriteFontFeature.h"
+#include "GlyphOffset.h"
+#include "ItemSpan.h"
+#include "ItemProps.h"
+#include "IClassification.h"
+#include "NativePointerWrapper.h"
+#include "CharAttribute.h"
 #include "NativePointerWrapper.h"
 
 using namespace MS::Internal::Text::TextInterface::Generics;

diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/Font.cpp b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/Font.cpp