[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 0be5c1cd3312f93ddcc7f7768fca69f227582a2b
Author: thakis at chromium.org <thakis at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 8 01:51:28 2010 +0000

    2010-10-07  Nico Weber  <thakis at chromium.org>
    
            Reviewed by James Robinson.
    
            [chromium] Make sure to update the current graphics context when calling out to AppKit.
            https://bugs.webkit.org/show_bug.cgi?id=47387
    
            This ports r57741 to ThemeChromiumMac. It also reverts r66975, which is
            now no longer necessary.
    
            Should be covered by existing tests. The checkbox at
            http://webkit.org/blog-files/3d-transforms/morphing-cubes.html should
            now show up correctly.
    
            * platform/chromium/ThemeChromiumMac.mm:
            (WebCore::paintCheckbox):
            (WebCore::paintRadio):
            Create current context.
            * platform/graphics/chromium/ContentLayerChromium.cpp:
            (WebCore::ContentLayerChromium::updateContents):
            Remove LocalCurrentContext, it's now no longer necessary.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69369 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cc2ecf3..2e8597d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,25 @@
+2010-10-07  Nico Weber  <thakis at chromium.org>
+
+        Reviewed by James Robinson.
+
+        [chromium] Make sure to update the current graphics context when calling out to AppKit.
+        https://bugs.webkit.org/show_bug.cgi?id=47387
+
+        This ports r57741 to ThemeChromiumMac. It also reverts r66975, which is
+        now no longer necessary.
+
+        Should be covered by existing tests. The checkbox at
+        http://webkit.org/blog-files/3d-transforms/morphing-cubes.html should
+        now show up correctly.
+
+        * platform/chromium/ThemeChromiumMac.mm:
+        (WebCore::paintCheckbox):
+        (WebCore::paintRadio):
+        Create current context.
+        * platform/graphics/chromium/ContentLayerChromium.cpp:
+        (WebCore::ContentLayerChromium::updateContents):
+        Remove LocalCurrentContext, it's now no longer necessary.
+
 2010-10-07  Cris Neckar  <cdn at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/platform/chromium/ThemeChromiumMac.mm b/WebCore/platform/chromium/ThemeChromiumMac.mm
index 68fd7b7..5e457f3 100644
--- a/WebCore/platform/chromium/ThemeChromiumMac.mm
+++ b/WebCore/platform/chromium/ThemeChromiumMac.mm
@@ -376,6 +376,7 @@ static void paintCheckbox(ControlStates states, GraphicsContext* context, const
 
     // Determine the width and height needed for the control and prepare the cell for painting.
     NSButtonCell *checkboxCell = checkbox(states, zoomedRect, zoomFactor);
+    LocalCurrentGraphicsContext localContext(context);
 
     context->save();
 
@@ -456,6 +457,7 @@ static void paintRadio(ControlStates states, GraphicsContext* context, const Int
 {
     // Determine the width and height needed for the control and prepare the cell for painting.
     NSButtonCell *radioCell = radio(states, zoomedRect, zoomFactor);
+    LocalCurrentGraphicsContext localContext(context);
 
     context->save();
 
diff --git a/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp b/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp
index 20a2d70..5d1daec 100644
--- a/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp
+++ b/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp
@@ -43,8 +43,6 @@
 #include "PlatformContextSkia.h"
 #include "skia/ext/platform_canvas.h"
 #elif PLATFORM(CG)
-#include "LocalCurrentGraphicsContext.h"
-
 #include <CoreGraphics/CGBitmapContext.h>
 #endif
 
@@ -221,7 +219,6 @@ void ContentLayerChromium::updateContents()
     CGContextScaleCTM(contextCG.get(), 1, -1);
 
     GraphicsContext graphicsContext(contextCG.get());
-    LocalCurrentGraphicsContext scopedNSGraphicsContext(&graphicsContext);
 
     // Translate the graphics context into the coordinate system of the dirty rect.
     graphicsContext.translate(-dirtyRect.x(), -dirtyRect.y());

-- 
WebKit Debian packaging