Merge WebKit at r84325: Initial merge by git.

Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b

1 files changed, 16 insertions, 0 deletions

diff --git a/Source/WebCore/rendering/RenderRubyRun.h b/Source/WebCore/rendering/RenderRubyRun.h
index 53209bc..f65ad86 100644
--- a/Source/WebCore/rendering/RenderRubyRun.h
+++ b/Source/WebCore/rendering/RenderRubyRun.h
@@ -63,6 +63,8 @@ public:
     virtual RenderBlock* firstLineBlock() const;
     virtual void updateFirstLetter();
 
+    void getOverhang(bool firstLine, RenderObject* startRenderer, RenderObject* endRenderer, int& startOverhang, int& endOverhang) const;
+
     static RenderRubyRun* staticCreateRubyRun(const RenderObject* parentRuby);
 
 protected:
@@ -75,6 +77,20 @@ private:
     virtual void removeLeftoverAnonymousBlock(RenderBlock*) { }
 };
 
+inline RenderRubyRun* toRenderRubyRun(RenderObject* object)
+{
+    ASSERT(!object || object->isRubyRun());
+    return static_cast<RenderRubyRun*>(object);
+}
+
+inline const RenderRubyRun* toRenderRubyRun(const RenderObject* object)
+{
+    ASSERT(!object || object->isBox());
+    return static_cast<const RenderRubyRun*>(object);
+}
+
+void toRenderRubyRun(const RenderRubyRun*);
+
 } // namespace WebCore
 
 #endif // RenderRubyRun_h