diff options
| author | Ben Murdoch <benm@google.com> | 2010-06-15 19:36:43 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-06-16 14:52:28 +0100 |
| commit | 545e470e52f0ac6a3a072bf559c796b42c6066b6 (patch) | |
| tree | c0c14763654d84d37577dde512c3d3b4699a9e86 /WebCore/rendering/RenderMeter.cpp | |
| parent | 719298a66237d38ea5c05f1547123ad8aacbc237 (diff) | |
| download | external_webkit-545e470e52f0ac6a3a072bf559c796b42c6066b6.zip external_webkit-545e470e52f0ac6a3a072bf559c796b42c6066b6.tar.gz external_webkit-545e470e52f0ac6a3a072bf559c796b42c6066b6.tar.bz2 | |
Merge webkit.org at r61121: Initial merge by git.
Change-Id: Icd6db395c62285be384d137164d95d7466c98760
Diffstat (limited to 'WebCore/rendering/RenderMeter.cpp')
| -rw-r--r-- | WebCore/rendering/RenderMeter.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
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 |