Merge WebKit at r84325: Initial merge by git.

Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b

1 files changed, 5 insertions, 21 deletions

diff --git a/Source/WebCore/rendering/RenderMeter.h b/Source/WebCore/rendering/RenderMeter.h
index 2f5f5f5..12ab6ba 100644
--- a/Source/WebCore/rendering/RenderMeter.h
+++ b/Source/WebCore/rendering/RenderMeter.h
@@ -23,44 +23,28 @@
 
 #if ENABLE(METER_TAG)
 #include "RenderBlock.h"
-#include "RenderIndicator.h"
 #include "RenderWidget.h"
 
 
 namespace WebCore {
 
 class HTMLMeterElement;
-class MeterPartElement;
 
-class RenderMeter : public RenderIndicator {
+class RenderMeter : public RenderBlock {
 public:
     RenderMeter(HTMLMeterElement*);
     virtual ~RenderMeter();
 
 private:
-    virtual const char* renderName() const { return "RenderMeter"; }
-    virtual bool isMeter() const { return true; }
-    virtual void updateFromElement();
     virtual void computeLogicalWidth();
     virtual void computeLogicalHeight();
 
-    virtual void layoutParts();
-
-    bool shadowAttached() const { return m_horizontalBarPart; }
-    IntRect valuePartRect(EBoxOrient) const;
-    PseudoId valuePseudoId(EBoxOrient) const;
-    IntRect barPartRect() const;
-    PseudoId barPseudoId(EBoxOrient) const;
-    EBoxOrient orientation() const;
+    virtual const char* renderName() const { return "RenderMeter"; }
+    virtual bool isMeter() const { return true; }
+    virtual bool requiresForcedStyleRecalcPropagation() const { return true; }
+    virtual bool canHaveChildren() const { return false; }
 
     double valueRatio() const;
-    bool shouldHaveParts() const;
-    PassRefPtr<MeterPartElement> createPart(PseudoId);
-
-    RefPtr<MeterPartElement> m_horizontalBarPart;
-    RefPtr<MeterPartElement> m_horizontalValuePart;
-    RefPtr<MeterPartElement> m_verticalBarPart;
-    RefPtr<MeterPartElement> m_verticalValuePart;
 };
 
 inline RenderMeter* toRenderMeter(RenderObject* object)