From 545e470e52f0ac6a3a072bf559c796b42c6066b6 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Tue, 15 Jun 2010 19:36:43 +0100
Subject: Merge webkit.org at r61121: Initial merge by git.

Change-Id: Icd6db395c62285be384d137164d95d7466c98760
---
 WebCore/rendering/RenderMeter.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

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

diff --git a/WebCore/rendering/RenderMeter.cpp b/WebCore/rendering/RenderMeter.cpp
index 9dc6a26..d443ceb 100644
--- a/WebCore/rendering/RenderMeter.cpp
+++ b/WebCore/rendering/RenderMeter.cpp
@@ -19,11 +19,13 @@
  */
 
 #include "config.h"
+
 #if ENABLE(METER_TAG)
 
 #include "RenderMeter.h"
 
 #include "HTMLMeterElement.h"
+#include "HTMLNames.h"
 #include "RenderTheme.h"
 
 using namespace std;
@@ -37,6 +39,18 @@ RenderMeter::RenderMeter(HTMLMeterElement* element)
 {
 }
 
+void RenderMeter::calcWidth()
+{
+    RenderBox::calcWidth();
+    setWidth(theme()->meterSizeForBounds(this, frameRect()).width());
+}
+
+void RenderMeter::calcHeight()
+{
+    RenderBox::calcHeight();
+    setHeight(theme()->meterSizeForBounds(this, frameRect()).height());
+}
+
 void RenderMeter::layout()
 {
     ASSERT(needsLayout());
@@ -59,4 +73,5 @@ void RenderMeter::updateFromElement()
 }
 
 } // namespace WebCore
+
 #endif
-- 
cgit v1.1