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/RenderMeter.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'WebCore/rendering/RenderMeter.cpp')

diff --git a/WebCore/rendering/RenderMeter.cpp b/WebCore/rendering/RenderMeter.cpp
index 1a99976..226d605 100644
--- a/WebCore/rendering/RenderMeter.cpp
+++ b/WebCore/rendering/RenderMeter.cpp
@@ -48,15 +48,15 @@ RenderMeter::~RenderMeter()
         m_barPart->detach();
 }
 
-void RenderMeter::calcWidth()
+void RenderMeter::computeLogicalWidth()
 {
-    RenderBox::calcWidth();
+    RenderBox::computeLogicalWidth();
     setWidth(theme()->meterSizeForBounds(this, frameRect()).width());
 }
 
-void RenderMeter::calcHeight()
+void RenderMeter::computeLogicalHeight()
 {
-    RenderBox::calcHeight();
+    RenderBox::computeLogicalHeight();
     setHeight(theme()->meterSizeForBounds(this, frameRect()).height());
 }
 
-- 
cgit v1.1