зеркало из https://github.com/mozilla/moz-skia.git
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@11049 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
Родитель
5852c8b06d
Коммит
e0c170f7bb
|
@ -309,4 +309,3 @@ static BenchRegistry gReg3(Fact3);
|
||||||
static BenchRegistry gReg2(Fact2);
|
static BenchRegistry gReg2(Fact2);
|
||||||
static BenchRegistry gReg1(Fact1);
|
static BenchRegistry gReg1(Fact1);
|
||||||
static BenchRegistry gReg0(Fact0);
|
static BenchRegistry gReg0(Fact0);
|
||||||
|
|
||||||
|
|
|
@ -112,8 +112,8 @@ bool SkBitmapDevice::onReadPixels(const SkBitmap& bitmap,
|
||||||
SkCanvas::Config8888 config8888) {
|
SkCanvas::Config8888 config8888) {
|
||||||
SkASSERT(SkBitmap::kARGB_8888_Config == bitmap.config());
|
SkASSERT(SkBitmap::kARGB_8888_Config == bitmap.config());
|
||||||
SkASSERT(!bitmap.isNull());
|
SkASSERT(!bitmap.isNull());
|
||||||
SkASSERT(SkIRect::MakeWH(this->width(), this->height()).contains(SkIRect::MakeXYWH(x, y,
|
SkASSERT(SkIRect::MakeWH(this->width(), this->height()).contains(SkIRect::MakeXYWH(x, y,
|
||||||
bitmap.width(),
|
bitmap.width(),
|
||||||
bitmap.height())));
|
bitmap.height())));
|
||||||
|
|
||||||
SkIRect srcRect = SkIRect::MakeXYWH(x, y, bitmap.width(), bitmap.height());
|
SkIRect srcRect = SkIRect::MakeXYWH(x, y, bitmap.width(), bitmap.height());
|
||||||
|
@ -407,4 +407,3 @@ bool SkBitmapDevice::filterTextFlags(const SkPaint& paint, TextFlags* flags) {
|
||||||
// we're cool with the paint as is
|
// we're cool with the paint as is
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -118,4 +118,3 @@ bool SkBaseDevice::readPixels(SkBitmap* bitmap, int x, int y,
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -693,7 +693,7 @@ bool GrOvalRenderer::drawSimpleRRect(GrDrawTarget* target, GrContext* context, b
|
||||||
bounds.outset(halfWidth, halfWidth);
|
bounds.outset(halfWidth, halfWidth);
|
||||||
}
|
}
|
||||||
|
|
||||||
isStroked = (isStroked && innerRadius > 0);
|
isStroked = (isStroked && innerRadius > 0);
|
||||||
|
|
||||||
GrEffectRef* effect = CircleEdgeEffect::Create(isStroked);
|
GrEffectRef* effect = CircleEdgeEffect::Create(isStroked);
|
||||||
static const int kCircleEdgeAttrIndex = 1;
|
static const int kCircleEdgeAttrIndex = 1;
|
||||||
|
@ -789,7 +789,7 @@ bool GrOvalRenderer::drawSimpleRRect(GrDrawTarget* target, GrContext* context, b
|
||||||
bounds.outset(scaledStroke.fX, scaledStroke.fY);
|
bounds.outset(scaledStroke.fX, scaledStroke.fY);
|
||||||
}
|
}
|
||||||
|
|
||||||
isStroked = (isStroked && innerXRadius > 0 && innerYRadius > 0);
|
isStroked = (isStroked && innerXRadius > 0 && innerYRadius > 0);
|
||||||
|
|
||||||
GrDrawTarget::AutoReleaseGeometry geo(target, 16, 0);
|
GrDrawTarget::AutoReleaseGeometry geo(target, 16, 0);
|
||||||
if (!geo.succeeded()) {
|
if (!geo.succeeded()) {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче