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

[mrobinson at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 1806e0e349fb249552e46f13d7d2308068aed594
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 30 06:22:06 2010 +0000

    Fix ChangeLog snafu caused by bad merge.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64336 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 12a0056..0b26493 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,48 @@
+2010-07-29  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Dirk Schulze.
+
+        [Cairo] Bring behavior of paths on the Cairo GraphicsContext into line with the CoreGraphics port
+        https://bugs.webkit.org/show_bug.cgi?id=41732
+
+        Do not apply paths added to the Cairo GraphicsContext, until they are used.
+        This prevents drawing routines such as fillRect from interacting with any
+        path which callers are constructing on the GraphicsContext.
+
+         This behavior is necessary to close bug https://bugs.webkit.org/show_bug.cgi?id=41308
+         so tests for that issue will test this fix.
+
+        * platform/graphics/cairo/GraphicsContextCairo.cpp:
+        (WebCore::appendPathToCairoContext): Added. A helper method which adds a path
+        to a native Cairo context.
+        (WebCore::setPathOnCairoContext): Added. Like appendPathToCairoContext, but clears the
+        existing path first.
+        (WebCore::appendWebCorePathToCairoContext): Added. Like appendPathToCairoContext, but
+        operates on a WebCore path.
+        (WebCore::fillCurrentCairoPath): Added. Helper which fills the current cairo context path.
+        (WebCore::strokeCurrentCairoPath): Added. Helper which strokes the current cairo context path.
+        (WebCore::GraphicsContext::drawEllipse): Only clear the Cairo path if cairo_stroke
+        was not called, because cairo_stroke implicitly clears the path.
+        (WebCore::GraphicsContext::drawConvexPolygon): Ditto.
+        (WebCore::GraphicsContext::fillPath): Copy the path from m_pendingPath to the context
+        and clear m_pendingPath, instead of relying on the pre-existing context path. Do the
+        actual fill via the new helper.
+        (WebCore::GraphicsContext::strokePath): Ditto.
+        (WebCore::GraphicsContext::drawPath): Ditto.
+        (WebCore::GraphicsContext::fillRect): Use the new fillCurrentCairoPath helper.
+        (WebCore::GraphicsContext::drawFocusRing): Use the new appendWebCorePathToCairoContext helper instead
+        of addPath (which will blow away any path callers are building).
+        (WebCore::GraphicsContext::addInnerRoundedRectClip): Use the new appendWebCorePathToCairoContext helper instead
+        of addPath (which will blow away any path callers are building).
+        (WebCore::GraphicsContext::strokeRect): Use the new strokeCurrentCairoPath helper.
+        (WebCore::GraphicsContext::beginPath): Clear out m_pendingPath here instead of the main native context.
+        (WebCore::GraphicsContext::addPath): Add the path to m_pendingPath instead of the main native context.
+        Also ensure that the transformation matrix of the m_pendingPath is equal to that of the main
+        cairo context.
+        (WebCore::GraphicsContext::clipOut): Use the appendWebCorePathToCairoContext helper here.
+        (WebCore::GraphicsContext::fillRoundedRect): Ditto and remove an unnecessary beginPath call.
+        * platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h: Add a new m_pendingPath member.
+
 2010-07-29  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r64313.
@@ -108,51 +153,6 @@
 
         Reviewed by Dirk Schulze.
 
-        [Cairo] Bring behavior of paths on the Cairo GraphicsContext into line with the CoreGraphics port
-        https://bugs.webkit.org/show_bug.cgi?id=41732
-
-        Do not apply paths added to the Cairo GraphicsContext, until they are used.
-        This prevents drawing routines such as fillRect from interacting with any
-        path which callers are constructing on the GraphicsContext.
-
-         This behavior is necessary to close bug https://bugs.webkit.org/show_bug.cgi?id=41308
-         so tests for that issue will test this fix.
-
-        * platform/graphics/cairo/GraphicsContextCairo.cpp:
-        (WebCore::appendPathToCairoContext): Added. A helper method which adds a path
-        to a native Cairo context.
-        (WebCore::setPathOnCairoContext): Added. Like appendPathToCairoContext, but clears the
-        existing path first.
-        (WebCore::appendWebCorePathToCairoContext): Added. Like appendPathToCairoContext, but
-        operates on a WebCore path.
-        (WebCore::fillCurrentCairoPath): Added. Helper which fills the current cairo context path.
-        (WebCore::strokeCurrentCairoPath): Added. Helper which strokes the current cairo context path.
-        (WebCore::GraphicsContext::drawEllipse): Only clear the Cairo path if cairo_stroke
-        was not called, because cairo_stroke implicitly clears the path.
-        (WebCore::GraphicsContext::drawConvexPolygon): Ditto.
-        (WebCore::GraphicsContext::fillPath): Copy the path from m_pendingPath to the context
-        and clear m_pendingPath, instead of relying on the pre-existing context path. Do the
-        actual fill via the new helper.
-        (WebCore::GraphicsContext::strokePath): Ditto.
-        (WebCore::GraphicsContext::drawPath): Ditto.
-        (WebCore::GraphicsContext::fillRect): Use the new fillCurrentCairoPath helper.
-        (WebCore::GraphicsContext::drawFocusRing): Use the new appendWebCorePathToCairoContext helper instead
-        of addPath (which will blow away any path callers are building).
-        (WebCore::GraphicsContext::addInnerRoundedRectClip): Use the new appendWebCorePathToCairoContext helper instead
-        of addPath (which will blow away any path callers are building).
-        (WebCore::GraphicsContext::strokeRect): Use the new strokeCurrentCairoPath helper.
-        (WebCore::GraphicsContext::beginPath): Clear out m_pendingPath here instead of the main native context.
-        (WebCore::GraphicsContext::addPath): Add the path to m_pendingPath instead of the main native context.
-        Also ensure that the transformation matrix of the m_pendingPath is equal to that of the main
-        cairo context.
-        (WebCore::GraphicsContext::clipOut): Use the appendWebCorePathToCairoContext helper here.
-        (WebCore::GraphicsContext::fillRoundedRect): Ditto and remove an unnecessary beginPath call.
-        * platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h: Add a new m_pendingPath member.
-
-2010-07-29  Martin Robinson  <mrobinson at igalia.com>
-
-        Reviewed by Dirk Schulze.
-
         [Cairo] Remove setStrokeStyle workaround for InlineTextBoxes
         https://bugs.webkit.org/show_bug.cgi?id=43136
 

-- 
WebKit Debian packaging