Bug 1991689 - Cache a PropertyProvider in SVGTextFrame so that we don't have to create a fresh one for every call to the same textframe. r=firefox-svg-reviewers,longsonr

Differential Revision: https://phabricator.services.mozilla.com/D267440

UltraBlame original commit: c4911116c376f35cf2790bd69d861e1e418e9ab1

Author: marco-c

layout/generic/nsTextFrame.h

@@ -113,8 +113,11 @@ class nsTextFrame : public nsIFrame {
 
 
 
-  class MOZ_STACK_CLASS PropertyProvider final
-      : public gfxTextRun::PropertyProvider {
+
+
+
+
+  class PropertyProvider final : public gfxTextRun::PropertyProvider {
     using HyphenType = gfxTextRun::HyphenType;
 
    public:

layout/svg/SVGTextFrame.cpp

@@ -835,7 +835,6 @@ SVGBBox TextRenderedRun::GetRunUserSpaceRect(nsPresContext* aContext,
       vertical ? -self.y : -self.x);
 
   gfxSkipCharsIterator it = mFrame->EnsureTextRun(nsTextFrame::eInflated);
-  gfxSkipCharsIterator start = it;
   gfxTextRun* textRun = mFrame->GetTextRun(nsTextFrame::eInflated);
 
 
@@ -845,10 +844,7 @@ SVGBBox TextRenderedRun::GetRunUserSpaceRect(nsPresContext* aContext,
     return r;
   }
 
-  
-  
-  
-  nsTextFrame::PropertyProvider provider(mFrame, start);
+  auto& provider = mRoot->PropertyProviderFor(mFrame);
 
 
   gfxTextRun::Metrics metrics = textRun->MeasureText(
@@ -946,7 +942,7 @@ void TextRenderedRun::GetClipEdges(nscoord& aVisIStartEdge,
 
   gfxSkipCharsIterator it = mFrame->EnsureTextRun(nsTextFrame::eInflated);
   gfxTextRun* textRun = mFrame->GetTextRun(nsTextFrame::eInflated);
-  nsTextFrame::PropertyProvider provider(mFrame, it);
+  auto& provider = mRoot->PropertyProviderFor(mFrame);
 
 
 
@@ -1038,7 +1034,7 @@ void TextRenderedRun::GetClipEdges(nscoord& aVisIStartEdge,
 nscoord TextRenderedRun::GetAdvanceWidth() const {
   gfxSkipCharsIterator it = mFrame->EnsureTextRun(nsTextFrame::eInflated);
   gfxTextRun* textRun = mFrame->GetTextRun(nsTextFrame::eInflated);
-  nsTextFrame::PropertyProvider provider(mFrame, it);
+  auto& provider = mRoot->PropertyProviderFor(mFrame);
 
   Range range = ConvertOriginalToSkipped(it, mTextFrameContentOffset,
                                          mTextFrameContentLength);
@@ -1088,7 +1084,7 @@ int32_t TextRenderedRun::GetCharNumAtPosition(nsPresContext* aContext,
 
   gfxSkipCharsIterator it = mFrame->EnsureTextRun(nsTextFrame::eInflated);
   gfxTextRun* textRun = mFrame->GetTextRun(nsTextFrame::eInflated);
-  nsTextFrame::PropertyProvider provider(mFrame, it);
+  auto& provider = mRoot->PropertyProviderFor(mFrame);
 
 
 
@@ -1789,6 +1785,11 @@ class TextRenderedRunIterator {
 
 
 
+  ~TextRenderedRunIterator() { mFrameIterator.Root()->ForgetCachedProvider(); }
+
+  
+
+
   TextRenderedRun Current() const { return mCurrent; }
 
 
@@ -2018,6 +2019,11 @@ class MOZ_STACK_CLASS CharIterator {
 
 
 
+  ~CharIterator() { mFrameIterator.Root()->ForgetCachedProvider(); }
+
+  
+
+
   bool AtEnd() const { return !mFrameIterator.Current(); }
 
 
@@ -2374,10 +2380,7 @@ gfxFloat CharIterator::GetAdvance(nsPresContext* aContext) const {
   float cssPxPerDevPx =
       nsPresContext::AppUnitsToFloatCSSPixels(aContext->AppUnitsPerDevPixel());
 
-  gfxSkipCharsIterator start =
-      TextFrame()->EnsureTextRun(nsTextFrame::eInflated);
-  nsTextFrame::PropertyProvider provider(TextFrame(), start);
-
+  auto& provider = mFrameIterator.Root()->PropertyProviderFor(TextFrame());
   uint32_t offset = mSkipCharsIterator.GetSkippedOffset();
   gfxFloat advance =
       mTextRun->GetAdvanceWidth(Range(offset, offset + 1), &provider);
@@ -3733,7 +3736,7 @@ float SVGTextFrame::GetSubStringLengthFastPath(nsIContent* aContent,
 
       gfxSkipCharsIterator it = frame->EnsureTextRun(nsTextFrame::eInflated);
       gfxTextRun* textRun = frame->GetTextRun(nsTextFrame::eInflated);
-      nsTextFrame::PropertyProvider provider(frame, it);
+      auto& provider = PropertyProviderFor(frame);
 
       Range range = ConvertOriginalToSkipped(it, offset, trimmedLength);
 
@@ -3801,7 +3804,7 @@ float SVGTextFrame::GetSubStringLengthSlowFallback(nsIContent* aContent,
       gfxSkipCharsIterator it =
           run.mFrame->EnsureTextRun(nsTextFrame::eInflated);
       gfxTextRun* textRun = run.mFrame->GetTextRun(nsTextFrame::eInflated);
-      nsTextFrame::PropertyProvider provider(run.mFrame, it);
+      auto& provider = PropertyProviderFor(run.mFrame);
 
       Range range = ConvertOriginalToSkipped(it, offset, length);
 
@@ -4356,7 +4359,7 @@ void SVGTextFrame::DetermineCharPositions(nsTArray<nsPoint>& aPositions) {
   for (nsTextFrame* frame = frit.Current(); frame; frame = frit.Next()) {
     gfxSkipCharsIterator it = frame->EnsureTextRun(nsTextFrame::eInflated);
     gfxTextRun* textRun = frame->GetTextRun(nsTextFrame::eInflated);
-    nsTextFrame::PropertyProvider provider(frame, it);
+    auto& provider = PropertyProviderFor(frame);
 
 
     position = frit.Position();
@@ -4410,6 +4413,10 @@ void SVGTextFrame::DetermineCharPositions(nsTArray<nsPoint>& aPositions) {
   for (uint32_t i = 0; i < frit.UndisplayedCharacters(); i++) {
     aPositions.AppendElement(position);
   }
+
+  
+  
+  ForgetCachedProvider();
 }
 
 

layout/svg/SVGTextFrame.h

@@ -11,6 +11,7 @@
 #include "gfxRect.h"
 #include "gfxTextRun.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/Maybe.h"
 #include "mozilla/PresShellForwards.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/SVGContainerFrame.h"
@@ -610,9 +611,28 @@ class SVGTextFrame final : public SVGDisplayContainerFrame {
     return mCachedRanges[aWhichRange];
   }
 
+  
+  
+  
+  nsTextFrame::PropertyProvider& PropertyProviderFor(nsTextFrame* aFrame) {
+    if (!mCachedProvider || aFrame != mCachedProvider->GetFrame()) {
+      mCachedProvider.reset();
+      mCachedProvider.emplace(aFrame,
+                              aFrame->EnsureTextRun(nsTextFrame::eInflated));
+    }
+    return mCachedProvider.ref();
+  }
+
+  
+  
+  
+  void ForgetCachedProvider() { mCachedProvider.reset(); }
+
  private:
   const nsTextFrame* mFrameForCachedRanges = nullptr;
   CachedMeasuredRange mCachedRanges[CachedRangeCount];
+
+  Maybe<nsTextFrame::PropertyProvider> mCachedProvider;
 };
 
 }