mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 382721 - Part 6: Flush path while building long dotted/dashed border. r=jrmuizel

This commit is contained in:
Tooru Fujisawa 2016-06-10 13:10:03 +09:00
Родитель 2e9d18cb2f
Коммит 133e4768cd
2 изменённых файлов: 29 добавлений и 0 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
layout/base/BorderConsts.h
Просмотреть файл

@ -22,4 +22,6 @@
#define C_BR NS_CORNER_BOTTOM_RIGHT #define C_BR NS_CORNER_BOTTOM_RIGHT
#define C_BL NS_CORNER_BOTTOM_LEFT #define C_BL NS_CORNER_BOTTOM_LEFT
#define BORDER_SEGMENT_COUNT_MAX 100
#endif /* mozilla_BorderConsts_h_ */ #endif /* mozilla_BorderConsts_h_ */

27
layout/base/nsCSSRenderingBorders.cpp
Просмотреть файл

@ -2103,10 +2103,19 @@ nsCSSBorderRenderer::DrawDottedSideSlow(mozilla::css::Side aSide)
} }
RefPtr<PathBuilder> builder = mDrawTarget->CreatePathBuilder(); RefPtr<PathBuilder> builder = mDrawTarget->CreatePathBuilder();
size_t segmentCount = 0;
for (size_t i = from; i <= to; i += 2) { for (size_t i = from; i <= to; i += 2) {
if (segmentCount > BORDER_SEGMENT_COUNT_MAX) {
RefPtr<Path> path = builder->Finish();
mDrawTarget->Fill(path, ColorPattern(ToDeviceColor(borderColor)));
builder = mDrawTarget->CreatePathBuilder();
segmentCount = 0;
}
Point P = (start * (count - i) + end * i) / count; Point P = (start * (count - i) + end * i) / count;
builder->MoveTo(Point(P.x + radius, P.y)); builder->MoveTo(Point(P.x + radius, P.y));
builder->Arc(P, radius, 0.0f, Float(2.0 * M_PI)); builder->Arc(P, radius, 0.0f, Float(2.0 * M_PI));
segmentCount++;
} }
RefPtr<Path> path = builder->Finish(); RefPtr<Path> path = builder->Finish();
mDrawTarget->Fill(path, ColorPattern(ToDeviceColor(borderColor))); mDrawTarget->Fill(path, ColorPattern(ToDeviceColor(borderColor)));
@ -2244,11 +2253,20 @@ nsCSSBorderRenderer::DrawDottedCornerSlow(mozilla::css::Side aSide,
C0, R0, Cn, Rn, mBorderCornerDimensions[aCorner]); C0, R0, Cn, Rn, mBorderCornerDimensions[aCorner]);
RefPtr<PathBuilder> builder = mDrawTarget->CreatePathBuilder(); RefPtr<PathBuilder> builder = mDrawTarget->CreatePathBuilder();
size_t segmentCount = 0;
while (finder.HasMore()) { while (finder.HasMore()) {
if (segmentCount > BORDER_SEGMENT_COUNT_MAX) {
RefPtr<Path> path = builder->Finish();
mDrawTarget->Fill(path, ColorPattern(ToDeviceColor(borderColor)));
builder = mDrawTarget->CreatePathBuilder();
segmentCount = 0;
}
DottedCornerFinder::Result result = finder.Next(); DottedCornerFinder::Result result = finder.Next();
builder->MoveTo(Point(result.C.x + result.r, result.C.y)); builder->MoveTo(Point(result.C.x + result.r, result.C.y));
builder->Arc(result.C, result.r, 0, Float(2.0 * M_PI)); builder->Arc(result.C, result.r, 0, Float(2.0 * M_PI));
segmentCount++;
} }
RefPtr<Path> path = builder->Finish(); RefPtr<Path> path = builder->Finish();
mDrawTarget->Fill(path, ColorPattern(ToDeviceColor(borderColor))); mDrawTarget->Fill(path, ColorPattern(ToDeviceColor(borderColor)));
@ -2279,7 +2297,15 @@ nsCSSBorderRenderer::DrawDashedCornerSlow(mozilla::css::Side aSide,
mBorderCornerDimensions[aCorner]); mBorderCornerDimensions[aCorner]);
RefPtr<PathBuilder> builder = mDrawTarget->CreatePathBuilder(); RefPtr<PathBuilder> builder = mDrawTarget->CreatePathBuilder();
size_t segmentCount = 0;
while (finder.HasMore()) { while (finder.HasMore()) {
if (segmentCount > BORDER_SEGMENT_COUNT_MAX) {
RefPtr<Path> path = builder->Finish();
mDrawTarget->Fill(path, ColorPattern(ToDeviceColor(borderColor)));
builder = mDrawTarget->CreatePathBuilder();
segmentCount = 0;
}
DashedCornerFinder::Result result = finder.Next(); DashedCornerFinder::Result result = finder.Next();
builder->MoveTo(result.outerSectionBezier.mPoints[0]); builder->MoveTo(result.outerSectionBezier.mPoints[0]);
@ -2291,6 +2317,7 @@ nsCSSBorderRenderer::DrawDashedCornerSlow(mozilla::css::Side aSide,
result.innerSectionBezier.mPoints[1], result.innerSectionBezier.mPoints[1],
result.innerSectionBezier.mPoints[0]); result.innerSectionBezier.mPoints[0]);
builder->LineTo(result.outerSectionBezier.mPoints[0]); builder->LineTo(result.outerSectionBezier.mPoints[0]);
segmentCount++;
} }
if (outerBezier.mPoints[0].x != innerBezier.mPoints[0].x) { if (outerBezier.mPoints[0].x != innerBezier.mPoints[0].x) {