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@8059 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2013-03-09 07:01:15 +00:00
parent 2d137b6f8a
commit eed625df23
4 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gm/cubicpaths.cpp
View File

@ -300,4 +300,3 @@ private:
DEF_GM( return new CubicPathGM; ) DEF_GM( return new CubicPathGM; )
DEF_GM( return new CubicClosePathGM; ) DEF_GM( return new CubicClosePathGM; )

2
include/core/SkRect.h
View File

@ -769,7 +769,7 @@ struct SK_API SkRect {
* other. When this returns, left <= right && top <= bottom * other. When this returns, left <= right && top <= bottom
*/ */
void sort(); void sort();
/** /**
* cast-safe way to treat the rect as an array of (4) SkScalars. * cast-safe way to treat the rect as an array of (4) SkScalars.
*/ */

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

@ -48,7 +48,7 @@ bool GrGLExtensions::init(GrGLBinding binding,
} }
} else { } else {
const char* extensions = (const char*) getString(GR_GL_EXTENSIONS); const char* extensions = (const char*) getString(GR_GL_EXTENSIONS);
if (NULL == extensions) { if (NULL == extensions) {
return false; return false;
} }
while (true) { while (true) {

23
tools/win_dbghelp.cpp
View File

@ -50,7 +50,7 @@ static void strncpyOrSetBlank(char* dest, const char* src, size_t len) {
} }
char debug_app_name[MAX_PATH] = ""; char debug_app_name[MAX_PATH] = "";
void setAppName(const char* app_name) { void setAppName(const char* app_name) {
strncpyOrSetBlank(debug_app_name, app_name, sizeof(debug_app_name)); strncpyOrSetBlank(debug_app_name, app_name, sizeof(debug_app_name));
} }
@ -118,16 +118,16 @@ static void printCallstack(const char* filename,
szPath, szAppName, szVersion, \ szPath, szAppName, szVersion, \
stLocalTime.wYear, stLocalTime.wMonth, stLocalTime.wDay, \ stLocalTime.wYear, stLocalTime.wMonth, stLocalTime.wDay, \
stLocalTime.wHour, stLocalTime.wMinute, stLocalTime.wSecond, \ stLocalTime.wHour, stLocalTime.wMinute, stLocalTime.wSecond, \
GetCurrentProcessId(), GetCurrentThreadId()); GetCurrentProcessId(), GetCurrentThreadId());
// Exception execution handler. Exception is recognized. Transfer control to // Exception execution handler. Exception is recognized. Transfer control to
// the exception handler by executing the __except compound statement, // the exception handler by executing the __except compound statement,
// then continue execution after the __except block. // then continue execution after the __except block.
int GenerateDumpAndPrintCallstack(EXCEPTION_POINTERS* pExceptionPointers) { int GenerateDumpAndPrintCallstack(EXCEPTION_POINTERS* pExceptionPointers) {
BOOL bMiniDumpSuccessful; BOOL bMiniDumpSuccessful;
char szPath[MAX_PATH]; char szPath[MAX_PATH];
char szFileName[MAX_PATH]; char szFileName[MAX_PATH];
char szFileNameOutput[MAX_PATH]; char szFileNameOutput[MAX_PATH];
const char* szAppName = getAppName(); const char* szAppName = getAppName();
const char* szVersion = getAppVersion(); const char* szVersion = getAppVersion();
DWORD dwBufferSize = MAX_PATH; DWORD dwBufferSize = MAX_PATH;
@ -145,7 +145,7 @@ int GenerateDumpAndPrintCallstack(EXCEPTION_POINTERS* pExceptionPointers) {
BUILD_UNIQUE_FILENAME(szFileNameOutput, ".out", szPath, szAppName, szVersion, stLocalTime); BUILD_UNIQUE_FILENAME(szFileNameOutput, ".out", szPath, szAppName, szVersion, stLocalTime);
hDumpFile = CreateFile(szFileName, hDumpFile = CreateFile(szFileName,
GENERIC_READ|GENERIC_WRITE, GENERIC_READ|GENERIC_WRITE,
FILE_SHARE_WRITE|FILE_SHARE_READ, FILE_SHARE_WRITE|FILE_SHARE_READ,
0, 0,
CREATE_ALWAYS, CREATE_ALWAYS,
@ -157,7 +157,7 @@ int GenerateDumpAndPrintCallstack(EXCEPTION_POINTERS* pExceptionPointers) {
ExpParam.ClientPointers = TRUE; ExpParam.ClientPointers = TRUE;
bMiniDumpSuccessful = MiniDumpWriteDump(GetCurrentProcess(), bMiniDumpSuccessful = MiniDumpWriteDump(GetCurrentProcess(),
GetCurrentProcessId(), GetCurrentProcessId(),
hDumpFile, hDumpFile,
MiniDumpWithDataSegs, MiniDumpWithDataSegs,
&ExpParam, &ExpParam,
@ -170,7 +170,7 @@ int GenerateDumpAndPrintCallstack(EXCEPTION_POINTERS* pExceptionPointers) {
const char* cdbExePath = getCdbPath(); const char* cdbExePath = getCdbPath();
if (cdbExePath && *cdbExePath != '\0') { if (cdbExePath && *cdbExePath != '\0') {
printf("Cdb exe: %s\n", cdbExePath); printf("Cdb exe: %s\n", cdbExePath);
char command[MAX_PATH * 4]; char command[MAX_PATH * 4];
sprintf(command, "%s -y \"%s\" -i \"%s\" -z \"%s\" -c \"%s\" -kqm >\"%s\"", sprintf(command, "%s -y \"%s\" -i \"%s\" -z \"%s\" -c \"%s\" -kqm >\"%s\"",
cdbExePath, cdbExePath,
@ -182,16 +182,16 @@ int GenerateDumpAndPrintCallstack(EXCEPTION_POINTERS* pExceptionPointers) {
system(command); system(command);
printf("\nThread Callstack:\n"); printf("\nThread Callstack:\n");
printCallstack(szFileNameOutput, printCallstack(szFileNameOutput,
MARKER_THREAD_CALLSTACK_START, MARKER_THREAD_CALLSTACK_START,
MARKER_THREAD_CALLSTACK_STOP); MARKER_THREAD_CALLSTACK_STOP);
printf("\nException Callstack:\n"); printf("\nException Callstack:\n");
printCallstack(szFileNameOutput, printCallstack(szFileNameOutput,
MARKER_EXCEPTION_CALLSTACK_START, MARKER_EXCEPTION_CALLSTACK_START,
MARKER_EXCEPTION_CALLSTACK_STOP); MARKER_EXCEPTION_CALLSTACK_STOP);
} else { } else {
printf("Warning: CDB path not set up.\n"); printf("Warning: CDB path not set up.\n");
} }
return EXCEPTION_EXECUTE_HANDLER; return EXCEPTION_EXECUTE_HANDLER;
@ -241,4 +241,3 @@ void setUpDebuggingFromArgs(const char* vargs0) {
#endif #endif
setCdbPath(cdbExePath); setCdbPath(cdbExePath);
} }