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

[thakis at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit c66748c87f41d530555603e4b5846527b82086da
Author: thakis at chromium.org <thakis at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 16 00:56:14 2010 +0000

    2010-10-15  Nico Weber  <thakis at chromium.org>
    
            Reviewed by Eric Carlson.
    
            Make sure to update the current graphics context when calling out to AppKit.
            https://bugs.webkit.org/show_bug.cgi?id=47757
    
            Like r57741, but for the spellchecking highlight
    
            * platform/graphics/mac/GraphicsContextMac.mm:
            (WebCore::GraphicsContext::drawLineForTextChecking):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69901 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 89a0fd4..35845a9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-15  Nico Weber  <thakis at chromium.org>
+
+        Reviewed by Eric Carlson.
+
+        Make sure to update the current graphics context when calling out to AppKit.
+        https://bugs.webkit.org/show_bug.cgi?id=47757
+
+        Like r57741, but for the spellchecking highlight
+
+        * platform/graphics/mac/GraphicsContextMac.mm:
+        (WebCore::GraphicsContext::drawLineForTextChecking):
+
 2010-10-15  Brian Weinstein  <bweinstein at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebCore/platform/graphics/mac/GraphicsContextMac.mm b/WebCore/platform/graphics/mac/GraphicsContextMac.mm
index 2c4012e..dd765bf 100644
--- a/WebCore/platform/graphics/mac/GraphicsContextMac.mm
+++ b/WebCore/platform/graphics/mac/GraphicsContextMac.mm
@@ -30,6 +30,7 @@
 #import <AppKit/AppKit.h>
 #import <wtf/StdLibExtras.h>
 
+#import "LocalCurrentGraphicsContext.h"
 #import "WebCoreSystemInterface.h"
 
 @class NSColor;
@@ -178,6 +179,7 @@ void GraphicsContext::drawLineForTextChecking(const IntPoint& point, int width,
     // for transforms.
 
     // Draw underline.
+    LocalCurrentGraphicsContext localContext(this);
     NSGraphicsContext *currentContext = [NSGraphicsContext currentContext];
     CGContextRef context = (CGContextRef)[currentContext graphicsPort];
     CGContextSaveGState(context);

-- 
WebKit Debian packaging