Remove extra GraphicsContextStateSaver restore() call.

https://bugs.webkit.org/show_bug.cgi?id=72497

Patch by Philip Rogers <pdr@google.com> on 2011-11-16
Reviewed by Andreas Kling.

* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::CanvasRenderingContext2D::drawTextInternal):

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index ae4e623063782eabc9f900882748cb5635822a33..634a466cf53f472580e1d290b62c4f874121126a 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2011-11-16  Philip Rogers  <pdr@google.com>
+
+        Remove extra GraphicsContextStateSaver restore() call.
+        https://bugs.webkit.org/show_bug.cgi?id=72497
+
+        Reviewed by Andreas Kling.
+
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::drawTextInternal):
+
 2011-11-08  Robert Hogan  <robert@webkit.org>
 
         CSS 2.1 failure: border-collapse-offset-002.htm fails

diff --git a/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp b/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp
index 1207f696e87e185bc022f814ce779e4177904872..ed9c73ff1ddca31fd5d2aadc56d077ed94cc8c9a 100644 (file)
--- a/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp
+++ b/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp
@@ -2205,7 +2205,6 @@ void CanvasRenderingContext2D::drawTextInternal(const String& text, float x, flo
         // We draw when fontWidth is 0 so compositing operations (eg, a "copy" op) still work.
         c->scale(FloatSize((fontWidth > 0 ? (width / fontWidth) : 0), 1));
         c->drawBidiText(font, textRun, FloatPoint(0, 0));
-        stateSaver.restore();
     } else
         c->drawBidiText(font, textRun, location);