projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 9.38.198.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
WebKit
/
Source
/
core
/
rendering
/
RootInlineBox.h
diff --git
a/src/third_party/WebKit/Source/core/rendering/RootInlineBox.h
b/src/third_party/WebKit/Source/core/rendering/RootInlineBox.h
index
32b1c55
..
a1c806d
100644
(file)
--- a/
src/third_party/WebKit/Source/core/rendering/RootInlineBox.h
+++ b/
src/third_party/WebKit/Source/core/rendering/RootInlineBox.h
@@
-24,7
+24,7
@@
#include "core/rendering/InlineFlowBox.h"
#include "platform/text/BidiContext.h"
#include "core/rendering/InlineFlowBox.h"
#include "platform/text/BidiContext.h"
-namespace
WebCore
{
+namespace
blink
{
class EllipsisBox;
class HitTestResult;
class EllipsisBox;
class HitTestResult;
@@
-73,12
+73,13
@@
public:
int blockDirectionPointInLine() const;
LayoutUnit alignBoxesInBlockDirection(LayoutUnit heightOfBlock, GlyphOverflowAndFallbackFontsMap&, VerticalPositionCache&);
int blockDirectionPointInLine() const;
LayoutUnit alignBoxesInBlockDirection(LayoutUnit heightOfBlock, GlyphOverflowAndFallbackFontsMap&, VerticalPositionCache&);
- void setLineTopBottomPositions(LayoutUnit top, LayoutUnit bottom, LayoutUnit topWithLeading, LayoutUnit bottomWithLeading)
+ void setLineTopBottomPositions(LayoutUnit top, LayoutUnit bottom, LayoutUnit topWithLeading, LayoutUnit bottomWithLeading
, LayoutUnit selectionBottom = LayoutUnit::min()
)
{
m_lineTop = top;
m_lineBottom = bottom;
m_lineTopWithLeading = topWithLeading;
m_lineBottomWithLeading = bottomWithLeading;
{
m_lineTop = top;
m_lineBottom = bottom;
m_lineTopWithLeading = topWithLeading;
m_lineBottomWithLeading = bottomWithLeading;
+ m_selectionBottom = selectionBottom == LayoutUnit::min() ? bottom : selectionBottom;
}
virtual RenderLineBoxList* rendererLineBoxes() const OVERRIDE FINAL;
}
virtual RenderLineBoxList* rendererLineBoxes() const OVERRIDE FINAL;
@@
-108,8
+109,6
@@
public:
virtual void clearTruncation() OVERRIDE FINAL;
virtual void clearTruncation() OVERRIDE FINAL;
- bool isHyphenated() const;
-
virtual int baselinePosition(FontBaseline baselineType) const OVERRIDE FINAL;
virtual LayoutUnit lineHeight() const OVERRIDE FINAL;
virtual int baselinePosition(FontBaseline baselineType) const OVERRIDE FINAL;
virtual LayoutUnit lineHeight() const OVERRIDE FINAL;
@@
-207,12
+206,6
@@
private:
RenderObject* m_lineBreakObj;
RefPtr<BidiContext> m_lineBreakContext;
RenderObject* m_lineBreakObj;
RefPtr<BidiContext> m_lineBreakContext;
- LayoutUnit m_lineTop;
- LayoutUnit m_lineBottom;
-
- LayoutUnit m_lineTopWithLeading;
- LayoutUnit m_lineBottomWithLeading;
-
struct LineFragmentationData {
WTF_MAKE_NONCOPYABLE(LineFragmentationData); WTF_MAKE_FAST_ALLOCATED;
public:
struct LineFragmentationData {
WTF_MAKE_NONCOPYABLE(LineFragmentationData); WTF_MAKE_FAST_ALLOCATED;
public:
@@
-234,8
+227,14
@@
private:
// Floats hanging off the line are pushed into this vector during layout. It is only
// good for as long as the line has not been marked dirty.
OwnPtr<Vector<RenderBox*> > m_floats;
// Floats hanging off the line are pushed into this vector during layout. It is only
// good for as long as the line has not been marked dirty.
OwnPtr<Vector<RenderBox*> > m_floats;
+
+ LayoutUnit m_lineTop;
+ LayoutUnit m_lineBottom;
+ LayoutUnit m_lineTopWithLeading;
+ LayoutUnit m_lineBottomWithLeading;
+ LayoutUnit m_selectionBottom;
};
};
-} // namespace
WebCore
+} // namespace
blink
#endif // RootInlineBox_h
#endif // RootInlineBox_h