[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[brettw at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit cd03636b2032446fe2c41dfd5fcac76b20c472df
Author: brettw at chromium.org <brettw at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 14 00:32:59 2010 +0000

    2010-10-13  Brett Wilson  <brettw at chromium.org>
    
            Reviewed by Darin Fisher.
    
            Save and restore the GraphicsContext around setting the clip rect for
            drawing text.
            https://bugs.webkit.org/show_bug.cgi?id=47634
    
            * src/WebFontImpl.cpp:
            (WebKit::WebFontImpl::drawText):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69719 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index b074f4a..1efaf82 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-13  Brett Wilson  <brettw at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Save and restore the GraphicsContext around setting the clip rect for
+        drawing text.
+        https://bugs.webkit.org/show_bug.cgi?id=47634
+
+        * src/WebFontImpl.cpp:
+        (WebKit::WebFontImpl::drawText):
+
 2010-10-13  Kenneth Russell  <kbr at google.com>
 
         Reviewed by James Robinson.
diff --git a/WebKit/chromium/src/WebFontImpl.cpp b/WebKit/chromium/src/WebFontImpl.cpp
index 6fa5494..38d95d4 100644
--- a/WebKit/chromium/src/WebFontImpl.cpp
+++ b/WebKit/chromium/src/WebFontImpl.cpp
@@ -103,9 +103,11 @@ void WebFontImpl::drawText(WebCanvas* canvas, const WebTextRun& run, const WebFl
     notImplemented();
 #endif
 
+    gc.save();
     gc.setFillColor(color, DeviceColorSpace);
     gc.clip(WebCore::FloatRect(clip));
     m_font.drawText(&gc, run, leftBaseline, from, to);
+    gc.restore();
 }
 
 int WebFontImpl::calculateWidth(const WebTextRun& run) const

-- 
WebKit Debian packaging