Merge WebKit at r84325: Initial merge by git.

Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b

1 files changed, 4 insertions, 13 deletions

diff --git a/Source/WebCore/rendering/RenderDetailsMarker.h b/Source/WebCore/rendering/RenderDetailsMarker.h
index de8f60b..f53a0c3 100644
--- a/Source/WebCore/rendering/RenderDetailsMarker.h
+++ b/Source/WebCore/rendering/RenderDetailsMarker.h
@@ -21,38 +21,29 @@
 #ifndef RenderDetailsMarker_h
 #define RenderDetailsMarker_h
 
-#include "RenderBox.h"
+#include "RenderBlock.h"
 
 namespace WebCore {
 
 class RenderDetails;
 
-class RenderDetailsMarker : public RenderBox {
+class RenderDetailsMarker : public RenderBlock {
 public:
-    RenderDetailsMarker(RenderDetails*);
+    RenderDetailsMarker(Node*);
 
     enum Orientation { Up, Down, Left, Right };
 
     Orientation orientation() const;
 
-    virtual void computePreferredLogicalWidths();
-    virtual void destroy();
-
 private:
     virtual const char* renderName() const { return "RenderDetailsMarker"; }
     virtual bool isDetailsMarker() const { return true; }
     virtual void paint(PaintInfo&, int tx, int ty);
-    virtual void layout();
-    virtual int lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const;
-    virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const;
-
-    IntRect getRelativeMarkerRect() const;
 
     bool isOpen() const;
     Path getCanonicalPath() const;
     Path getPath(const IntPoint& origin) const;
-
-    RenderDetails* m_details;
+    RenderDetails* details() const;
 };
 
 inline RenderDetailsMarker* toRenderDetailsMarker(RenderObject* object)