3939
4040namespace WebCore {
4141
42+ #if USE(APPLE_INTERNAL_SDK) && PLATFORM(MAC)
43+ #import < WebKitAdditions/CaretRectComputationAdditions.cpp>
44+ #else
45+ int caretWidth ()
46+ {
47+ #if PLATFORM(IOS_FAMILY)
48+ return 2 ; // This value should be kept in sync with UIKit. See <rdar://problem/15580601>.
49+ #else
50+ return 1 ;
51+ #endif
52+ }
53+ #endif
54+
4255static LayoutRect computeCaretRectForEmptyElement (const RenderBoxModelObject& renderer, LayoutUnit width, LayoutUnit textIndentOffset, CaretRectMode caretRectMode)
4356{
4457 ASSERT (!renderer.firstChild () || renderer.firstChild ()->isPseudoElement ());
@@ -92,18 +105,18 @@ static LayoutRect computeCaretRectForEmptyElement(const RenderBoxModelObject& re
92105 x -= textIndentOffset / 2 ;
93106 break ;
94107 case AlignRight:
95- x = maxX - caretWidth;
108+ x = maxX - caretWidth () ;
96109 if (!currentStyle.isLeftToRightDirection ())
97110 x -= textIndentOffset;
98111 break ;
99112 }
100- x = std::min (x, std::max<LayoutUnit>(maxX - caretWidth, 0 ));
113+ x = std::min (x, std::max<LayoutUnit>(maxX - caretWidth () , 0 ));
101114
102115 auto lineHeight = renderer.lineHeight (true , currentStyle.isHorizontalWritingMode () ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes);
103116 auto height = std::min (lineHeight, LayoutUnit { currentStyle.metricsOfPrimaryFont ().height () });
104117 auto y = renderer.paddingTop () + renderer.borderTop () + (lineHeight > height ? (lineHeight - height) / 2 : LayoutUnit { });
105118
106- auto rect = LayoutRect (x, y, caretWidth, height);
119+ auto rect = LayoutRect (x, y, caretWidth () , height);
107120
108121 if (caretRectMode == CaretRectMode::ExpandToEndOfLine)
109122 rect.shiftMaxXEdgeTo (width);
@@ -121,9 +134,9 @@ static LayoutRect computeCaretRectForLinePosition(const InlineIterator::LineBoxI
121134
122135 // Distribute the caret's width to either side of the offset.
123136 float left = logicalLeftPosition;
124- int caretWidthLeftOfOffset = caretWidth / 2 ;
137+ int caretWidthLeftOfOffset = caretWidth () / 2 ;
125138 left -= caretWidthLeftOfOffset;
126- int caretWidthRightOfOffset = caretWidth - caretWidthLeftOfOffset;
139+ int caretWidthRightOfOffset = caretWidth () - caretWidthLeftOfOffset;
127140 left = roundf (left);
128141
129142 float lineLeft = lineSelectionRect.x ();
@@ -154,13 +167,13 @@ static LayoutRect computeCaretRectForLinePosition(const InlineIterator::LineBoxI
154167
155168 if (rightAligned) {
156169 left = std::max (left, leftEdge);
157- left = std::min (left, lineRight - caretWidth);
170+ left = std::min (left, lineRight - caretWidth () );
158171 } else {
159172 left = std::min (left, rightEdge - caretWidthRightOfOffset);
160173 left = std::max (left, lineLeft);
161174 }
162175
163- auto rect = IntRect (left, top, caretWidth, height);
176+ auto rect = IntRect (left, top, caretWidth () , height);
164177
165178 if (caretRectMode == CaretRectMode::ExpandToEndOfLine)
166179 rect.shiftMaxXEdgeTo (lineRight);
@@ -207,12 +220,12 @@ static LayoutRect computeCaretRectForSVGInlineText(const InlineBoxAndOffset& box
207220 if (caretOffset < textBox.start () + textBox.len ()) {
208221 LayoutRect rect = textBox.localSelectionRect (caretOffset, caretOffset + 1 );
209222 LayoutUnit x = textBox.isLeftToRightDirection () ? rect.x () : rect.maxX ();
210- return LayoutRect (x, rect.y (), caretWidth, rect.height ());
223+ return LayoutRect (x, rect.y (), caretWidth () , rect.height ());
211224 }
212225
213226 LayoutRect rect = textBox.localSelectionRect (caretOffset - 1 , caretOffset);
214227 LayoutUnit x = textBox.isLeftToRightDirection () ? rect.maxX () : rect.x ();
215- return { x, rect.y (), caretWidth, rect.height () };
228+ return { x, rect.y (), caretWidth () , rect.height () };
216229}
217230
218231static LayoutRect computeCaretRectForBox (const RenderBox& renderer, const InlineBoxAndOffset& boxAndOffset, CaretRectMode caretRectMode)
@@ -222,11 +235,11 @@ static LayoutRect computeCaretRectForBox(const RenderBox& renderer, const Inline
222235 // They never refer to children.
223236 // FIXME: Paint the carets inside empty blocks differently than the carets before/after elements.
224237
225- LayoutRect rect (renderer.location (), LayoutSize (caretWidth, renderer.height ()));
238+ LayoutRect rect (renderer.location (), LayoutSize (caretWidth () , renderer.height ()));
226239 bool ltr = boxAndOffset.box ? boxAndOffset.box ->isLeftToRightDirection () : renderer.style ().isLeftToRightDirection ();
227240
228241 if ((!boxAndOffset.offset ) ^ ltr)
229- rect.move (LayoutSize (renderer.width () - caretWidth, 0_lu));
242+ rect.move (LayoutSize (renderer.width () - caretWidth () , 0_lu));
230243
231244 if (boxAndOffset.box ) {
232245 auto lineBox = boxAndOffset.box ->lineBox ();
0 commit comments