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

Sanitizing source files in Skia_Periodic_House_Keeping

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@7910 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2013-03-01 12:12:55 +00:00
parent af3a3b9fb1
commit 631cdcb4a6
12 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
experimental/Intersection/CubicIntersection_Test.cpp
View File

@ -137,7 +137,7 @@ static const Cubic newTestSet[] = {
{{0,1}, {3,5}, {2,1}, {3,1}},
{{1,2}, {1,3}, {1,0}, {5,3}},
{{0,1}, {2,5}, {6,0}, {5,3}},
{{0,1}, {2,5}, {6,0}, {5,3}},
{{0,6}, {3,5}, {1,0}, {5,2}},
{{0,1}, {3,6}, {1,0}, {5,2}},

4
experimental/Intersection/Simplify.cpp
View File

@ -1879,7 +1879,7 @@ public:
other.addCancelOutsides(tStart, oStart, *this, endT);
}
}
int addSelfT(Segment* other, const SkPoint& pt, double& newT) {
int result = addT(other, pt, newT);
Span* span = &fTs[result];
@ -5155,7 +5155,7 @@ public:
int addT(const Work& other, const SkPoint& pt, double& newT) {
return fContour->addT(fIndex, other.fContour, other.fIndex, pt, newT);
}
int addSelfT(const Work& other, const SkPoint& pt, double& newT) {
return fContour->addSelfT(fIndex, other.fContour, other.fIndex, pt, newT);
}

4
include/core/SkTileGridPicture.h
View File

@ -36,7 +36,7 @@ public:
* or equal to the margin, there is no need to extend the domain of
* the tile grid to prevent data loss.
*/
SkIPoint fOffset;
SkIPoint fOffset;
};
/**
* Constructor
@ -45,7 +45,7 @@ public:
* @param info description of the tiling layout
*/
SkTileGridPicture(int width, int height, const TileGridInfo& info);
virtual SkBBoxHierarchy* createBBoxHierarchy() const SK_OVERRIDE;
private:

2
src/core/SkTileGrid.cpp
View File

