From bec39347bb3bb5bf1187ccaf471d26247f28b585 Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Thu, 30 Sep 2010 15:42:16 +0100
Subject: Merge WebKit at r68651 : Initial merge by git.

Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
---
 WebCore/rendering/RenderSlider.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'WebCore/rendering/RenderSlider.h')

diff --git a/WebCore/rendering/RenderSlider.h b/WebCore/rendering/RenderSlider.h
index fc8ce24..d214e41 100644
--- a/WebCore/rendering/RenderSlider.h
+++ b/WebCore/rendering/RenderSlider.h
@@ -43,7 +43,7 @@ namespace WebCore {
         virtual bool isSlider() const { return true; }
 
         virtual int baselinePosition(bool, bool) const;
-        virtual void calcPrefWidths();
+        virtual void computePreferredLogicalWidths();
         virtual void layout();
         virtual void updateFromElement();
 
-- 
cgit v1.1