Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / RenderListMarker.h

diff --git a/src/third_party/WebKit/Source/core/rendering/RenderListMarker.h b/src/third_party/WebKit/Source/core/rendering/RenderListMarker.h
index 0f80bc4..529d13d 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RenderListMarker.h
+++ b/src/third_party/WebKit/Source/core/rendering/RenderListMarker.h
@@ -38,15 +38,23 @@ public:
     static RenderListMarker* createAnonymous(RenderListItem*);
 
     virtual ~RenderListMarker();
+    virtual void destroy() OVERRIDE;
     virtual void trace(Visitor*) OVERRIDE;
 
     const String& text() const { return m_text; }
-    String suffix() const;
 
     bool isInside() const;
 
     void updateMarginsAndContent();
 
+    IntRect getRelativeMarkerRect();
+    LayoutRect localSelectionRect();
+    virtual bool isImage() const OVERRIDE;
+    const StyleImage* image() { return m_image.get(); }
+    const RenderListItem* listItem() { return m_listItem.get(); }
+
+    static UChar listMarkerSuffix(EListStyleType, int value);
+
 private:
     RenderListMarker(RenderListItem*);
 
@@ -66,11 +74,10 @@ private:
     virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE;
     virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE;
 
-    virtual bool isImage() const OVERRIDE;
     bool isText() const { return !isImage(); }
 
     virtual void setSelectionState(SelectionState) OVERRIDE;
-    virtual LayoutRect selectionRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer, bool clipToVisibleContent = true) OVERRIDE;
+    virtual LayoutRect selectionRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer) const OVERRIDE;
     virtual bool canBeSelectionLeaf() const OVERRIDE { return true; }
 
     void updateMargins();
@@ -79,9 +86,6 @@ private:
     virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle) OVERRIDE;
     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE;
 
-    IntRect getRelativeMarkerRect();
-    LayoutRect localSelectionRect();
-
     String m_text;
     RefPtr<StyleImage> m_image;
     RawPtrWillBeMember<RenderListItem> m_listItem;