@ -45,7 +45,7 @@ void SkTileGrid::insert(void* data, const SkIRect& bounds, bool) {
// Note: SkIRects are non-inclusive of the right() column and bottom() row,
// hence the "-1"s in the computations of maxTileX and maxTileY.
int minTileX = SkMax32(SkMin32(dilatedBounds.left() / fInfo.fTileInterval.width(),
int minTileX = SkMax32(SkMin32(dilatedBounds.left() / fInfo.fTileInterval.width(),
fXTileCount - 1), 0);
int maxTileX = SkMax32(SkMin32((dilatedBounds.right() - 1) / fInfo.fTileInterval.width(),
fXTileCount - 1), 0);

2
src/gpu/gl/GrGLCaps.cpp
View File

@ -178,7 +178,7 @@ void GrGLCaps::init(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli) {
(kARM_GrGLVendor == ctxInfo.vendor() || kImagination_GrGLVendor == ctxInfo.vendor())) {
fUseNonVBOVertexAndIndexDynamicData = true;
}
if (kDesktop_GrGLBinding == binding && version >= GR_GL_VER(3, 2)) {
GrGLint profileMask;
GR_GL_GetIntegerv(gli, GR_GL_CONTEXT_PROFILE_MASK, &profileMask);

2
src/gpu/gl/GrGLCaps.h
View File

@ -228,7 +228,7 @@ public:
bool readPixelsSupported(const GrGLInterface* intf,
GrGLenum format,
GrGLenum type) const;
bool isCoreProfile() const { return fIsCoreProfile; }
private:

4
src/gpu/gl/GrGLContext.cpp
View File

@ -17,7 +17,7 @@ GrGLContextInfo& GrGLContextInfo::operator= (const GrGLContextInfo& ctxInfo) {
fGLCaps = ctxInfo.fGLCaps;
return *this;
}
bool GrGLContextInfo::initialize(const GrGLInterface* interface) {
this->reset();
// We haven't validated the GrGLInterface yet, so check for GetString
@ -44,7 +44,7 @@ bool GrGLContextInfo::initialize(const GrGLInterface* interface) {
}
bool GrGLContextInfo::isInitialized() const {
return kNone_GrGLBinding != fBindingInUse;
return kNone_GrGLBinding != fBindingInUse;
}
void GrGLContextInfo::reset() {

4
src/gpu/gl/GrGLContext.h
View File

@ -18,7 +18,7 @@
#include "SkString.h"
/**
* Encapsulates information about an OpenGL context including the OpenGL
* Encapsulates information about an OpenGL context including the OpenGL
* version, the GrGLBinding type of the context, and GLSL version.
*/
class GrGLContextInfo {
@ -32,7 +32,7 @@ public:
* Copies a GrGLContextInfo
*/
GrGLContextInfo& operator= (const GrGLContextInfo& ctxInfo);
/**
* Initializes a GrGLContextInfo from a GrGLInterface and the currently
* bound OpenGL context accessible by the GrGLInterface.

2
src/gpu/gl/GrGLShaderBuilder.cpp
View File

@ -81,7 +81,7 @@ void append_swizzle(SkString* outAppend,
// varying by stage, if we use 1D textures for gradients!
//const int GrGLShaderBuilder::fCoordDims = 2;
GrGLShaderBuilder::GrGLShaderBuilder(const GrGLContextInfo& ctxInfo,
GrGLShaderBuilder::GrGLShaderBuilder(const GrGLContextInfo& ctxInfo,
GrGLUniformManager& uniformManager)
: fUniforms(kVarsPerBlock)
, fVSAttrs(kVarsPerBlock)

2
src/ports/SkFontConfigInterface_direct.cpp
View File

@ -433,5 +433,3 @@ SkStream* SkFontConfigInterfaceDirect::openStream(const FontIdentity& identity)
int fd = open(identity.fString.c_str(), O_RDONLY);
return (fd >= 0) ? SkNEW_ARGS(SkFDStream, (fd, true)) : NULL;
}

8
src/ports/SkFontHost_fontconfig.cpp
View File

@ -214,11 +214,11 @@ SkTypeface* SkFontHost::Deserialize(SkStream* stream) {
///////////////////////////////////////////////////////////////////////////////
SkStream* SkFontHost::OpenStream(uint32_t id) {
FontConfigTypeface* face = (FontConfigTypeface*)SkTypefaceCache::FindByID(id);
FontConfigTypeface* face = (FontConfigTypeface*)SkTypefaceCache::FindByID(id);
if (NULL == face) {
return NULL;
}
SkStream* stream = face->getLocalStream();
if (stream) {
stream->ref();
@ -234,7 +234,7 @@ SkStream* SkFontHost::OpenStream(uint32_t id) {
size_t SkFontHost::GetFileName(SkFontID fontID, char path[], size_t length,
int32_t* index) {
FontConfigTypeface* face = (FontConfigTypeface*)SkTypefaceCache::FindByID(fontID);
FontConfigTypeface* face = (FontConfigTypeface*)SkTypefaceCache::FindByID(fontID);
if (NULL == face || face->getLocalStream()) {
return 0;
}
@ -251,5 +251,3 @@ size_t SkFontHost::GetFileName(SkFontID fontID, char path[], size_t length,
}
return filename.size();
}

2
tests/TileGridTest.cpp
View File

@ -208,7 +208,7 @@ public:
verifyTileHits(reporter, SkIRect::MakeXYWH(9, 9, 1, 1), kAll_Tile);
verifyTileHits(reporter, SkIRect::MakeXYWH(10, 10, 1, 1), kAll_Tile);
verifyTileHits(reporter, SkIRect::MakeXYWH(11, 11, 1, 1), kBottomRight_Tile);
// BorderPixels
verifyTileHits(reporter, SkIRect::MakeXYWH(0, 0, 6, 6), kTopLeft_Tile, 1);
verifyTileHits(reporter, SkIRect::MakeXYWH(0, 0, 7, 7), kAll_Tile, 1);