Remove compiler warnings (Linux clang, mostly).
Fix indentation. Remove unnecessary virtual destructor. codereview.appspot.com/4965043/ git-svn-id: http://skia.googlecode.com/svn/trunk@2171 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
parent
32992605aa
commit
513909f9a2
@ -36,7 +36,7 @@ public:
|
||||
return *this;
|
||||
}
|
||||
|
||||
virtual ~GrBinHashKey() {
|
||||
~GrBinHashKey() {
|
||||
}
|
||||
|
||||
void setKeyData(const uint32_t *data) {
|
||||
|
@ -22,7 +22,7 @@
|
||||
|
||||
GrGpu* GrGpu::Create(GrEngine engine, GrPlatform3DContext context3D) {
|
||||
|
||||
const GrGLInterface* glInterface;
|
||||
const GrGLInterface* glInterface = NULL;
|
||||
|
||||
if (kOpenGL_Shaders_GrEngine == engine ||
|
||||
kOpenGL_Fixed_GrEngine == engine) {
|
||||
|
@ -129,7 +129,7 @@ static SkTypeface* find_from_uniqueID(uint32_t uniqueID) {
|
||||
}
|
||||
curr = curr->fNext;
|
||||
}
|
||||
return false;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static bool valid_uniqueID(uint32_t uniqueID) {
|
||||
|
@ -130,7 +130,7 @@ const char* SkParse::FindHex(const char str[], uint32_t* value)
|
||||
*value = n;
|
||||
return str;
|
||||
}
|
||||
return false;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
const char* SkParse::FindS32(const char str[], int32_t* value)
|
||||
|
@ -363,7 +363,7 @@ void SkView::Click::copyType(const char type[])
|
||||
SkView::Click* SkView::findClickHandler(SkScalar x, SkScalar y)
|
||||
{
|
||||
if (x < 0 || y < 0 || x >= fWidth || y >= fHeight) {
|
||||
return false;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (this->onSendClickToChildren(x, y)) {
|
||||
|
Loading…
Reference in New Issue
Block a user