Fix a regression from the TextRun landing. Delete the characters in
authorhyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 11 May 2006 22:31:55 +0000 (22:31 +0000)
committerhyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 11 May 2006 22:31:55 +0000 (22:31 +0000)
        the adjustedRun, not the ones in the original run!

        Reviewed by beth

        * platform/mac/FontMac.mm:
        (WebCore::Font::drawComplexText):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@14311 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/platform/mac/FontMac.mm

index ec72cc8fa6af2f7250c2e7c2be1050bdd420f71c..12bde8f204be70d92dd154296fd6471d3601864c 100644 (file)
@@ -1,3 +1,13 @@
+2006-05-11  David Hyatt  <hyatt@apple.com>
+
+        Fix a regression from the TextRun landing.  Delete the characters in
+        the adjustedRun, not the ones in the original run!
+
+        Reviewed by beth
+
+        * platform/mac/FontMac.mm:
+        (WebCore::Font::drawComplexText):
+
 2006-05-10  Justin Garcia  <justin.garcia@apple.com>
 
         Reviewed by thatcher, levi
 2006-05-10  Justin Garcia  <justin.garcia@apple.com>
 
         Reviewed by thatcher, levi
index cdcb51cbf4a9e1631d846b3174fef1482d459ce0..b063f2835b2eae4744374c20e8a5a068432d0804 100644 (file)
@@ -506,7 +506,6 @@ void Font::drawComplexText(GraphicsContext* graphicsContext, const TextRun& run,
 {
     OSStatus status;
     
 {
     OSStatus status;
     
-    const UChar* characters = run.characters();
     int runLength = run.length();
 
     TextRun adjustedRun = visuallyOrdered ? addDirectionalOverride(run, d == RTL) : run;
     int runLength = run.length();
 
     TextRun adjustedRun = visuallyOrdered ? addDirectionalOverride(run, d == RTL) : run;
@@ -542,7 +541,7 @@ void Font::drawComplexText(GraphicsContext* graphicsContext, const TextRun& run,
     disposeATSULayoutParameters(&params);
     
     if (visuallyOrdered)
     disposeATSULayoutParameters(&params);
     
     if (visuallyOrdered)
-        delete []characters;
+        delete []adjustedRun.characters();
 }
 
 void Font::drawLineForText(GraphicsContext* context, const IntPoint& point, int yOffset, int width) const
 }
 
 void Font::drawLineForText(GraphicsContext* context, const IntPoint& point, int yOffset, int width) const