Merge 73488

WebCore/rendering/RenderMeter.h

 /*
  * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 12 matching lines @@
 
 #if ENABLE(METER_TAG)
 #include "RenderBlock.h"
 #include "RenderIndicator.h"
 #include "RenderWidget.h"
 
 
 namespace WebCore {
 
 class HTMLMeterElement;
-class ShadowBlockElement;
+class MeterPartElement;
 
 class RenderMeter : public RenderIndicator {
 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();
-    virtual bool shouldHaveParts() const;
 
-    bool isHorizontal() const;
-    void updatePartsState();    
-    IntRect valuePartRect() const;
-    PseudoId valuePseudoId() const;
-    IntRect barPartRect() const;    
-    PseudoId barPseudoId() const;
+    bool shadowAttached() const { return m_horizontalBarPart; }
+    IntRect valuePartRect(EBoxOrient) const;
+    PseudoId valuePseudoId(EBoxOrient) const;
+    IntRect barPartRect() const;
+    PseudoId barPseudoId(EBoxOrient) const;
+    EBoxOrient orientation() const;
+
     double valueRatio() const;
+    bool shouldHaveParts() const;
+    PassRefPtr<MeterPartElement> createPart(PseudoId);
 
-    RefPtr<ShadowBlockElement> m_barPart;
-    RefPtr<ShadowBlockElement> m_valuePart;
+    RefPtr<MeterPartElement> m_horizontalBarPart;
+    RefPtr<MeterPartElement> m_horizontalValuePart;
+    RefPtr<MeterPartElement> m_verticalBarPart;
+    RefPtr<MeterPartElement> m_verticalValuePart;
 };
 
 inline RenderMeter* toRenderMeter(RenderObject* object)
 {
     ASSERT(!object || object->isMeter());
     return static_cast<RenderMeter*>(object);
 }
 
 // This will catch anyone doing an unnecessary cast.
 void toRenderMeter(const RenderMeter*);
 
 } // namespace WebCore
 
 #endif
 
 #endif // RenderMeter_h