[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[hamaji at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit fd28551872a5c58552cda33368d7c9d26519d8d0
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 28 06:15:09 2009 +0000

    2009-11-27  Shinichiro Hamaji  <hamaji at chromium.org>
    
            Unreviewed Chromium build fix introduced by r51428.
    
            [Chromium] Ignore line-height CSS property for PushButton
            https://bugs.webkit.org/show_bug.cgi?id=31712
    
            * rendering/RenderThemeChromiumSkia.cpp:
            (WebCore::RenderThemeChromiumSkia::adjustButtonStyle):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51455 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 39b6844..5e0b970 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,15 @@
 2009-11-27  Shinichiro Hamaji  <hamaji at chromium.org>
 
+        Unreviewed Chromium build fix introduced by r51428.
+
+        [Chromium] Ignore line-height CSS property for PushButton
+        https://bugs.webkit.org/show_bug.cgi?id=31712
+
+        * rendering/RenderThemeChromiumSkia.cpp:
+        (WebCore::RenderThemeChromiumSkia::adjustButtonStyle):
+
+2009-11-27  Shinichiro Hamaji  <hamaji at chromium.org>
+
         Unreviewed Chromium test fix by reverting r51413.
 
         [v8] Do not check the thread when accessing DOMDataStore
diff --git a/WebCore/rendering/RenderThemeChromiumSkia.cpp b/WebCore/rendering/RenderThemeChromiumSkia.cpp
index dcc280d..016a264 100644
--- a/WebCore/rendering/RenderThemeChromiumSkia.cpp
+++ b/WebCore/rendering/RenderThemeChromiumSkia.cpp
@@ -348,7 +348,7 @@ bool RenderThemeChromiumSkia::paintButton(RenderObject* o, const RenderObject::P
     return false;
 }
 
-void RenderThemeChromiumSkia::adjustButtonStyle(CSSStyleSelector*, RenderStyle* style, Element*) const;
+void RenderThemeChromiumSkia::adjustButtonStyle(CSSStyleSelector*, RenderStyle* style, Element*) const
 {
     if (style->appearance() == PushButtonPart) {
         // Ignore line-height.

-- 
WebKit Debian packaging