Diff
Modified: trunk/Source/WTF/ChangeLog (160950 => 160951)
--- trunk/Source/WTF/ChangeLog 2013-12-21 01:27:45 UTC (rev 160950)
+++ trunk/Source/WTF/ChangeLog 2013-12-21 01:55:10 UTC (rev 160951)
@@ -1,3 +1,17 @@
+2013-12-20 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Faster implementation of text-decoration-skip: ink
+ https://bugs.webkit.org/show_bug.cgi?id=125718
+
+ Reviewed by Simon Fraser.
+
+ This creates a new preprocessor define, CSS3_TEXT_DECORATION_SKIP_INK,
+ which enables the use of the text-decoration-skip: ink CSS value.
+ Creating this new value simplifies the logic about when to enable the
+ codepath for this CSS value.
+
+ * wtf/Platform.h:
+
2013-12-20 Simon Fraser <simon.fra...@apple.com>
Change "threaded scrolling" terminology to "asynchronous scrolling"
Modified: trunk/Source/WTF/wtf/Platform.h (160950 => 160951)
--- trunk/Source/WTF/wtf/Platform.h 2013-12-21 01:27:45 UTC (rev 160950)
+++ trunk/Source/WTF/wtf/Platform.h 2013-12-21 01:55:10 UTC (rev 160951)
@@ -1067,4 +1067,8 @@
#define ENABLE_OPENTYPE_VERTICAL 1
#endif
+#if ENABLE(CSS3_TEXT_DECORATION) && PLATFORM(MAC)
+#define ENABLE_CSS3_TEXT_DECORATION_SKIP_INK 1
+#endif
+
#endif /* WTF_Platform_h */
Modified: trunk/Source/WebCore/ChangeLog (160950 => 160951)
--- trunk/Source/WebCore/ChangeLog 2013-12-21 01:27:45 UTC (rev 160950)
+++ trunk/Source/WebCore/ChangeLog 2013-12-21 01:55:10 UTC (rev 160951)
@@ -1,3 +1,40 @@
+2013-12-20 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Faster implementation of text-decoration-skip: ink
+ https://bugs.webkit.org/show_bug.cgi?id=125718
+
+ Reviewed by Simon Fraser.
+
+ This new implementation of text-decoration-skip: ink extracts
+ each glyph into a path, then decomposes each path into a series
+ of contours. It then intersects each contour with the top and
+ bottom of the underline (by approximating the contour with a line).
+ It then draws underlines in between these intersection regions.
+
+ Tests for text-decoration-skip: ink already exist in
+ fast/css3-text/css3-text-decoration/text-decoration-skip
+
+ * platform/graphics/Font.h: Signature of new function
+ * platform/graphics/mac/FontMac.mm:
+ (WebCore::GlyphIterationState::GlyphIterationState): Persistent
+ between calls to findPathIntersections
+ (WebCore::findIntersectionPoint): Calculates an intersection point
+ between two lines
+ (WebCore::findPathIntersections): Called by CGPathApply to find
+ intersections of each contour
+ (WebCore::Font::intersectionPoints): Function to get the places
+ where an underline would intersect a TextRun.
+ * rendering/InlineTextBox.cpp:
+ (WebCore::compareTuples): Used for sorting intersection ranges
+ (WebCore::translateIntersectionPointsToSkipInkBoundaries): Converts
+ a sequence of intersection points to the locations where
+ text-decoration-skip: ink should draw underlines
+ (WebCore::drawSkipInkUnderline): Draws a sequence of short underlines
+ (WebCore::InlineTextBox::paintDecoration):
+ * rendering/TextPainter.cpp:
+ (WebCore::TextPainter::intersectionPoints): Calls Font::intersectionPoints
+ * rendering/TextPainter.h:
+
2013-12-20 Joseph Pecoraro <pecor...@apple.com>
Web Inspector: Give the CommandLineAPIModule its own Host object, making InjectedScriptHost viable for a JS Context
Modified: trunk/Source/WebCore/platform/graphics/Font.h (160950 => 160951)
--- trunk/Source/WebCore/platform/graphics/Font.h 2013-12-21 01:27:45 UTC (rev 160950)
+++ trunk/Source/WebCore/platform/graphics/Font.h 2013-12-21 01:55:10 UTC (rev 160951)
@@ -25,6 +25,7 @@
#ifndef Font_h
#define Font_h
+#include "DashArray.h"
#include "FontDescription.h"
#include "FontGlyphs.h"
#include "SimpleFontData.h"
@@ -100,6 +101,8 @@
void drawText(GraphicsContext*, const TextRun&, const FloatPoint&, int from = 0, int to = -1, CustomFontNotReadyAction = DoNotPaintIfFontNotReady) const;
void drawEmphasisMarks(GraphicsContext*, const TextRun&, const AtomicString& mark, const FloatPoint&, int from = 0, int to = -1) const;
+ DashArray dashesForIntersectionsWithRect(const TextRun&, const FloatPoint& textOrigin, int from, int to, const FloatRect& lineExtents) const;
+
float width(const TextRun&, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOverflow* = 0) const;
float width(const TextRun&, int& charsConsumed, String& glyphName) const;
Modified: trunk/Source/WebCore/platform/graphics/mac/FontMac.mm (160950 => 160951)
--- trunk/Source/WebCore/platform/graphics/mac/FontMac.mm 2013-12-21 01:27:45 UTC (rev 160950)
+++ trunk/Source/WebCore/platform/graphics/mac/FontMac.mm 2013-12-21 01:55:10 UTC (rev 160951)
@@ -23,6 +23,7 @@
#import "config.h"
#import "Font.h"
+#import "DashArray.h"
#import "GlyphBuffer.h"
#import "GraphicsContext.h"
#import "Logging.h"
@@ -323,4 +324,103 @@
#endif
}
+#if ENABLE(CSS3_TEXT_DECORATION_SKIP_INK)
+struct GlyphIterationState {
+ GlyphIterationState(CGPoint startingPoint, CGPoint currentPoint, CGFloat y1, CGFloat y2, CGFloat minX, CGFloat maxX)
+ : startingPoint(startingPoint)
+ , currentPoint(currentPoint)
+ , y1(y1)
+ , y2(y2)
+ , minX(minX)
+ , maxX(maxX)
+ {
+ }
+ CGPoint startingPoint;
+ CGPoint currentPoint;
+ CGFloat y1;
+ CGFloat y2;
+ CGFloat minX;
+ CGFloat maxX;
+};
+
+static bool findIntersectionPoint(float y, CGPoint p1, CGPoint p2, CGFloat& x)
+{
+ x = p1.x + (y - p1.y) * (p2.x - p1.x) / (p2.y - p1.y);
+ return (p1.y < y && p2.y > y) || (p1.y > y && p2.y < y);
}
+
+// This function is called by CGPathApply and is therefore invoked for each
+// contour in a glyph. This function models each contours as a straight line
+// and calculates the intersections between each pseudo-contour and
+// two horizontal lines (the upper and lower bounds of an underline) found in
+// GlyphIterationState::y1 and GlyphIterationState::y2. It keeps track of the
+// leftmost and rightmost intersection in GlyphIterationState::minX and
+// GlyphIterationState::maxX.
+static void findPathIntersections(void* stateAsVoidPointer, const CGPathElement* e)
+{
+ auto& state = *static_cast<GlyphIterationState*>(stateAsVoidPointer);
+ bool doIntersection = false;
+ CGPoint point = CGPointZero;
+ switch (e->type) {
+ case kCGPathElementMoveToPoint:
+ state.startingPoint = e->points[0];
+ state.currentPoint = e->points[0];
+ break;
+ case kCGPathElementAddLineToPoint:
+ doIntersection = true;
+ point = e->points[0];
+ break;
+ case kCGPathElementAddQuadCurveToPoint:
+ doIntersection = true;
+ point = e->points[1];
+ break;
+ case kCGPathElementAddCurveToPoint:
+ doIntersection = true;
+ point = e->points[2];
+ break;
+ case kCGPathElementCloseSubpath:
+ doIntersection = true;
+ point = state.startingPoint;
+ break;
+ }
+ if (!doIntersection)
+ return;
+ CGFloat x;
+ if (findIntersectionPoint(state.y1, state.currentPoint, point, x)) {
+ state.minX = std::min(state.minX, x);
+ state.maxX = std::max(state.maxX, x);
+ }
+ if (findIntersectionPoint(state.y2, state.currentPoint, point, x)) {
+ state.minX = std::min(state.minX, x);
+ state.maxX = std::max(state.maxX, x);
+ }
+ state.currentPoint = point;
+}
+
+DashArray Font::dashesForIntersectionsWithRect(const TextRun& run, const FloatPoint& textOrigin, int textRunStartIndex, int textRunEndIndex, const FloatRect& lineExtents) const
+{
+ float deltaX;
+ GlyphBuffer glyphBuffer;
+ if (codePath(run) != Complex)
+ deltaX = getGlyphsAndAdvancesForSimpleText(run, textRunStartIndex, textRunEndIndex, glyphBuffer);
+ else
+ deltaX = getGlyphsAndAdvancesForComplexText(run, textRunStartIndex, textRunEndIndex, glyphBuffer);
+ CGAffineTransform translation = CGAffineTransformMakeTranslation(textOrigin.x() + deltaX, textOrigin.y());
+ translation = CGAffineTransformScale(translation, 1, -1);
+ DashArray result;
+ for (int i = 0; i < glyphBuffer.size(); ++i) {
+ GlyphIterationState info = GlyphIterationState(CGPointMake(0, 0), CGPointMake(0, 0), lineExtents.y(), lineExtents.y() + lineExtents.height(), lineExtents.x() + lineExtents.width(), lineExtents.x());
+ RetainPtr<CGPathRef> path = adoptCF(CTFontCreatePathForGlyph(glyphBuffer.fontDataAt(i)->platformData().ctFont(), glyphBuffer.glyphAt(i), &translation));
+ CGPathApply(path.get(), &info, &findPathIntersections);
+ if (info.minX < info.maxX) {
+ result.append(info.minX - lineExtents.x());
+ result.append(info.maxX - lineExtents.x());
+ }
+ GlyphBufferAdvance advance = glyphBuffer.advanceAt(i);
+ translation = CGAffineTransformTranslate(translation, advance.width(), advance.height());
+ }
+ return result;
+}
+#endif
+
+}
Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (160950 => 160951)
--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2013-12-21 01:27:45 UTC (rev 160950)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp 2013-12-21 01:55:10 UTC (rev 160951)
@@ -25,6 +25,7 @@
#include "Chrome.h"
#include "ChromeClient.h"
+#include "DashArray.h"
#include "Document.h"
#include "DocumentMarkerController.h"
#include "Editor.h"
@@ -65,6 +66,75 @@
typedef WTF::HashMap<const InlineTextBox*, LayoutRect> InlineTextBoxOverflowMap;
static InlineTextBoxOverflowMap* gTextBoxesWithOverflow;
+#if ENABLE(CSS3_TEXT_DECORATION_SKIP_INK)
+static bool compareTuples(std::pair<float, float> l, std::pair<float, float> r)
+{
+ return l.first < r.first;
+}
+
+static DashArray translateIntersectionPointsToSkipInkBoundaries(const DashArray& intersections, float dilationAmount, float totalWidth)
+{
+ ASSERT(!(intersections.size() % 2));
+
+ // Step 1: Make pairs so we can sort based on range starting-point. We dilate the ranges in this step as well.
+ Vector<std::pair<float, float>> tuples;
+ for (auto i = intersections.begin(); i != intersections.end(); i++, i++)
+ tuples.append(std::make_pair(*i - dilationAmount, *(i + 1) + dilationAmount));
+ std::sort(tuples.begin(), tuples.end(), &compareTuples);
+
+ // Step 2: Deal with intersecting ranges.
+ Vector<std::pair<float, float>> intermediateTuples;
+ if (tuples.size() >= 2) {
+ intermediateTuples.append(*tuples.begin());
+ auto lastIntermediate = intermediateTuples.begin();
+ for (auto i = tuples.begin() + 1; i != tuples.end(); i++) {
+ float& firstEnd = lastIntermediate->second;
+ float secondStart = i->first;
+ float secondEnd = i->second;
+ if (secondStart <= firstEnd && secondEnd <= firstEnd) {
+ // Ignore this range completely
+ } else if (secondStart <= firstEnd)
+ firstEnd = secondEnd;
+ else {
+ intermediateTuples.append(*i);
+ ++lastIntermediate;
+ }
+ }
+ } else
+ intermediateTuples = tuples;
+
+ // Step 3: Output the space between the ranges, but only if the space warrants an underline.
+ float previous = 0;
+ DashArray result;
+ for (auto i = intermediateTuples.begin(); i != intermediateTuples.end(); i++) {
+ if (i->first - previous > dilationAmount) {
+ result.append(previous);
+ result.append(i->first);
+ }
+ previous = i->second;
+ }
+ if (totalWidth - previous > dilationAmount) {
+ result.append(previous);
+ result.append(totalWidth);
+ }
+
+ return result;
+}
+
+static void drawSkipInkUnderline(TextPainter& textPainter, GraphicsContext& context, FloatPoint localOrigin, float underlineOffset, float width, bool isPrinting, int m_start, int m_len)
+{
+ FloatPoint adjustedLocalOrigin = localOrigin;
+ adjustedLocalOrigin.move(0, underlineOffset);
+ FloatRect underlineBoundingBox = context.computeLineBoundsForText(adjustedLocalOrigin, width, isPrinting);
+ DashArray intersections = textPainter.dashesForIntersectionsWithRect(underlineBoundingBox, m_start, m_start + m_len);
+ DashArray a = translateIntersectionPointsToSkipInkBoundaries(intersections, underlineBoundingBox.height(), width);
+
+ ASSERT(!(a.size() % 2));
+ for (auto i = a.begin(); i != a.end(); i++, i++)
+ context.drawLineForText(FloatPoint(localOrigin.x() + *i, localOrigin.y() + underlineOffset), *(i+1) - *i, isPrinting);
+}
+#endif
+
InlineTextBox::~InlineTextBox()
{
if (!knownToHaveNoOverflow() && gTextBoxesWithOverflow)
@@ -1072,7 +1142,7 @@
// Offset between lines - always non-zero, so lines never cross each other.
float doubleOffset = textDecorationThickness + 1;
- bool clipDecorationToMask = lineStyle.textDecorationSkip() == TextDecorationSkipInk;
+ bool clipDecorationToMask = false;
GraphicsContextStateSaver stateSaver(context, false);
@@ -1115,10 +1185,23 @@
break;
}
default:
- context.drawLineForText(FloatPoint(localOrigin.x(), localOrigin.y() + underlineOffset), width, isPrinting);
+#if ENABLE(CSS3_TEXT_DECORATION_SKIP_INK)
+ if (lineStyle.textDecorationSkip() == TextDecorationSkipInk) {
+ if (!context.paintingDisabled()) {
+ drawSkipInkUnderline(textPainter, context, localOrigin, underlineOffset, width, isPrinting, m_start, m_len);
- if (decorationStyle == TextDecorationStyleDouble)
- context.drawLineForText(FloatPoint(localOrigin.x(), localOrigin.y() + underlineOffset + doubleOffset), width, isPrinting);
+ if (decorationStyle == TextDecorationStyleDouble)
+ drawSkipInkUnderline(textPainter, context, localOrigin, underlineOffset + doubleOffset, width, isPrinting, m_start, m_len);
+ }
+ } else {
+#endif // CSS3_TEXT_DECORATION_SKIP_INK
+ context.drawLineForText(FloatPoint(localOrigin.x(), localOrigin.y() + underlineOffset), width, isPrinting);
+
+ if (decorationStyle == TextDecorationStyleDouble)
+ context.drawLineForText(FloatPoint(localOrigin.x(), localOrigin.y() + underlineOffset + doubleOffset), width, isPrinting);
+#if ENABLE(CSS3_TEXT_DECORATION_SKIP_INK)
+ }
+#endif
}
#else
// Leave one pixel of white between the baseline and the underline.
@@ -1136,11 +1219,24 @@
break;
}
default:
+#if ENABLE(CSS3_TEXT_DECORATION_SKIP_INK)
+ if (lineStyle.textDecorationSkip() == TextDecorationSkipInk) {
+ if (!context.paintingDisabled()) {
+ drawSkipInkUnderline(textPainter, context, localOrigin, 0, width, isPrinting, m_start, m_len);
+
+ if (decorationStyle == TextDecorationStyleDouble)
+ drawSkipInkUnderline(textPainter, context, localOrigin, -doubleOffset, width, isPrinting, m_start, m_len);
+ }
+ } else {
+#endif // CSS3_TEXT_DECORATION_SKIP_INK
#endif // CSS3_TEXT_DECORATION
- context.drawLineForText(localOrigin, width, isPrinting);
+ context.drawLineForText(localOrigin, width, isPrinting);
#if ENABLE(CSS3_TEXT_DECORATION)
- if (decorationStyle == TextDecorationStyleDouble)
- context.drawLineForText(FloatPoint(localOrigin.x(), localOrigin.y() - doubleOffset), width, isPrinting);
+ if (decorationStyle == TextDecorationStyleDouble)
+ context.drawLineForText(FloatPoint(localOrigin.x(), localOrigin.y() - doubleOffset), width, isPrinting);
+#if ENABLE(CSS3_TEXT_DECORATION_SKIP_INK)
+ }
+#endif
}
#endif // CSS3_TEXT_DECORATION
}
Modified: trunk/Source/WebCore/rendering/TextPainter.cpp (160950 => 160951)
--- trunk/Source/WebCore/rendering/TextPainter.cpp 2013-12-21 01:27:45 UTC (rev 160950)
+++ trunk/Source/WebCore/rendering/TextPainter.cpp 2013-12-21 01:55:10 UTC (rev 160951)
@@ -176,4 +176,11 @@
m_savedDrawingStateForMask = savedDrawingStateForMask;
}
+#if ENABLE(CSS3_TEXT_DECORATION_SKIP_INK)
+DashArray TextPainter::dashesForIntersectionsWithRect(const FloatRect& lineExtents, int textRunStartIndex, int textRunEndIndex)
+{
+ return m_font.dashesForIntersectionsWithRect(m_textRun, m_textOrigin, textRunStartIndex, textRunEndIndex, lineExtents);
+}
+#endif
+
} // namespace WebCore
Modified: trunk/Source/WebCore/rendering/TextPainter.h (160950 => 160951)
--- trunk/Source/WebCore/rendering/TextPainter.h 2013-12-21 01:27:45 UTC (rev 160950)
+++ trunk/Source/WebCore/rendering/TextPainter.h 2013-12-21 01:55:10 UTC (rev 160951)
@@ -24,6 +24,7 @@
#define TextPainter_h
#include "AffineTransform.h"
+#include "DashArray.h"
#include "RenderText.h"
namespace WebCore {
@@ -67,6 +68,8 @@
void paintText();
void paintTextInContext(GraphicsContext&, float amountToIncreaseStrokeWidthBy);
+ DashArray dashesForIntersectionsWithRect(const FloatRect& lineExtents, int textRunStartIndex, int textRunEndIndex);
+
private:
bool m_paintSelectedTextOnly;
bool m_paintSelectedTextSeparately;
