diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/rendering/RenderRuby.h | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/rendering/RenderRuby.h')
| -rw-r--r-- | Source/WebCore/rendering/RenderRuby.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/rendering/RenderRuby.h b/Source/WebCore/rendering/RenderRuby.h index 49a84d8..24ac0db 100644 --- a/Source/WebCore/rendering/RenderRuby.h +++ b/Source/WebCore/rendering/RenderRuby.h @@ -47,6 +47,8 @@ namespace WebCore { // 1-n inline object(s) // // Note: <rp> elements are defined as having 'display:none' and thus normally are not assigned a renderer. +// +// Generated :before/:after content is shunted into anonymous inline blocks // <ruby> when used as 'display:inline' class RenderRubyAsInline : public RenderInline { @@ -54,7 +56,6 @@ public: RenderRubyAsInline(Node*); virtual ~RenderRubyAsInline(); - virtual bool isChildAllowed(RenderObject*, RenderStyle*) const; virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0); virtual void removeChild(RenderObject* child); @@ -71,7 +72,6 @@ public: RenderRubyAsBlock(Node*); virtual ~RenderRubyAsBlock(); - virtual bool isChildAllowed(RenderObject*, RenderStyle*) const; virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0); virtual void removeChild(RenderObject* child); |