394197d064
This reverts commit 1ad81981b0.
Reason for revert: broke chrome layout tests
Original change's description:
> efficiently dash very large rectangles and very long lines
>
> Speed up dashing when lines and rects are absurdly large.
>
> Prior to this CL, only horizontal lines were detected.
>
> The onOnceBeforeDraw changes are there to make debugging easier.
>
> Also folded in a change to handle dashing of zero length lines.
>
> R=reed@google.com, egdaniel@google.com
> Bug: skia:7311
> Change-Id: Ia16fb124c7a78a5cc639e612fae29c879a37da1a
> Reviewed-on: https://skia-review.googlesource.com/84862
> Commit-Queue: Cary Clark <caryclark@skia.org>
> Reviewed-by: Mike Reed <reed@google.com>
TBR=egdaniel@google.com,reed@google.com,caryclark@skia.org
Change-Id: I5e8f04c54486f8cd1a931f6cade92feaaa4a7647
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7311
Reviewed-on: https://skia-review.googlesource.com/87282
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Cary Clark <caryclark@google.com>
193 lines
7.1 KiB
C++
193 lines
7.1 KiB
C++
/*
|
|
* Copyright 2011 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
#include "SampleCode.h"
|
|
#include "SkView.h"
|
|
#include "SkCanvas.h"
|
|
#include "SkPaint.h"
|
|
#include "SkShader.h"
|
|
|
|
static SkBitmap createBitmap(int n) {
|
|
SkBitmap bitmap;
|
|
bitmap.allocN32Pixels(n, n);
|
|
bitmap.eraseColor(SK_ColorGREEN);
|
|
|
|
SkCanvas canvas(bitmap);
|
|
SkRect r;
|
|
r.set(0, 0, SkIntToScalar(n), SkIntToScalar(n));
|
|
SkPaint paint;
|
|
paint.setAntiAlias(true);
|
|
|
|
paint.setColor(SK_ColorRED);
|
|
canvas.drawOval(r, paint);
|
|
paint.setColor(SK_ColorBLUE);
|
|
paint.setStrokeWidth(SkIntToScalar(n)/15);
|
|
paint.setStyle(SkPaint::kStroke_Style);
|
|
canvas.drawLine(0, 0, r.fRight, r.fBottom, paint);
|
|
canvas.drawLine(0, r.fBottom, r.fRight, 0, paint);
|
|
|
|
return bitmap;
|
|
}
|
|
|
|
class AARectView : public SampleView {
|
|
SkBitmap fBitmap;
|
|
enum {
|
|
N = 64
|
|
};
|
|
public:
|
|
AARectView() {
|
|
fBitmap = createBitmap(N);
|
|
|
|
fWidth = N;
|
|
}
|
|
|
|
protected:
|
|
// overrides from SkEventSink
|
|
virtual bool onQuery(SkEvent* evt) {
|
|
if (SampleCode::TitleQ(*evt)) {
|
|
SampleCode::TitleR(evt, "AA Rects");
|
|
return true;
|
|
}
|
|
return this->INHERITED::onQuery(evt);
|
|
}
|
|
|
|
virtual void onDrawContent(SkCanvas* canvas) {
|
|
canvas->translate(SkIntToScalar(10), SkIntToScalar(10));
|
|
|
|
SkPaint bluePaint;
|
|
bluePaint.setARGB(0xff, 0x0, 0x0, 0xff);
|
|
SkPaint bmpPaint;
|
|
bmpPaint.setShader(SkShader::MakeBitmapShader(fBitmap, SkShader::kRepeat_TileMode,
|
|
SkShader::kRepeat_TileMode));
|
|
bluePaint.setStrokeWidth(3);
|
|
bmpPaint.setStrokeWidth(3);
|
|
|
|
SkPaint paints[] = { bluePaint, bmpPaint };
|
|
|
|
SkRect rect;
|
|
|
|
SkScalar dx = SkIntToScalar(80);
|
|
SkScalar dy = SkIntToScalar(100);
|
|
SkMatrix matrix;
|
|
for (size_t p = 0; p < SK_ARRAY_COUNT(paints); ++p) {
|
|
for (int stroke = 0; stroke < 2; ++stroke) {
|
|
paints[p].setStyle(stroke ? SkPaint::kStroke_Style : SkPaint::kFill_Style);
|
|
for (int a = 0; a < 3; ++ a) {
|
|
paints[p].setAntiAlias(a > 0);
|
|
paints[p].setAlpha(a > 1 ? 0x80 : 0xff);
|
|
|
|
canvas->save();
|
|
rect = SkRect::MakeLTRB(0.f,
|
|
0.f,
|
|
40.f,
|
|
40.f);
|
|
canvas->drawRect(rect, paints[p]);
|
|
canvas->translate(dx, 0);
|
|
|
|
rect = SkRect::MakeLTRB(0.5f,
|
|
0.5f,
|
|
40.5f,
|
|
40.5f);
|
|
canvas->drawRect(rect, paints[p]);
|
|
canvas->translate(dx, 0);
|
|
|
|
rect = SkRect::MakeLTRB(0.5f,
|
|
0.5f,
|
|
40.f,
|
|
40.f);
|
|
canvas->drawRect(rect, paints[p]);
|
|
canvas->translate(dx, 0);
|
|
|
|
rect = SkRect::MakeLTRB(0.75f,
|
|
0.75f,
|
|
40.75f,
|
|
40.75f);
|
|
canvas->drawRect(rect, paints[p]);
|
|
canvas->translate(dx, 0);
|
|
|
|
canvas->save();
|
|
canvas->translate(.33f, .67f);
|
|
rect = SkRect::MakeLTRB(0.0f,
|
|
0.0f,
|
|
40.0f,
|
|
40.0f);
|
|
canvas->drawRect(rect, paints[p]);
|
|
canvas->restore();
|
|
canvas->translate(dx, 0);
|
|
|
|
canvas->save();
|
|
matrix.setRotate(45.f);
|
|
canvas->concat(matrix);
|
|
canvas->translate(20.0f / sqrtf(2.f),
|
|
20.0f / sqrtf(2.f));
|
|
rect = SkRect::MakeLTRB(-20.0f,
|
|
-20.0f,
|
|
20.0f,
|
|
20.0f);
|
|
canvas->drawRect(rect, paints[p]);
|
|
canvas->restore();
|
|
canvas->translate(dx, 0);
|
|
|
|
canvas->save();
|
|
canvas->rotate(90.f);
|
|
rect = SkRect::MakeLTRB(0.0f,
|
|
0.0f,
|
|
40.0f,
|
|
-40.0f);
|
|
canvas->drawRect(rect, paints[p]);
|
|
canvas->restore();
|
|
canvas->translate(dx, 0);
|
|
|
|
canvas->save();
|
|
canvas->rotate(90.f);
|
|
rect = SkRect::MakeLTRB(0.5f,
|
|
0.5f,
|
|
40.5f,
|
|
-40.5f);
|
|
canvas->drawRect(rect, paints[p]);
|
|
canvas->restore();
|
|
canvas->translate(dx, 0);
|
|
|
|
canvas->save();
|
|
matrix.setScale(-1.f, -1.f);
|
|
canvas->concat(matrix);
|
|
rect = SkRect::MakeLTRB(0.5f,
|
|
0.5f,
|
|
-40.5f,
|
|
-40.5f);
|
|
canvas->drawRect(rect, paints[p]);
|
|
canvas->restore();
|
|
canvas->translate(dx, 0);
|
|
|
|
canvas->save();
|
|
matrix.setScale(2.1f, 4.1f);
|
|
canvas->concat(matrix);
|
|
rect = SkRect::MakeLTRB(0.1f,
|
|
0.1f,
|
|
19.1f,
|
|
9.1f);
|
|
canvas->drawRect(rect, paints[p]);
|
|
canvas->restore();
|
|
canvas->translate(dx, 0);
|
|
|
|
canvas->restore();
|
|
canvas->translate(0, dy);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
private:
|
|
int fWidth;
|
|
|
|
typedef SampleView INHERITED;
|
|
};
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
static SkView* MyFactory() { return new AARectView; }
|
|
static SkViewRegister reg(MyFactory);
|