1 files changed, 3 insertions, 17 deletions
diff --git a/src/mbgl/text/bidi.hpp b/src/mbgl/text/bidi.hpp
index 6c209c427c..73bb556a00 100644
--- a/src/mbgl/text/bidi.hpp
+++ b/src/mbgl/text/bidi.hpp
@@ -14,30 +14,16 @@ class BiDiImpl;
 
 std::u16string applyArabicShaping(const std::u16string&);
 
-class ProcessedBiDiText {
-public:
-    ProcessedBiDiText(BiDi&);
-
-    std::vector<std::u16string> applyLineBreaking(std::set<int32_t>);
-
-private:
-    void mergeParagraphLineBreaks(std::set<int32_t>&);
-
-    BiDi& bidi;
-};
-
 class BiDi : private util::noncopyable {
 public:
     BiDi();
     ~BiDi();
 
-    // Calling processText resets internal state, invalidating any existing ProcessedBiDiText
-    // objects
-    ProcessedBiDiText processText(const std::u16string&);
-
-    friend class ProcessedBiDiText;
+    std::vector<std::u16string> processText(const std::u16string&, std::set<int32_t>);
 
 private:
+    void mergeParagraphLineBreaks(std::set<int32_t>&);
+    std::vector<std::u16string> applyLineBreaking(std::set<int32_t>);
     std::u16string getLine(int32_t start, int32_t end);
 
     std::unique_ptr<BiDiImpl> impl;