[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

senorblanco at chromium.org senorblanco at chromium.org
Sun Feb 20 23:19:19 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit e702497a733f9d220cdf529f627d0a1dfb8850ac
Author: senorblanco at chromium.org <senorblanco at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 19 22:28:39 2011 +0000

    2011-01-19  Stephen White  <senorblanco at chromium.org>
    
            Unreviewed; build fix for chromium.
    
            * platform/graphics/chromium/GLES2Canvas.cpp:
            (WebCore::GLES2Canvas::fillPath):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76164 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index dec7cce..6ee4a0c 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-19  Stephen White  <senorblanco at chromium.org>
+
+        Unreviewed; build fix for chromium.
+
+        * platform/graphics/chromium/GLES2Canvas.cpp:
+        (WebCore::GLES2Canvas::fillPath):
+
 2011-01-18  Stephen White  <senorblanco at chromium.org>
 
         Reviewed by James Robinson.
diff --git a/Source/WebCore/platform/graphics/chromium/GLES2Canvas.cpp b/Source/WebCore/platform/graphics/chromium/GLES2Canvas.cpp
index ce9aa78..27637e7 100644
--- a/Source/WebCore/platform/graphics/chromium/GLES2Canvas.cpp
+++ b/Source/WebCore/platform/graphics/chromium/GLES2Canvas.cpp
@@ -543,7 +543,7 @@ void GLES2Canvas::fillPath(const Path& path, const Color& color)
     checkGLError("bindBuffer");
 
     AffineTransform matrix(m_flipMatrix);
-    matrix.multLeft(m_state->m_ctm);
+    matrix *= m_state->m_ctm;
 
     m_context->useFillSolidProgram(matrix, color);
     checkGLError("useFillSolidProgram");

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list