AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sanitizing source files in Housekeeper-Nightly

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@11336 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2013-09-18 07:01:33 +00:00
parent 05c393b28f
commit 2291e72b99
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/gpu/SkGpuDevice.h
View File

@ -73,9 +73,9 @@ public:
return NULL == fRenderTarget ? 0 : fRenderTarget->height();
}
virtual void getGlobalBounds(SkIRect* bounds) const SK_OVERRIDE;
virtual bool isOpaque() const SK_OVERRIDE {
return NULL == fRenderTarget ? false
: kRGB_565_GrPixelConfig == fRenderTarget->config();
virtual bool isOpaque() const SK_OVERRIDE {
return NULL == fRenderTarget ? false
: kRGB_565_GrPixelConfig == fRenderTarget->config();
}
virtual SkBitmap::Config config() const SK_OVERRIDE;

2
src/core/SkDeviceLooper.cpp
View File

@ -92,7 +92,7 @@ static bool next_tile(const SkIRect& boundary, int delta, SkIPoint* offset) {
offset->fY += delta;
return true;
}
// offset is now outside of boundary, so we're done
return false;
}

12
tests/DeviceLooperTest.cpp
View File

@ -37,23 +37,23 @@ static void test_simple(skiatest::Reporter* reporter) {
{ { 32000, 10 }, { 0, 0, 4000, 10 }, { 0, 0, 32000, 32000 } },
{ { 10, 32000 }, { 0, 0, 10, 4000 }, { 0, 0, 32000, 32000 } },
};
for (size_t i = 0; i < SK_ARRAY_COUNT(gRec); ++i) {
SkBitmap bitmap;
make_bm(&bitmap, gRec[i].fDevSize.width(), gRec[i].fDevSize.height());
SkRasterClip rc(gRec[i].fRCBounds);
for (int aa = 0; aa <= 1; ++aa) {
SkDeviceLooper looper(bitmap, rc, gRec[i].fRect, SkToBool(aa));
bool valid = looper.next();
REPORTER_ASSERT(reporter, valid);
if (valid) {
REPORTER_ASSERT(reporter, looper.getBitmap().width() == bitmap.width());
REPORTER_ASSERT(reporter, looper.getBitmap().height() == bitmap.height());
REPORTER_ASSERT(reporter, equal(looper.getRC(), rc));
REPORTER_ASSERT(reporter, !looper.next());
}
}
@ -103,7 +103,7 @@ static void test_complex(skiatest::Reporter* reporter) {
{ { BW_SIZE, BW_SIZE }, false },
{ { AA_SIZE, AA_SIZE }, true },
};
for (size_t i = 0; i < SK_ARRAY_COUNT(gRec); ++i) {
const int w = gRec[i].fSize.width();
const int h = gRec[i].fSize.height();