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

[zimmermann at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 7436a2cac26b056da52fe7cdb4f0983efdfd2928
Author: zimmermann at webkit.org <zimmermann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 22 14:18:55 2011 +0000

    2011-01-22  Nikolas Zimmermann  <nzimmermann at rim.com>
    
            Not reviewed. Fix WinCE build.
    
            * platform/graphics/wince/GraphicsContextWinCE.cpp:
            (WebCore::GraphicsContext::drawText):
            * rendering/RenderThemeWinCE.cpp:
            (WebCore::RenderThemeWinCE::adjustMenuListButtonStyle):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76447 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 2b04b8d..90884ac 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,5 +1,14 @@
 2011-01-22  Nikolas Zimmermann  <nzimmermann at rim.com>
 
+        Not reviewed. Fix WinCE build.
+
+        * platform/graphics/wince/GraphicsContextWinCE.cpp:
+        (WebCore::GraphicsContext::drawText):
+        * rendering/RenderThemeWinCE.cpp:
+        (WebCore::RenderThemeWinCE::adjustMenuListButtonStyle):
+
+2011-01-22  Nikolas Zimmermann  <nzimmermann at rim.com>
+
         Reviewed by Dirk Schulze.
 
         REGRESSION: Vertical line metrics incorrect
diff --git a/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp b/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp
index 779633f..9e81a15 100644
--- a/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp
+++ b/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp
@@ -1536,7 +1536,7 @@ void GraphicsContext::drawText(const Font& font, const TextRun& run, const IntPo
     float oldOpacity = m_data->m_opacity;
     m_data->m_opacity *= fillColor().alpha() / 255.0;
 
-    FloatRect textRect = font.selectionRectForText(run, point, font.height(), from, to);
+    FloatRect textRect = font.selectionRectForText(run, point, font.fontMetrics().height(), from, to);
     textRect.setY(textRect.y() - font.fontMetrics().ascent());
     IntRect trRect = enclosingIntRect(m_data->mapRect(textRect));
     RECT bmpRect;
diff --git a/Source/WebCore/rendering/RenderThemeWinCE.cpp b/Source/WebCore/rendering/RenderThemeWinCE.cpp
index d4bff96..a677fcf 100644
--- a/Source/WebCore/rendering/RenderThemeWinCE.cpp
+++ b/Source/WebCore/rendering/RenderThemeWinCE.cpp
@@ -452,7 +452,7 @@ void RenderThemeWinCE::adjustMenuListButtonStyle(CSSStyleSelector* selector, Ren
     style->setHeight(Length(Auto));
 
     // Calculate our min-height
-    int minHeight = style->font().height();
+    int minHeight = style->fontMetrics().height();
     minHeight = max(minHeight, dropDownBoxMinHeight);
 
     style->setMinHeight(Length(minHeight, Fixed));

-- 
WebKit Debian packaging