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

simon.fraser at apple.com simon.fraser at apple.com
Wed Dec 22 14:24:04 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit f1b98c0f8438d2a748df7c43e154725470395a48
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 7 21:06:17 2010 +0000

    2010-10-07  Simon Fraser  <simon.fraser at apple.com>
    
            Reviewed by Beth Dakin.
    
            Use isIdentityOrTranslationOrFlipped() in scrollbar code
            https://bugs.webkit.org/show_bug.cgi?id=47378
    
            Replace old code that looked at values in the CGAffineTransform
            with nicely named method that does the same test.
    
            * platform/mac/ScrollbarThemeMac.mm:
            (WebCore::ScrollbarThemeMac::paint):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69338 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 89b86a6..1a67f1e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -18,6 +18,19 @@
 
         Reviewed by Beth Dakin.
 
+        Use isIdentityOrTranslationOrFlipped() in scrollbar code
+        https://bugs.webkit.org/show_bug.cgi?id=47378
+
+        Replace old code that looked at values in the CGAffineTransform
+        with nicely named method that does the same test.
+
+        * platform/mac/ScrollbarThemeMac.mm:
+        (WebCore::ScrollbarThemeMac::paint):
+
+2010-10-07  Simon Fraser  <simon.fraser at apple.com>
+
+        Reviewed by Beth Dakin.
+
         Edge fringe artifact with transformed, masked elements (including reflections)
         https://bugs.webkit.org/show_bug.cgi?id=19179
         
diff --git a/WebCore/platform/mac/ScrollbarThemeMac.mm b/WebCore/platform/mac/ScrollbarThemeMac.mm
index bfa584a..d3dc280 100644
--- a/WebCore/platform/mac/ScrollbarThemeMac.mm
+++ b/WebCore/platform/mac/ScrollbarThemeMac.mm
@@ -378,10 +378,9 @@ bool ScrollbarThemeMac::paint(Scrollbar* scrollbar, GraphicsContext* context, co
         trackInfo.enableState = kThemeTrackNothingToScroll;
     trackInfo.trackInfo.scrollbar.pressState = scrollbarPartToHIPressedState(scrollbar->pressedPart());
     
-    CGAffineTransform currentCTM = CGContextGetCTM(context->platformContext());
-    
     // The Aqua scrollbar is buggy when rotated and scaled.  We will just draw into a bitmap if we detect a scale or rotation.
-    bool canDrawDirectly = currentCTM.a == 1.0f && currentCTM.b == 0.0f && currentCTM.c == 0.0f && (currentCTM.d == 1.0f || currentCTM.d == -1.0f);
+    const AffineTransform& currentCTM = context->getCTM();
+    bool canDrawDirectly = currentCTM.isIdentityOrTranslationOrFlipped();
     if (canDrawDirectly)
         HIThemeDrawTrack(&trackInfo, 0, context->platformContext(), kHIThemeOrientationNormal);
     else {

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list