diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/rendering/RenderRubyBase.h | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/rendering/RenderRubyBase.h')
| -rw-r--r-- | Source/WebCore/rendering/RenderRubyBase.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/WebCore/rendering/RenderRubyBase.h b/Source/WebCore/rendering/RenderRubyBase.h index c029bd5..850ab65 100644 --- a/Source/WebCore/rendering/RenderRubyBase.h +++ b/Source/WebCore/rendering/RenderRubyBase.h @@ -35,6 +35,8 @@ namespace WebCore { +class RenderRubyRun; + class RenderRubyBase : public RenderBlock { public: RenderRubyBase(Node*); @@ -47,13 +49,18 @@ public: virtual bool isChildAllowed(RenderObject*, RenderStyle*) const; private: + virtual ETextAlign textAlignmentForLine(bool endsWithSoftBreak) const; + virtual void adjustInlineDirectionLineBounds(int expansionOpportunityCount, float& logicalLeft, float& logicalWidth) const; + bool hasOnlyWrappedInlineChildren(RenderObject* beforeChild = 0) const; void moveChildren(RenderRubyBase* toBase, RenderObject* fromBeforeChild = 0); void moveInlineChildren(RenderRubyBase* toBase, RenderObject* fromBeforeChild = 0); void moveBlockChildren(RenderRubyBase* toBase, RenderObject* fromBeforeChild = 0); void mergeBlockChildren(RenderRubyBase* toBase, RenderObject* fromBeforeChild = 0); - + + RenderRubyRun* rubyRun() const; + // Allow RenderRubyRun to manipulate the children within ruby bases. friend class RenderRubyRun; }; |