| Index: Source/core/rendering/line/WordMeasurement.h
|
| diff --git a/Source/core/html/HTMLBDIElement.h b/Source/core/rendering/line/WordMeasurement.h
|
| similarity index 55%
|
| copy from Source/core/html/HTMLBDIElement.h
|
| copy to Source/core/rendering/line/WordMeasurement.h
|
| index 52db54e936990494173f9afad51b6e5e4f314117..46803dd0c5612b35cd35c5122ac99d82808637a3 100644
|
| --- a/Source/core/html/HTMLBDIElement.h
|
| +++ b/Source/core/rendering/line/WordMeasurement.h
|
| @@ -1,5 +1,8 @@
|
| /*
|
| - * Copyright (C) 2012 Google Inc. All rights reserved.
|
| + * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
|
| + * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All right reserved.
|
| + * Copyright (C) 2010 Google Inc. All rights reserved.
|
| + * Copyright (C) 2013 Adobe Systems Incorporated.
|
| *
|
| * This library is free software; you can redistribute it and/or
|
| * modify it under the terms of the GNU Library General Public
|
| @@ -18,28 +21,33 @@
|
| *
|
| */
|
|
|
| -#ifndef HTMLBDIElement_h
|
| -#define HTMLBDIElement_h
|
| +#ifndef WordMeasurement_h
|
| +#define WordMeasurement_h
|
|
|
| -#include "core/html/HTMLElement.h"
|
| +#include "platform/fonts/SimpleFontData.h"
|
| +#include "wtf/HashSet.h"
|
|
|
| namespace WebCore {
|
|
|
| -class HTMLBDIElement FINAL : public HTMLElement {
|
| -public:
|
| - DECLARE_NODE_FACTORY(HTMLBDIElement);
|
| +class RenderText;
|
|
|
| -private:
|
| - inline explicit HTMLBDIElement(Document& document)
|
| - : HTMLElement(HTMLNames::bdiTag, document)
|
| +class WordMeasurement {
|
| +public:
|
| + WordMeasurement()
|
| + : renderer(0)
|
| + , width(0)
|
| + , startOffset(0)
|
| + , endOffset(0)
|
| {
|
| - // FIXME: Rename setSelfOrAncestorHasDirAutoAttribute to reflect the fact bdi also uses this flag.
|
| - setSelfOrAncestorHasDirAutoAttribute(true);
|
| }
|
| -};
|
|
|
| -DEFINE_NODE_FACTORY(HTMLBDIElement)
|
| + RenderText* renderer;
|
| + float width;
|
| + int startOffset;
|
| + int endOffset;
|
| + HashSet<const SimpleFontData*> fallbackFonts;
|
| +};
|
|
|
| } // namespace WebCore
|
|
|
| -#endif
|
| +#endif // WordMeasurement_h
|
|
|