summaryrefslogtreecommitdiffstats
path: root/chromium/third_party/WebKit/Source/core/rendering/RenderRubyBase.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/rendering/RenderRubyBase.h')
-rw-r--r--chromium/third_party/WebKit/Source/core/rendering/RenderRubyBase.h14
1 files changed, 5 insertions, 9 deletions
diff --git a/chromium/third_party/WebKit/Source/core/rendering/RenderRubyBase.h b/chromium/third_party/WebKit/Source/core/rendering/RenderRubyBase.h
index 197aebba507..98748be1157 100644
--- a/chromium/third_party/WebKit/Source/core/rendering/RenderRubyBase.h
+++ b/chromium/third_party/WebKit/Source/core/rendering/RenderRubyBase.h
@@ -43,26 +43,22 @@ public:
static RenderRubyBase* createAnonymous(Document*);
- virtual const char* renderName() const { return "RenderRubyBase (anonymous)"; }
+ virtual const char* renderName() const OVERRIDE { return "RenderRubyBase (anonymous)"; }
- virtual bool isRubyBase() const { return true; }
+ virtual bool isRubyBase() const OVERRIDE { return true; }
- virtual bool isChildAllowed(RenderObject*, RenderStyle*) const;
+ virtual bool isChildAllowed(RenderObject*, RenderStyle*) const OVERRIDE;
private:
RenderRubyBase();
- virtual ETextAlign textAlignmentForLine(bool endsWithSoftBreak) const;
- virtual void adjustInlineDirectionLineBounds(int expansionOpportunityCount, float& logicalLeft, float& logicalWidth) const;
-
- virtual bool supportsPartialLayout() const OVERRIDE { return false; }
+ virtual ETextAlign textAlignmentForLine(bool endsWithSoftBreak) const OVERRIDE;
+ virtual void adjustInlineDirectionLineBounds(unsigned expansionOpportunityCount, float& logicalLeft, float& logicalWidth) const OVERRIDE;
void moveChildren(RenderRubyBase* toBase, RenderObject* beforeChild = 0);
void moveInlineChildren(RenderRubyBase* toBase, RenderObject* beforeChild = 0);
void moveBlockChildren(RenderRubyBase* toBase, RenderObject* beforeChild = 0);
- RenderRubyRun* rubyRun() const;
-
// Allow RenderRubyRun to manipulate the children within ruby bases.
friend class RenderRubyRun;
};