Merge WebKit at r84325: Initial merge by git.

Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b

1 files changed, 3 insertions, 22 deletions

diff --git a/Source/WebCore/rendering/RenderDetails.h b/Source/WebCore/rendering/RenderDetails.h
index 0b56c13..974c174 100644
--- a/Source/WebCore/rendering/RenderDetails.h
+++ b/Source/WebCore/rendering/RenderDetails.h
@@ -27,21 +27,17 @@
 
 namespace WebCore {
 
-class RenderDetailsMarker;
-
 class RenderDetails : public RenderBlock {
 public:
     explicit RenderDetails(Node*);
 
-    virtual const char* renderName() const { return "RenderDetails"; }
-    virtual bool isDetails() const { return true; }
-
     bool isOpen() const;
-    IntRect interactiveArea() const { return m_interactiveArea; }
-    void markerDestroyed();
     void summaryDestroyed(RenderObject*);
 
 private:
+    virtual const char* renderName() const { return "RenderDetails"; }
+    virtual bool isDetails() const { return true; }
+
     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
 
     virtual void addChild(RenderObject* newChild, RenderObject *beforeChild = 0);
@@ -52,33 +48,18 @@ private:
     virtual bool requiresForcedStyleRecalcPropagation() const { return true; }
 
     virtual void layout();
-    virtual void destroy();
 
-    void createDefaultSummary();
     void replaceMainSummary(RenderObject*);
     void moveSummaryToContents();
     void checkMainSummary();
     RenderObject* getRenderPosition(RenderObject*);
-    PassRefPtr<RenderStyle> createSummaryStyle();
-    void setMarkerStyle();
 
     RenderBlock* summaryBlock();
     RenderBlock* contentBlock();
 
-    RenderObject* getParentOfFirstLineBox(RenderBlock* curr);
-    RenderObject* firstNonMarkerChild(RenderObject* parent);
-    void updateMarkerLocation();
-
     RenderBlock* m_summaryBlock;
     RenderBlock* m_contentBlock;
 
-    RenderObject* m_defaultSummaryBlock;
-    RenderObject* m_defaultSummaryText;
-
-    IntRect m_interactiveArea;
-
-    RenderDetailsMarker* m_marker;
-
     RenderObject* m_mainSummary;
 };