From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- Source/WebCore/rendering/BidiRun.h | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'Source/WebCore/rendering/BidiRun.h') diff --git a/Source/WebCore/rendering/BidiRun.h b/Source/WebCore/rendering/BidiRun.h index a663143e6..8ede1d5e3 100644 --- a/Source/WebCore/rendering/BidiRun.h +++ b/Source/WebCore/rendering/BidiRun.h @@ -21,32 +21,30 @@ * */ -#ifndef BidiRun_h -#define BidiRun_h +#pragma once #include #include "BidiResolver.h" -#include "RenderText.h" namespace WebCore { class BidiContext; class InlineBox; +class RenderObject; struct BidiRun : BidiCharacterRun { - BidiRun(int start, int stop, RenderObject&, BidiContext*, UCharDirection); + BidiRun(unsigned start, unsigned stop, RenderObject&, BidiContext*, UCharDirection); ~BidiRun(); - BidiRun* next() { return static_cast(m_next); } + BidiRun* next() { return static_cast(BidiCharacterRun::next()); } + std::unique_ptr takeNext(); RenderObject& renderer() { return m_renderer; } InlineBox* box() { return m_box; } - void setBox(InlineBox& box) { m_box = &box; } + void setBox(InlineBox* box) { m_box = box; } private: RenderObject& m_renderer; InlineBox* m_box; }; -} - -#endif // BidiRun_h +} // namespace WebCore -- cgit v1.2.1