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

dglazkov at chromium.org dglazkov at chromium.org
Mon Feb 21 00:33:57 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit fd808cd91f9240ac9a1bf327dc29c8c409d4e8c3
Author: dglazkov at chromium.org <dglazkov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 1 22:14:53 2011 +0000

    2011-02-01  Dimitri Glazkov  <dglazkov at chromium.org>
    
            One more Chromium build fix after r77286.
    
            * platform/chromium/ScrollbarThemeChromiumMac.mm:
            (WebCore::ScrollbarThemeChromiumMac::paint): Changed to not use topLeft().
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77302 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 528cce3..46fe9fe 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2011-02-01  Dimitri Glazkov  <dglazkov at chromium.org>
+
+        One more Chromium build fix after r77286.
+
+        * platform/chromium/ScrollbarThemeChromiumMac.mm:
+        (WebCore::ScrollbarThemeChromiumMac::paint): Changed to not use topLeft().
+
 2011-02-01  Sam Weinig  <sam at webkit.org>
 
         Fix the build for Beth.
diff --git a/Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm b/Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm
index fe1a422..b0ba95d 100644
--- a/Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm
+++ b/Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm
@@ -450,11 +450,11 @@ bool ScrollbarThemeChromiumMac::paint(Scrollbar* scrollbar, GraphicsContext* con
               continue;
 
             // Calculate how far down (in pixels) the tick-mark should appear.
-            const int yPos = static_cast<int>((thumbArea.topLeft().y() + (thumbArea.height() * percent))) & ~1;
+            const int yPos = static_cast<int>((thumbArea.y() + (thumbArea.height() * percent))) & ~1;
 
             // Paint.
             const int indent = 2;
-            FloatRect tickRect(thumbArea.topLeft().x() + indent, yPos, thumbArea.width() - 2 * indent - 1, 2);
+            FloatRect tickRect(thumbArea.x() + indent, yPos, thumbArea.width() - 2 * indent - 1, 2);
             drawingContext->fillRect(tickRect);
             drawingContext->strokeRect(tickRect, 1);
         }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list